Tweaks to big test script