Made the tests pass again