cleaning up a bit the test harness