Various changes to testing script