Minor test harness tweaks