Reorganizing order of tests and removing a test done twice