Fix whitespace
Update 2D testbench
Fix whitespace