Made tests compile again.
Simplified BENCHMARKS.txt.