Initial commit of the TestBench enhancements and a few example tests., part 2