Story 182: Fix benchmarks for speed
Story 182: Fix benchmarks for speed