Merge "Rename the generated test files to avoid confusion."