Merge "Rename test to avoid too long file names."