More work on the test harness