Reorder tests for more sensible output on failure