improvements to test harness