Re-order tests so plugin dependent tests are bundled together