Fixes #10 tests