MAGETWO-91198: [Testing] Create/Update Automated Tests

- Fixing merge issues

Author: dhaecker

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderMapCommonComponentTests.xml

@@ -1300,15 +1300,15 @@
         <actionGroup ref="dragContentBlockToStageAndExpectEditPanel" stepKey="dragContentBlockIntoStage">
             <argument name="contentBlockType" value="PageBuilderMapContentBlock"/>
         </actionGroup>
-        <actionGroup ref="addMapPin" stepKey="addMapPin"/>
+        <actionGroup ref="clickMapToAddOrMovePin" stepKey="addMapPin"/>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
         <!-- Load Storefront -->
         <openNewTab stepKey="openNewTab"/>
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
             <argument name="contentBlockType" value="PageBuilderMapContentBlock"/>
         </actionGroup>
-        <actionGroup ref="validateMap" stepKey="validateMap">
+        <actionGroup ref="verifyMapHasPin" stepKey="validateMap">
             <argument name="page" value="MapOnStorefront"/>
         </actionGroup>
         <switchToPreviousTab stepKey="switchToPreviousTab"/>
@@ -1473,15 +1473,15 @@
         <actionGroup ref="dragContentBlockToStageAndExpectEditPanel" stepKey="dragContentBlockIntoStage">
             <argument name="contentBlockType" value="PageBuilderMapContentBlock"/>
         </actionGroup>
-        <actionGroup ref="addMapPin" stepKey="addMapPin"/>
+        <actionGroup ref="clickMapToAddOrMovePin" stepKey="addMapPin"/>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
         <!-- Load Storefront -->
         <openNewTab stepKey="openNewTab"/>
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
             <argument name="contentBlockType" value="PageBuilderMapContentBlock"/>
         </actionGroup>
-        <actionGroup ref="validateMap" stepKey="validateMap">
+        <actionGroup ref="verifyMapHasPin" stepKey="validateMap">
             <argument name="page" value="MapOnStorefront"/>
         </actionGroup>
         <switchToPreviousTab stepKey="switchToPreviousTab"/>