Made a number of minor fixes to the top level test bench.