Renaming tests to match their classes