Do away with benchmark package. Move benchmarks into existing test files.