Tweak to test scripts