Benchmark test refactored