Fix failing tests
Merge pull request #25 from dominicrodger/fix_tests

Fix failing tests