minor test harness tweaking