fixed all the tests to pass