Test coverage imporved & added benchmarks