Fix up some of the test harness code.
Update tests.