Change tests to pass