Fixed the tests to pass