Re-order tests