Changes needed to test the mb-benchmarks