Refactored benchmarks to conform to cpp spec