Merge "Rename test whose name was too long for some configs"