Fixed tests and added benchmarks