Re-order test-runners