Make these tests follow the same naming convention, reformat