Add test and benchmarks