Minor tweaks to test scripts