Added more tests and benchmarks.