Merge pull request #199 from ClusterHQ/fix-tests

Unbreak tests.