Remove benchmarks and add timing info to tests.  TODO: aggregate timing for suites, convert existing benchmarks.