Removed unused deps.
Added more benchmarks
Added more benchmarks
Cleanup in tests, benchmarks are passing.