Minor fixes in test harness