Merge "tests: Remove {old,new}.file."