More test harness updates