Merge "Rename test to avoid too long filenames."