uncomment and expand benchmarks; fix test