Improve test harness, slightly