Some work on the test harness.