More changes to test harness