Fix the tests - fixes #2