Fix the tests

Fixes #26