Merge "keep test names consistent with other tests."