Merge repair to correct failing tests.