Make the tests pass