improved the test harness