Rearranging and renaming tests, no changes