Reinstate old ordering of tests