Improve test harness