Minor clean-up in test harness