Fix failing tests
Merge pull request #17 from jankramer/fix-failing-tests

Fix failing tests