Refactored benchmarks for scalability measurements