Minor edits to testbench files