Tweak test names for consistency