Fixed benchmarks after refactor