More work on test harness