Reorder the tests