Cleanup and new functionality in the testbench to test more of the core.