General test harness adjustments