Change tests to match