Refactoring benchmarks

This is an attempt to make the benchmarking easier and also more concise.