Merge "Rename test to avoid too long file names."
am: fb98df3

* commit 'fb98df39c6265d13002137203c6457c00ba5e63e':
  Rename test to avoid too long file names.