Change tests to resolve downstream conflicts