Clean up some test names

Clean up some test names