Added more test harness stuff.