Further test harness simplification.