A few small changes to testbench stuff