Fix broken tests
Merge pull request #42 from ncdc/fix-tests

Fix broken tests