Getting the tests to pass