Make all tests succeed again.
Merge pull request #39 from Fox32/feature/fix-tests

Make all tests succeed again.