Merge "Adjust run test for target runs."