Fixup test names

Change-Id: I5147e30e9f6cc06a02a6722dbb1cc7bed44a510c