Modify the tests so they pass