Make the tests pass again