test harness tweaks