Getting all the tests passing