Updated test harness