Making the tests passing