Added more rigorous testing and benchmarking