Updated testbench