Small changes to the testbench