am fcee9d4a: Merge "Tweak test script while investigating failures."

* commit 'fcee9d4ad44b70cb85aafa9056c08a194c5582e6':
  Tweak test script while investigating failures.