Changed ordering of tests