Final touches for the new benchmarks code