improved test harness