Added benchmarks and fixed the tests