Updated test harness behaviour