Minor changes for the test harness.