cleaned up testbench a bit