Rename tests

Match the test name changes to the server name change, to more
accurately reflect what they are testing.