Merge "Shorten the generated test file names."