Update test names to follow standard naming convention. Change-Id: I3e69ee307699959bfad2a8746698b0bab8456426