Merge "Tweak test script while investigating failures."