Add benchmark macros
rename to benchmark_print_summary
clean up
update correct testing records
one more scope for benchmarks