Minor updates to testing script