Added testing and benchmarking for 2D