Fix tests
Merge pull request #25 from theodi/bugfix-fix-tests

Fix tests