Changing order of tests for more useful output