Fix tests after refactoring into separate proj
Merge pull request #67 from heaths/tests

Fix tests after refactoring into separate proj