Cleanup benchmarks

* restore the multi-model benchmark
* add single-model ones
* remove the BENCHMARK macro