Updated test harness.