Simplify and complete 2D testbench
Update build target names