Re-ordered tests to be slightly more sensible