Benchmarks and tests code cleanups. (#257)