Tweaks to test script