Simplifying throughput tests, releasing m2