For PR1319: Upgrade to new test harness.