fixed up testbench macros