diff --git a/etc/_envs/chrome.yml b/etc/_envs/chrome.yml
index 3793a2d27..4b579fce3 100644
--- a/etc/_envs/chrome.yml
+++ b/etc/_envs/chrome.yml
@@ -5,5 +5,7 @@ modules:
         - \Magento\FunctionalTestingFramework\Helper\Acceptance
     config:
         \Magento\FunctionalTestingFramework\Module\MagentoWebDriver:
-            browser: chrome
-            window_size: maximize
\ No newline at end of file
+            browser: 'chrome'
+            capabilities:
+                chromeOptions:
+                    args: ["--start-maximized", "--disable-extensions", "--enable-automation"]
\ No newline at end of file
diff --git a/etc/_envs/firefox.yml b/etc/_envs/firefox.yml
index e8565283a..a455e8af6 100644
--- a/etc/_envs/firefox.yml
+++ b/etc/_envs/firefox.yml
@@ -5,5 +5,6 @@ modules:
         - \Magento\FunctionalTestingFramework\Helper\Acceptance
     config:
         \Magento\FunctionalTestingFramework\Module\MagentoWebDriver:
-            browser: firefox
+            browser: 'firefox'
+            restart: true
             window_size: maximize
\ No newline at end of file
diff --git a/etc/_envs/headless.yml b/etc/_envs/headless.yml
new file mode 100644
index 000000000..e88f07390
--- /dev/null
+++ b/etc/_envs/headless.yml
@@ -0,0 +1,13 @@
+# `headless` environment config goes here
+modules:
+    enabled:
+        - \Magento\FunctionalTestingFramework\Module\MagentoWebDriver
+        - \Magento\FunctionalTestingFramework\Helper\Acceptance
+    config:
+        \Magento\FunctionalTestingFramework\Module\MagentoWebDriver:
+            browser: 'chrome'
+            window_size: false
+            capabilities:
+                chromeOptions:
+                    args: ["--headless", "--disable-gpu", "--disable-extensions"]
+                    binary: "/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome"
\ No newline at end of file
diff --git a/etc/_envs/phantomjs.yml b/etc/_envs/phantomjs.yml
index a7a65e6b5..b26042a8c 100644
--- a/etc/_envs/phantomjs.yml
+++ b/etc/_envs/phantomjs.yml
@@ -5,4 +5,4 @@ modules:
         - \Magento\FunctionalTestingFramework\Helper\Acceptance
     config:
         \Magento\FunctionalTestingFramework\Module\MagentoWebDriver:
-            browser: phantomjs
\ No newline at end of file
+            browser: 'phantomjs'
\ No newline at end of file
diff --git a/etc/di.xml b/etc/di.xml
index c07bfe127..b3be5638d 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -205,7 +205,7 @@
                 <item name="/config/cest" xsi:type="string">name</item>
                 <item name="/config/cest/test" xsi:type="string">name</item>
                 <item name="/config/cest/test/actionGroup/argument" xsi:type="string">name</item>
-                <item name="/config/cest/test/createData/required-entity" xsi:type="string">persistedKey</item>
+                <item name="/config/cest/test/createData/required-entity" xsi:type="string">createDataKey</item>
                 <item name="/config/cest/test/(acceptPopup|actionGroup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
             </argument>
             <argument name="fileName" xsi:type="string">*Cest.xml</argument>
@@ -221,9 +221,9 @@
                 <item name="/config/cest/after/(acceptPopup|actionGroup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
                 <item name="/config/cest/test" xsi:type="string">name</item>
                 <item name="/config/cest" xsi:type="string">name</item>
-                <item name="/config/cest/test/createData/required-entity" xsi:type="string">persistedKey</item>
-                <item name="/config/cest/before/createData/required-entity" xsi:type="string">persistedKey</item>
-                <item name="/config/cest/after/createData/required-entity" xsi:type="string">persistedKey</item>
+                <item name="/config/cest/test/createData/required-entity" xsi:type="string">createDataKey</item>
+                <item name="/config/cest/before/createData/required-entity" xsi:type="string">createDataKey</item>
+                <item name="/config/cest/after/createData/required-entity" xsi:type="string">createDataKey</item>
                 <item name="/config/cest/test/actionGroup/argument" xsi:type="string">name</item>
             </argument>
             <argument name="numericArrays" xsi:type="array">
diff --git a/src/Magento/FunctionalTestingFramework/Test/etc/sampleActionGroup.xml b/src/Magento/FunctionalTestingFramework/Test/etc/sampleActionGroup.xml
index 285be1f58..6939e2493 100644
--- a/src/Magento/FunctionalTestingFramework/Test/etc/sampleActionGroup.xml
+++ b/src/Magento/FunctionalTestingFramework/Test/etc/sampleActionGroup.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="testSchema.xsd">
-    <actionGroup name="sampleReusableActions" defaultEntity="testEntity">
+    <actionGroup name="sampleReusableActions">
         <arguments>
             <argument name="product" defaultValue="_defaultProduct" />
             <argument name="category" defaultValue="_defaultCategory" />
diff --git a/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd b/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
index edabbcbea..58f455a6e 100644
--- a/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
+++ b/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
@@ -38,7 +38,6 @@
             </xs:element>
         </xs:choice>
         <xs:attribute type="xs:string" name="name" use="required"/>
-        <xs:attribute type="xs:string" name="defaultEntity"/>
     </xs:complexType>
     <xs:complexType name="annotationsType">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -379,7 +378,7 @@
     <xs:complexType name="requiredEntityType">
         <xs:simpleContent>
             <xs:extension base="xs:string">
-                <xs:attribute type="xs:string" name="persistedKey" use="required"/>
+                <xs:attribute type="xs:string" name="createDataKey" use="required"/>
                 <xs:attribute type="xs:boolean" name="remove" default="false"/>
                 <xs:attribute type="xs:string" name="before"/>
                 <xs:attribute type="xs:string" name="after"/>
diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
index 971688fcf..c3e436f3b 100644
--- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -18,7 +18,7 @@
 class TestGenerator
 {
 
-    const REQUIRED_ENTITY_REFERENCE = 'persistedKey';
+    const REQUIRED_ENTITY_REFERENCE = 'createDataKey';
 
     /**
      * Path to the export dir.