Improving the test harness.