Tweak test names to be more accurate