am 5e3b502b: Merge "keep test names consistent with other tests."

* commit '5e3b502b6b56634953ea152409363088974fa5e9':
  keep test names consistent with other tests.