Got all the tests to pass