Minor tweaks to test script