Story 182: Fix benchmarks for speed