MAGETWO-99302: Edit customer State and Province is duplicated in the drop down

Author: romadjelf

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerActionGroup.xml

@@ -16,7 +16,7 @@
         <fillField userInput="{{customerData.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
         <fillField userInput="{{customerData.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="saveCustomer"/>
-        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
-        <see userInput="You saved the customer." selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageVisible"/>
+        <see userInput="You saved the customer." selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressStateContainValuesOnceTest.xml

@@ -20,11 +20,11 @@
             <group value="customer"/>
         </annotations>
         <before>
-            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="customer"/>
+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="firstCustomer"/>
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>
         </before>
         <after>
-            <deleteData createDataKey="customer" stepKey="deleteFirstCustomer"/>
+            <deleteData createDataKey="firstCustomer" stepKey="deleteFirstCustomer"/>
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteSecondCustomer">
                 <argument name="customerEmail" value="Simple_US_Customer.email"/>
             </actionGroup>
@@ -37,7 +37,7 @@
 
         <!--Select created customer, Click Edit mode-->
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPageWithAddresses">
-            <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
+            <argument name="customer" value="$$firstCustomer$$"/>
         </actionGroup>
 
         <!--Select Addresses tab-->