Rework benchmarks to run in M-mode