Upgraded test harness