Removed extra created entities and used the existing one's

Author: Jhalak.mathur

app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml

@@ -279,10 +279,4 @@
         <var key="category_id" entityKey="id" entityType="category"/>
         <var key="sku" entityKey="sku" entityType="product"/>
     </entity>
-    <entity name="SimpleCategory_SpecialPrice" type="category">
-        <data key="name">Simple Category</data>
-        <data key="name_lwr" unique="suffix">SimpleCategory</data>
-        <data key="urlKey" unique="suffix">SimpleCategory</data>
-        <data key="is_active">true</data>
-    </entity>
 </entities>

app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

@@ -1469,17 +1469,4 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
 
-    <entity name="SimpleProduct_SpecialPrice" type="product">
-        <data key="name">Simple Product</data>
-        <data key="sku" unique="suffix">very-simple-product</data>
-        <data key="urlKey" unique="suffix">very-simple-product</data>
-        <data key="type_id">simple</data>
-        <data key="attribute_set_id">4</data>
-        <data key="visibility">4</data>
-        <data key="price">100.00</data>
-        <data key="status">1</data>
-        <data key="weight">654</data>
-        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
-        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
-    </entity>
 </entities>

app/code/Magento/Catalog/Test/Mftf/Test/SpecialPriceCheckOnWishListPageTest.xml

@@ -19,20 +19,20 @@
         <before>
             <!-- Create first simple product and add special price -->
 
-            <createData entity="SimpleProduct_SpecialPrice" stepKey="createFirstSimpleProduct"/>
+            <createData entity="ApiSimplePrice100Qty100" stepKey="createFirstSimpleProduct"/>
             <createData entity="specialProductPrice3" stepKey="specialPriceToFirstProduct">
                 <requiredEntity createDataKey="createFirstSimpleProduct"/>
             </createData>
 
             <!-- Create category -->
-            <createData entity="SimpleCategory_SpecialPrice" stepKey="createCategory"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="AssignProductToCategory" stepKey="assignTestCategoryToTestProduct">
                 <requiredEntity createDataKey="createCategory"/>
                 <requiredEntity createDataKey="createFirstSimpleProduct"/>
             </createData>
 
             <!-- Create Customer -->
-            <createData entity="SimpleCustomer_USA" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
         </before>
         <!-- Delete Data -->
         <after>

app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

@@ -457,17 +457,5 @@
         <data key="group">General</data>
         <requiredEntity type="address">BillingAddressTX</requiredEntity>
     </entity>
-    <entity name="SimpleCustomer_USA" type="customer">
-        <data key="group_id">1</data>
-        <data key="default_billing">true</data>
-        <data key="default_shipping">true</data>
-        <data key="email">[email protected]</data>
-        <data key="firstname">Lasonya G</data>
-        <data key="lastname">Butler</data>
-        <data key="fullname">Lasonya G. Butler</data>
-        <data key="password">pwdTest123!</data>
-        <data key="store_id">0</data>
-        <data key="website_id">0</data>
-        <requiredEntity type="address">USACustomerAddress</requiredEntity>
-    </entity>
+
 </entities>