Minor tweaks to testing script