fixes to test harness