[Finishes #60900400]order benchmarks
Fix some flaky specs