Changes to make the tests pass