Changed the order of the tests