Cleanup and performance improvements. Separate Benchmarks from tests