More comprehensive benchmarking