diff --git a/.travis.yml b/.travis.yml
index 1d7c86b72aeda2378025909e79d495c3a8fe14c3..7b2f053a8fdc40de54173291a13b4883db109342 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,37 @@ cache:
     - "$HOME/.selenium/cache"
     
 php:
-  - 5.6
   - 7.0
-env:
-  - VERSION=8.x-4.x
   
+env:
+  - AFATG=01-website-base-requirements
+  - AFATG=02-user-management
+  - AFATG=03-admin-managment
+  - AFATG=04-content-structure
+  - AFATG=05-content-management
+
+matrix:
+  exclude:
+# Automated Functional Acceptance Testing group: 01 website base requirements
+  - php: 7.0
+    env: AFATG=01-website-base-requirements
+
+# Automated Functional Acceptance Testing group: 02 user management
+  - php: 7.0
+    env: AFATG=02-user-management
+
+# Automated Functional Acceptance Testing group: 03 admin managment
+  - php: 7.0
+    env: AFATG=03-admin-managment 
+
+# Automated Functional Acceptance Testing group: 04 content structure
+  - php: 7.0
+    env: AFATG=04-content-structure
+
+# Automated Functional Acceptance Testing group: 05 content-management
+  - php: 7.0
+    env: AFATG=05-content-management
+ 
 dist: precise
 
 addons:  
@@ -30,7 +56,7 @@ addons:
       - xserver-xorg-core
   
 mysql:
-  database: drupal
+  database: test_varbase4c
   username: root
   encoding: utf8
 
@@ -40,68 +66,58 @@ before_install:
   - composer self-update
   - composer --version
 
+  # Composer Configurations.
   - export PATH="$HOME/.composer/vendor/bin:$TRAVIS_BUILD_DIR/bin:$PATH"
-
   - export COMPOSER_EXIT_ON_PATCH_FAILURE=1
 
+  # MySQL Configurations.
   - mysql -e 'SET GLOBAL wait_timeout = 5400;'
   - mysql -e "SHOW VARIABLES LIKE 'wait_timeout'"
 
   # PHP Configurations.
-  - echo 'max_execution_time = 1200' >> drupal.php.ini;
-  - echo 'max_input_time = 180' >> drupal.php.ini;
-  - echo 'max_input_vars = 10000' >> drupal.php.ini;
-  - echo 'memory_limit = 2048M' >> drupal.php.ini;
-  - echo 'error_reporting = E_ALL' >> drupal.php.ini;
-  - echo 'post_max_size = 64M' >> drupal.php.ini;
-  - echo 'upload_max_filesize = 32M' >> drupal.php.ini;
-  - echo 'max_file_uploads = 40' >> drupal.php.ini;
-  - echo 'sendmail_path = /bin/true' >> drupal.php.ini;
-  - phpenv config-add drupal.php.ini
+  - echo 'max_execution_time = 1200' >> varbase.php.ini;
+  - echo 'max_input_time = 180' >> varbase.php.ini;
+  - echo 'max_input_vars = 10000' >> varbase.php.ini;
+  - echo 'memory_limit = 2048M' >> varbase.php.ini;
+  - echo 'error_reporting = E_ALL' >> varbase.php.ini;
+  - echo 'post_max_size = 64M' >> varbase.php.ini;
+  - echo 'upload_max_filesize = 32M' >> varbase.php.ini;
+  - echo 'max_file_uploads = 40' >> varbase.php.ini;
+  - echo 'sendmail_path = /bin/true' >> varbase.php.ini;
+  - phpenv config-add varbase.php.ini
   - phpenv rehash
    
-  # Configure the display.
+  # Configure and run the virtual display.
   - export DISPLAY=:0
   - sh -e /etc/init.d/xvfb start
   - Xvfb :0 -ac -screen 0 1366x768x24 &
-  - sleep 3 # give xvfb some time to start
-  
-  # Print firefox version.
-  - firefox --version
-  
+  - sleep 3
+
   # Run selenium standalone server.
   - SELENIUM="$HOME/.selenium/cache/selenium-server-standalone-2.53.1.jar";
   - if [[ ! -f $SELENIUM ]]; then wget -O $SELENIUM http://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar; fi
   - java -jar $SELENIUM -port 4445 > /dev/null 2>&1 &
   - echo "[  OK  ] Starting Selenium on the 4445 port ..."
-  
-  - composer global require phing/phing
-  
 install:
-  - phing build -Dversion=$VERSION -Dbranch=$TRAVIS_COMMIT
-
-  - phing install -Ddb.database=drupal
-  - if [ $VERSION != "HEAD" ]; then phing update; fi
-
-before_script:
+  - git checkout $TRAVIS_COMMIT
+  ## Build with the composer.
+  - composer install --no-interaction -vvv
+  
+  ## Install with drush.
   - cd docroot
-   
+  - drush site-install varbase --yes --site-name='Test Varbase4c' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url="mysql://root:@localhost/test_varbase4c" varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_development_tools.varbase_development=true
+  - drush pm-enable vbp_text_and_image --yes
+  - drush config-set system.performance css.preprocess 0 --yes
+  - drush config-set system.performance js.preprocess 0 --yes
+  - drush config-set system.logging error_level all --yes
+before_script:
   - drush runserver --default-server=builtin 8080 &>/dev/null &
   - sleep 5
-    
-  # Install Varbase Development feature.
-  # Development Environment Modules and Features, make sure to disable this feature in production.
-  - drush -y en varbase_development -vvv
-  - drush -y en varbase_heroslider_media -vvv
-  - drush -y en varbase_carousels -vvv
-  - drush -y en varbase_search -vvv
-  - drush -y en vbp_text_and_image -vvv
-
 script:
   - cd ./profiles/varbase
   - behat --strict tests/features/varbase/step1-init-tests/
-  - behat --strict tests/features/varbase/step2-apply-tests/
+  - behat --strict tests/features/varbase/step2-apply-tests/$AFATG
 #  - behat --strict tests/features/varbase/step3-cleanup-tests/  # no need as we build every time.
 
 matrix:
-  fast_finish: true
+  fast_finish: true
\ No newline at end of file
diff --git a/behat.varbase.yml b/behat.varbase.yml
index 8c5a37d6b7c3c4e68f6660abd242edb48d551e8d..2daae1c5c945e97ebe51d0ea90b1e2b6b8fcda6e 100644
--- a/behat.varbase.yml
+++ b/behat.varbase.yml
@@ -43,6 +43,7 @@ default:
         - Drupal\DrupalExtension\Context\MinkContext
         - Drupal\DrupalExtension\Context\MarkupContext
         - Drupal\DrupalExtension\Context\BatchContext
+        - Behatch\Context\SystemContext
         - behatch:browser:
             timeout: 1
         - behatch:debug:
@@ -93,7 +94,7 @@ default:
         error_message_selector: '.messages.error'
         success_message_selector: '.messages.status'
         warning_message_selector: '.messages.warning'
-    Sanpi\Behatch\Extension: ~
+    Behatch\Extension: ~
     emuse\BehatHTMLFormatter\BehatHTMLFormatterExtension:
       name: html
       renderer: Twig,Behat2
diff --git a/build.xml b/build.xml
index 0b024b7793e8b3a1816a338dea9ae916aac58e90..da0124068909a6a2b7583fbe7eab5290af9999f9 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
   <property name="db.host" value="localhost" />
   <property name="db.user" value="root" />
   <property name="db.password" value="" />
-  <property name="db.database" value="varbase" />
+  <property name="db.database" value="test_varbase4c" />
   <property name="db.url" value="${db.type}://${db.user}:${db.password}@${db.host}/${db.database}" />
   <property name="docroot" value="docroot" />
   <property name="profile" value="${docroot}/profiles/varbase" />
@@ -60,29 +60,6 @@
     <filesync destinationDir="." rsyncPath="${rsync}" sourceDir="${profile}/" verbose="false" exclude="libraries,modules/contrib,behat.local.yml" />
   </target>
 
-  <!-- Builds Varbase with Composer. -->
-  <target name="build" depends="env">
-    <if>
-      <equals arg1="${version}" arg2="HEAD" />
-      <then>
-        <exec command="${composer} install" passthru="true" />
-      </then>
-      <else>
-        <if>
-          <not>
-            <isset property="branch" />
-          </not>
-          <then>
-            <exec command="git rev-parse --abbrev-ref HEAD" outputProperty="branch" />
-          </then>
-        </if>
-        <exec command="git checkout ${version}" />
-        <exec command="${composer} install" passthru="true" />
-        <exec command="git checkout ${branch}" />
-      </else>
-    </if>
-  </target>
-
   <!-- Prepares the docroot for installation via the UI. -->
   <target name="preinstall" depends="uninstall">
     <if>
@@ -110,10 +87,11 @@
     </if>
   </target>
 
-  <!-- Installs Varbase and sets it up for development. -->
-  <target name="install" depends="env">
+  <!-- Install with drush site install -->
+  <target name="install-with-drush-site-install" depends="env">
     <!-- Use passthru() when executing drush site-install so that we'll know if errors occur. -->
-    <exec command="${drush} site-install varbase --yes --site-name=Varbase4 --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url=${db.url} varbase_multilingual_configuration.enable_multilingual=true -vvv" dir="${docroot}" passthru="true" />
+    <exec command="${drush} site-install varbase --yes --site-name='Test Varbase4c' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url=${db.url} varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_development_tools.varbase_development=true" dir="${docroot}" passthru="true" />
+    <exec command="${drush} en vbp_text_and_image --yes" dir="${docroot}" />
     <exec command="${drush} config-set system.performance css.preprocess 0 --yes --format=boolean" dir="${docroot}" />
     <exec command="${drush} config-set system.performance js.preprocess 0 --yes --format=boolean" dir="${docroot}" />
     <exec command="${drush} config-set system.logging error_level all --yes" dir="${docroot}" />
diff --git a/composer.json b/composer.json
index f8b4d839e456c85ce5ddf9ea86dabb0f4bbaeecc..4b0af90a996b78a5f53031f45bad4198a5a471ed 100644
--- a/composer.json
+++ b/composer.json
@@ -167,7 +167,7 @@
     "guzzlehttp/guzzle": "6.2.*@stable",
     "symfony/css-selector": "~2.8",
     "squizlabs/php_codesniffer": "2.*",
-    "behatch/contexts": "*",
+    "behatch/contexts": "2.7.1",
     "emuse/behat-html-formatter": "@stable"
   },
   "config": {
diff --git a/tests/features/bootstrap/VarbaseContext.php b/tests/features/bootstrap/VarbaseContext.php
index 13c6962b792ad0731340dec634e042ce43951953..313a5374a7e1024ee4611808f0245aca1a2f27d0 100644
--- a/tests/features/bootstrap/VarbaseContext.php
+++ b/tests/features/bootstrap/VarbaseContext.php
@@ -1344,11 +1344,9 @@ JS;
    /**
    * #varbase: To expand a field group by its id attribute.
    *
-   * Example 1: I Expand the field "Field Group ID"
-   * @When I Expand the field :arg1
+   * Example #1: I expand the field "Field Group ID"
    * 
-   * @param $text
-   * @throws \InvalidArgumentException
+   * @When I expand the field :arg1
    */
   public function iExpandThefield($fieldID) {
     $js = <<<JS
@@ -1360,12 +1358,11 @@ JS;
 
   /**
    * #varbase: To expand a select list by it's class attribute.
-   * 
-   * @When I Expand the :nth select list :arg1
    *
-   * @param $text
-   * @throws \InvalidArgumentException
-  */
+   * Example #1: I expand the "1" select list "dropbutton-multiple"
+   * 
+   * @When I expand the :nth select list :arg1
+   */
   public function iExpandTheSelectList($index, $listClassName) {
     $js = <<<JS
     var group = document.getElementsByClassName("{$listClassName}")[{$index}];
@@ -1376,6 +1373,8 @@ JS;
 
   /**
    * #varbase: To scroll down in the current status of the page.
+   *
+   * Example #1: When I scrolldown
    * 
    * @When I scrolldown
    */
@@ -1384,7 +1383,9 @@ JS;
   }
 
   /**
-   * #varbase: To scroll up in the current status of the page.
+   * #varbase: To scroll up in the current status of the page, about 350 up
+   *
+   * Example #1: When I scrollup
    * 
    * @When I scrollup
    */
diff --git a/tests/features/varbase/README.md b/tests/features/varbase/README.md
index bea397a0ea3003ba124ec577dc47156844398ff8..99ce1e2f059b9c0e5628afc1a12437a0bf2e6eb1 100644
--- a/tests/features/varbase/README.md
+++ b/tests/features/varbase/README.md
@@ -21,12 +21,11 @@ initialization and cleaning up after the test.
   $ bin/behat features/varbase/step2-apply-tests
   $ bin/behat features/varbase/step3-cleanup-tests
 ```
-For more custom commands: [Varbase Automated Functional Testing](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/README.md)
 
 
 ## List of features in the step 1 init tests:
 --------------------------------------------------------------------------------
-* [Feature: Create default testing users.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step1-init-tests/1-create-default-testing-users.feature)
+
 ```
 test_authenticated: { email: 'authenticated.test@vardot.com', password: 'dD.123123ddd' }
 test_editor: { email: 'editor.test@vardot.com', password: 'dD.123123ddd' }
@@ -35,43 +34,14 @@ test_site_admin: { email: 'site.admin.test@vardot.com', password: 'dD.123123ddd'
 test_super_admin: { email: 'super.admin.test@vardot.com', password: 'dD.123123ddd' }
 ```
 
-* [Feature: Add Arabic language if we do not have it to languages in the system.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step1-init-tests/2-add-arabic.feature)
-
-
 
 ## List of Features in the step 2 apply tests:
 --------------------------------------------------------------------------------
-* [01 - Feature: Website Base Requirements - User Registration - Only admins login](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/01-website-base-requirements_user-registration_only-admins-login_v4-0.feature)
-* [02 - Feature: Website Base Requirements - User Roles - Simple Roles](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/02-website-base-requirements_user-roles_simple-roles_v4-0.feature)
-* [03 - Feature: User Management - Standard User Management - Request new password](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/03-user-management_standard-user-managment_request-new-password_v4-0.feature)
-* [04 - Feature: Website Base Requirements - Website Languages - All content translatable to all languages](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/04-website-base-requirements_website-languages_all-content-translatable-to-all-languages_v4-0.feature)
-* [05 - Feature: User Management - Standard User Management - Admins can create users and assign a role to them](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/05-user-management_standard-user-management_admins-can-create-users-and-assign-role-them_v4-0.feature)
-* [06 - Feature: Website Base Requirements - Website Languages - English](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/06-website-base-requirements_website-languages_english_v4-0.feature)
-* [07 - Feature: User Management - Standard User Management - Login](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/07-user-management_standard-user-managment_login_v4-0.feature)
-* [08 - Feature: Content Editing - Rich Text Editor - Convert URLs into links](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/08-content-editing_rich-text-editor_convert-urls-links_v4-0.feature)
-* [09 - Feature: Content Editing - Rich Text Editor - Easy linking to internal content by searching for content by its titles](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/09-content-editing_rich-text-editor_easy-linking-internal-content-searching-content-by-its-titles-v4-0.feature)
-* [10 - Feature: Content Editing - Rich Text Editor - Input formats](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/10-content-editing_rich-text-editor_input-formats-v4-0.feature)
-* [11 - Feature: Content Structure Features - Basic Pages - Basic page](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/11-content-structure-features_basic-pages_basic-page_v4-0.feature)
-* [12 - Feature: Content Structure Features - Basic Pages - Pages with pre-defined layouts](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/12-content-structure-features_basic-pages_pages-with-pre-defined-layouts_v4-0.feature)
-* [13 - Feature: File & Media Management - Assets Management - Ability to embed existing media image library in the rich text editor](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/13-file-and-media-management_assets-management_ability-to-embed-existing-media-image-library-in-the-rich-text-editor_v4-0.feature)
-* [14 - Feature: File & Media Management - Assets Management - Image media and their usage list page for site admins](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/14-file-and-media-management_assets-management_image-media-and-their-usage-list-page-for-admins_v4-0.feature)
-* [15 - Feature: Support Requirements - Standard Support Navigation - Allow site super administrators to switch users and surf the site as that user.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/15-masquerade-allows-site-administrators-to-switch-users-and-surf-the-site-as-that-user.feature)
-* [16 - Feature: Navigational Features - Breadcrumbs - Standard breadcrumbs](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/16-navigational-features_breadcrumbs_standard-breadcrumbs_v4-0.feature)
-* [17 - Feature: Add default entityqueue module testing content and configuration.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/17-add-default-entityqueue-testing-content-and-config.feature)
-* [18 - Feature: Module Requirements - Standard Entity Queue Management - Have the option to Reverse order in admin view.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/18-entityqueue-reverse-order-in-admin-view.feature)
-* [19 - Feature: Module Requirements - Standard Entity Queue Management - Have Entityqueue tab inside the full content page and be able to Add to a queue or Remove from a queue](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/19-entityqueue-tab-for-content-types.feature)
-* [20 - Feature: Module Requirements - Standard Back-End Navigation - Navigate through the Drupal admin with the keyboard for faster access](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/20-coffee-standard-back-end-navigation-navigate-through-drupal-admin-keyboard.feature)
-* [21 - Feature: user requirements - Have persistent login options and configurations.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/21-persistent-login-testing.feature)
-* [22 - Feature: User Management - Standard User Management - Admins can disable users](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/22-user-management_standard-user-managment_admins-can-disable-users_v4-0.feature)
-* [23 - Feature: User Management - Standard User Management - Users with permission to assign roles may select which roles are available for assignment.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/23-roleassign-testing.feature)
-* [24 - Feature: User Management - Standard User Management - Have fine-grained access control of user administrators protections with specific user, or all users in a role.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/24-userprotect-testing.feature)
-* [25 - Feature: Landing Pages - Add any paragraph types to the page.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/25-landing-page_add-any-paragraph-type-to-the-page.feature)
-* [26 - Feature: Content Structure Features - Landing Pages - Varbase text and image paragraphs.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step2-apply-tests/26-content-structure-features_anding-pages-varbase-text-and-image-paragraphs.feature)
 
 
-## List of features in the step 2 cleanup tests:
+## List of features in the step 3 cleanup tests:
 --------------------------------------------------------------------------------
-* [Feature: Delete default testing users.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step3-cleanup-tests/1-delete-default-testing-users.feature)
+
 ```
 test_authenticated
 test_editor
@@ -79,6 +49,3 @@ test_content_admin
 test_site_admin
 test_super_admin
 ```
-
-* [Feature: Delete Arabic language from the system.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step3-cleanup-tests/2-delete-arabic.feature)
-* [Feature: Cleanup after entityqueue module tests.](https://github.com/Vardot/varbase/blob/8.x-4.x/tests/features/varbase/step3-cleanup-tests/3-cleanup-after-entityqueue-tests.feature)
diff --git a/tests/features/varbase/step1-init-tests/1-create-default-testing-users.feature b/tests/features/varbase/step1-init-tests/01-create-default-testing-users.feature
similarity index 100%
rename from tests/features/varbase/step1-init-tests/1-create-default-testing-users.feature
rename to tests/features/varbase/step1-init-tests/01-create-default-testing-users.feature
diff --git a/tests/features/varbase/step1-init-tests/2-add-arabic.feature b/tests/features/varbase/step1-init-tests/02-add-arabic.feature
similarity index 100%
rename from tests/features/varbase/step1-init-tests/2-add-arabic.feature
rename to tests/features/varbase/step1-init-tests/02-add-arabic.feature
diff --git a/tests/features/varbase/step1-init-tests/README.md b/tests/features/varbase/step1-init-tests/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..d69ac3dc4dd4f7e88f548da0c1571e7f5abb4c9b
--- /dev/null
+++ b/tests/features/varbase/step1-init-tests/README.md
@@ -0,0 +1,3 @@
+# Varbase Gherkin features
+# List of features in step 1
+# initialization tests
\ No newline at end of file
diff --git a/tests/features/varbase/step2-apply-tests/01-website-base-requirements_user-registration_only-admins-login_v4-0.feature b/tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-01-user-registration_only-admins-login.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/01-website-base-requirements_user-registration_only-admins-login_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-01-user-registration_only-admins-login.feature
diff --git a/tests/features/varbase/step2-apply-tests/02-website-base-requirements_user-roles_simple-roles_v4-0.feature b/tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-02-user-roles.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/02-website-base-requirements_user-roles_simple-roles_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-02-user-roles.feature
diff --git a/tests/features/varbase/step2-apply-tests/10-content-editing_rich-text-editor_input-formats-v4-0.feature b/tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-03-input-formats.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/10-content-editing_rich-text-editor_input-formats-v4-0.feature
rename to tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-03-input-formats.feature
diff --git a/tests/features/varbase/step2-apply-tests/06-website-base-requirements_website-languages_english_v4-0.feature b/tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-04-website-languages_english.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/06-website-base-requirements_website-languages_english_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-04-website-languages_english.feature
diff --git a/tests/features/varbase/step2-apply-tests/04-website-base-requirements_website-languages_all-content-translatable-to-all-languages_v4-0.feature b/tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-05-translatable-content-types-to-all-languages.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/04-website-base-requirements_website-languages_all-content-translatable-to-all-languages_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-05-translatable-content-types-to-all-languages.feature
diff --git a/tests/features/varbase/step2-apply-tests/08-content-editing_rich-text-editor_convert-urls-links_v4-0.feature b/tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-06-convert-urls-links.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/08-content-editing_rich-text-editor_convert-urls-links_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/01-website-base-requirements/01-06-convert-urls-links.feature
diff --git a/tests/features/varbase/step2-apply-tests/03-user-management_standard-user-managment_request-new-password_v4-0.feature b/tests/features/varbase/step2-apply-tests/02-user-management/02-01-request-new-password.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/03-user-management_standard-user-managment_request-new-password_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/02-user-management/02-01-request-new-password.feature
diff --git a/tests/features/varbase/step2-apply-tests/05-user-management_standard-user-management_admins-can-create-users-and-assign-role-them_v4-0.feature b/tests/features/varbase/step2-apply-tests/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/05-user-management_standard-user-management_admins-can-create-users-and-assign-role-them_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature
diff --git a/tests/features/varbase/step2-apply-tests/07-user-management_standard-user-managment_login_v4-0.feature b/tests/features/varbase/step2-apply-tests/02-user-management/02-03-user-login.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/07-user-management_standard-user-managment_login_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/02-user-management/02-03-user-login.feature
diff --git a/tests/features/varbase/step2-apply-tests/21-persistent-login-testing.feature b/tests/features/varbase/step2-apply-tests/02-user-management/02-04-persistent-login.feature
similarity index 93%
rename from tests/features/varbase/step2-apply-tests/21-persistent-login-testing.feature
rename to tests/features/varbase/step2-apply-tests/02-user-management/02-04-persistent-login.feature
index 38cdfda9c370b24468047bdaea66edcf8f2d96a9..8a3cd863231f3f9eb2f6c214700191d087b2037a 100644
--- a/tests/features/varbase/step2-apply-tests/21-persistent-login-testing.feature
+++ b/tests/features/varbase/step2-apply-tests/02-user-management/02-04-persistent-login.feature
@@ -1,4 +1,4 @@
-Feature: user requirements - Have persistent login options and configurations.
+Feature: User Management - Have persistent login options and configurations.
   As a user which can login to the site.
   I want to have the option to have "Remember Me" option on the user login form.
   So I can persistent my login session independent of setting of a long session lifetime.
diff --git a/tests/features/varbase/step2-apply-tests/24-userprotect-testing.feature b/tests/features/varbase/step2-apply-tests/02-user-management/02-05-user-protect.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/24-userprotect-testing.feature
rename to tests/features/varbase/step2-apply-tests/02-user-management/02-05-user-protect.feature
diff --git a/tests/features/varbase/step2-apply-tests/23-roleassign-testing.feature b/tests/features/varbase/step2-apply-tests/02-user-management/02-06-role-assign.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/23-roleassign-testing.feature
rename to tests/features/varbase/step2-apply-tests/02-user-management/02-06-role-assign.feature
diff --git a/tests/features/varbase/step2-apply-tests/15-masquerade-allows-site-administrators-to-switch-users-and-surf-the-site-as-that-user.feature b/tests/features/varbase/step2-apply-tests/03-admin-managment/03-01-allows-site-administrators-to-masquerade-by-switching-users.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/15-masquerade-allows-site-administrators-to-switch-users-and-surf-the-site-as-that-user.feature
rename to tests/features/varbase/step2-apply-tests/03-admin-managment/03-01-allows-site-administrators-to-masquerade-by-switching-users.feature
diff --git a/tests/features/varbase/step2-apply-tests/20-coffee-standard-back-end-navigation-navigate-through-drupal-admin-keyboard.feature b/tests/features/varbase/step2-apply-tests/03-admin-managment/03-02-navigate-through-drupal-admin-keyboard.feature
similarity index 92%
rename from tests/features/varbase/step2-apply-tests/20-coffee-standard-back-end-navigation-navigate-through-drupal-admin-keyboard.feature
rename to tests/features/varbase/step2-apply-tests/03-admin-managment/03-02-navigate-through-drupal-admin-keyboard.feature
index 4da411d711c7ba72d0482744f0d8a5150ad1b703..c94bc6e3635652d35f029509413ce61116dcd7dc 100644
--- a/tests/features/varbase/step2-apply-tests/20-coffee-standard-back-end-navigation-navigate-through-drupal-admin-keyboard.feature
+++ b/tests/features/varbase/step2-apply-tests/03-admin-managment/03-02-navigate-through-drupal-admin-keyboard.feature
@@ -1,4 +1,4 @@
-Feature: Module Requirements - Standard Back-End Navigation - Navigate through the Drupal admin with the keyboard for faster access
+Feature: Admin Managment - Standard Back-End Navigation - Navigate through the Drupal admin with the keyboard for faster access
 As a site admin
 I want to be able to navigate through the Drupal admin with the keyboard
 So that I will have a faster access to administration pages in the site.
diff --git a/tests/features/varbase/step2-apply-tests/22-user-management_standard-user-managment_admins-can-disable-users_v4-0.feature b/tests/features/varbase/step2-apply-tests/03-admin-managment/03-03-admins-can-disable-users.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/22-user-management_standard-user-managment_admins-can-disable-users_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/03-admin-managment/03-03-admins-can-disable-users.feature
diff --git a/tests/features/varbase/step2-apply-tests/14-file-and-media-management_assets-management_image-media-and-their-usage-list-page-for-admins_v4-0.feature b/tests/features/varbase/step2-apply-tests/03-admin-managment/03-04-image-media-and-their-usage-list-page-for-admins.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/14-file-and-media-management_assets-management_image-media-and-their-usage-list-page-for-admins_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/03-admin-managment/03-04-image-media-and-their-usage-list-page-for-admins.feature
diff --git a/tests/features/varbase/step2-apply-tests/11-content-structure-features_basic-pages_basic-page_v4-0.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-01-basic-page-permissions.feature
similarity index 98%
rename from tests/features/varbase/step2-apply-tests/11-content-structure-features_basic-pages_basic-page_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/04-content-structure/04-01-basic-page-permissions.feature
index c5bbe5f02263acf098ee53be631362da0b479113..6e7fd55cc2e03b1ac7680d338e903e4fe2f6f003 100644
--- a/tests/features/varbase/step2-apply-tests/11-content-structure-features_basic-pages_basic-page_v4-0.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-01-basic-page-permissions.feature
@@ -1,4 +1,4 @@
-Feature: Content Structure Features - Basic Pages - Basic page
+Feature: Content Structure - Basic Page.
 As a logged in user with a permission to mange Basic pages
 I want to be able to add a "Basic page" to the site with a fixed layout
 So that the "Basic page" will show up in the structured menu under its parent page
diff --git a/tests/features/varbase/step2-apply-tests/12-content-structure-features_basic-pages_pages-with-pre-defined-layouts_v4-0.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-02-landing-page-permissions.feature
similarity index 96%
rename from tests/features/varbase/step2-apply-tests/12-content-structure-features_basic-pages_pages-with-pre-defined-layouts_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/04-content-structure/04-02-landing-page-permissions.feature
index e4af130a6c87eba8b3aa4777842f12b3f565ecb4..2f1675b0e96d24fc92867f654913937f35bec723 100644
--- a/tests/features/varbase/step2-apply-tests/12-content-structure-features_basic-pages_pages-with-pre-defined-layouts_v4-0.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-02-landing-page-permissions.feature
@@ -1,6 +1,6 @@
-Feature: Content Structure Features - Basic Pages - Pages with pre-defined layouts
+Feature: Content Structure - Landing Pages
 As a logged in user with a permission to manage Landing pages.
-I want to be able to add a "Landing page" which has got predefined layouts
+I want to be able to add a "Landing page" which has got predefined set of paragrphs
 So that the "Landing page" will show up in the structured menu under its parent page
 
   @javascript @local @development @staging @production
diff --git a/tests/features/varbase/step2-apply-tests/25-landing-page_add-any-paragraph-type-to-the-page.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature
old mode 100755
new mode 100644
similarity index 88%
rename from tests/features/varbase/step2-apply-tests/25-landing-page_add-any-paragraph-type-to-the-page.feature
rename to tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature
index 59a2c14fcde5b9a695b4e88bf84cf7283f60c317..38b0d10996774e763098ba4bbf8ad3cec3ef2fdb
--- a/tests/features/varbase/step2-apply-tests/25-landing-page_add-any-paragraph-type-to-the-page.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature
@@ -5,7 +5,7 @@ So that the "Landing page" will show up having paragrpahs of different types
 
 @local @development @staging @production
   Scenario: Upload the "Embed Flag Earth" file.
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "/admin/content/media"
       And I wait
      Then I should see "Add media"
@@ -33,9 +33,9 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I should see the "Edit" in the "Embed Flag Earth" row
   #-----------------------------------------------------------------------------
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "Carousel"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page Carousel" for "Title"
@@ -52,7 +52,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I scrolldown
       And I wait for AJAX to finish
       And I select "2 Seconds" from "Slide interval"
-      And I Expand the "1" select list "dropbutton-multiple"
+      And I expand the "1" select list "dropbutton-multiple"
       And I wait
       And I scrollup
       And I press "Add Image"
@@ -67,8 +67,9 @@ So that the "Landing page" will show up having paragrpahs of different types
      Then I should see image with the "Embed Flag Earth all earth in space" title text
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
+      And I wait for AJAX to finish
       And I wait
-      And I Expand the "1" select list "dropbutton-multiple"
+      And I expand the "1" select list "dropbutton-multiple"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
@@ -83,17 +84,18 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
      Then I should see image with the "Embed Flag Earth all earth in space" title text
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
-      And wait
+      And I wait
       And I switch to main frame
       And I wait for AJAX to finish
+      And I wait
       And I press "Save"
       And I wait
      Then I should see "Landing page Test Landing page Carousel has been created"
       And I should see image with the "Embed Flag Earth all earth in space" title text
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "Accordion"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page Accordion" for "Title"
@@ -108,7 +110,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I scrolldown
       And I wait for AJAX to finish
      Then I should see "styling settings"
-     When I Expand the field "styling-settings"
+     When I expand the field "styling-settings"
       And I press the "Select an image" button
       And I wait for AJAX to finish
      Then the image media browser should be open
@@ -120,8 +122,10 @@ So that the "Landing page" will show up having paragrpahs of different types
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I wait
       And I switch to main frame
+      And I wait for AJAX to finish
+      And I wait
       And I fill in "Accordion Section Title test" for "Accordion section title"
-     When I Expand the "1" select list "dropbutton-multiple"
+     When I expand the "1" select list "dropbutton-multiple"
       And I press "Add Rich Text"
       And I wait
      Then I should see "Accordion section body"
@@ -132,9 +136,9 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait
       And I should see "Accordion Section Body test"
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "Drupal Block"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page Drupal Block" for "Title"
@@ -157,9 +161,9 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait
      Then I should see "Landing page Test Landing page Drupal Block has been created"
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "Columns (Equal)"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page Columns (Equal)" for "Title"
@@ -175,7 +179,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I Expand the field "styling-settings"
+      And I expand the field "styling-settings"
       And I wait for AJAX to finish
       And I press the "Select an image" button
       And I wait for AJAX to finish
@@ -186,9 +190,10 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
      Then I should see image with the "Embed Flag Earth all earth in space" title text
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
-
       And I switch to main frame
-     When I Expand the "1" select list "dropbutton-multiple"
+      And I wait for AJAX to finish
+      And I wait
+      And I expand the "1" select list "dropbutton-multiple"
       And I scrollup
       And I press "Add Image"
       And I wait for AJAX to finish
@@ -203,8 +208,8 @@ So that the "Landing page" will show up having paragrpahs of different types
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
       And I wait for AJAX to finish
-
-     When I Expand the "1" select list "dropbutton-multiple"
+      And I wait
+      And I expand the "1" select list "dropbutton-multiple"
       And I press "Add Image"
       And I wait for AJAX to finish
       And I scrolldown
@@ -220,13 +225,14 @@ So that the "Landing page" will show up having paragrpahs of different types
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
       And I wait for AJAX to finish
-     When I press "Save"
+      And I wait
+      And I press "Save"
       And I wait
      Then I should see "Landing page Test Landing page Columns (Equal) has been created"
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "Columns (Two Uneven)"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page Columns (Two Uneven)" for "Title"
@@ -241,7 +247,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I Expand the field "styling-settings"
+      And I expand the field "styling-settings"
       And I press the "Select an image" button
       And I wait for AJAX to finish
      Then the image media browser should be open
@@ -252,9 +258,9 @@ So that the "Landing page" will show up having paragrpahs of different types
      Then I should see image with the "Embed Flag Earth all earth in space" title text
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
+      And I wait for AJAX to finish
       And I wait
-
-      And I Expand the "1" select list "dropbutton-multiple"
+      And I expand the "1" select list "dropbutton-multiple"
       And I scrollup
       And I press "Add Image"
       And I wait for AJAX to finish
@@ -268,8 +274,9 @@ So that the "Landing page" will show up having paragrpahs of different types
      Then I should see image with the "Embed Flag Earth all earth in space" title text
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
+      And I wait for AJAX to finish
       And I wait
-      And I Expand the "1" select list "dropbutton-multiple"
+      And I expand the "1" select list "dropbutton-multiple"
       And I press "Add Image"
       And I wait for AJAX to finish
       And I scrolldown
@@ -288,9 +295,9 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait
      Then I should see "Landing page Test Landing page Columns (Two Uneven) has been created"
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "Columns (Three Uneven)"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page Columns (Three Uneven)" for "Title"
@@ -306,7 +313,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I Expand the field "styling-settings"
+      And I expand the field "styling-settings"
       And I press the "Select an image" button
       And I wait for AJAX to finish
      Then the image media browser should be open
@@ -319,7 +326,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I switch to main frame
       And I wait
 
-      And I Expand the "1" select list "dropbutton-multiple"
+      And I expand the "1" select list "dropbutton-multiple"
       And I scrollup
       And I press "Add Image"
       And I wait for AJAX to finish
@@ -335,7 +342,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I switch to main frame
       And I wait
 
-      And I Expand the "1" select list "dropbutton-multiple"
+      And I expand the "1" select list "dropbutton-multiple"
       And I press "Add Image"
       And I wait for AJAX to finish
       And I scrolldown
@@ -352,7 +359,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I switch to main frame
       And I wait for AJAX to finish
   
-      And I Expand the "1" select list "dropbutton-multiple"
+      And I expand the "1" select list "dropbutton-multiple"
       And I press "Add Rich Text"
       And I wait for AJAX to finish
       And I fill in the rich text editor field "Text" with "Rich text test - column Three"
@@ -360,9 +367,9 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait
      Then I should see "Landing page Test Landing page Columns (Three Uneven) has been created"
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "Image"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page Image" for "Title"
@@ -392,9 +399,9 @@ So that the "Landing page" will show up having paragrpahs of different types
      Then I should see "Landing page Test Landing page Image has been created"
       And I should see image with the "Embed Flag Earth all earth in space" title text
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "Modal"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page Modal" for "Title"
@@ -411,7 +418,7 @@ So that the "Landing page" will show up having paragrpahs of different types
      Then I should see "Components"
      When I fill in "Modal button" for "Modal button text"
       And I fill in "Modal title" for "Modal title"
-      And I Expand the "1" select list "dropbutton-multiple"
+      And I expand the "1" select list "dropbutton-multiple"
       And I press "Add Rich Text"
       And I wait
      Then I should see "Modal body"
@@ -419,13 +426,13 @@ So that the "Landing page" will show up having paragrpahs of different types
      When I press "Save"
      Then I should see "Landing page Test Landing page Modal has been created"
      When I press "Modal button"
-      And I wait
+      And I wait for AJAX to finish
      Then I should see "Modal title"
       And I should see "Modal Body test"
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "Rich Text"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page Rich Text" for "Title"
@@ -441,7 +448,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I should see "Components"
       And I fill in the rich text editor field "Text" with "Rich Text test"
-      And I Expand the field "styling-settings"
+      And I expand the field "styling-settings"
       And I wait for AJAX to finish
       And I press the "Select an image" button
       And I wait for AJAX to finish
@@ -459,9 +466,9 @@ So that the "Landing page" will show up having paragrpahs of different types
      Then I should see "Landing page Test Landing page Rich Text has been created"
       And I should see "Rich Text test"
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "Tabs"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page Tabs" for "Title"
@@ -477,7 +484,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I Expand the field "styling-settings"
+      And I expand the field "styling-settings"
       And I press the "Select an image" button
       And I wait for AJAX to finish
      Then the image media browser should be open
@@ -490,7 +497,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I switch to main frame
       And I should see "Components"
       And I fill in "Tab 1" for "Tab name"
-      And I Expand the "1" select list "dropbutton-multiple"
+      And I expand the "1" select list "dropbutton-multiple"
       And I press "Add Rich Text"
       And I wait
      Then I should see "Tab body"
@@ -501,9 +508,9 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I should see "Tab 1"
       And I should see "Tab 1 - Body test"
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type can add paragraphs of type "WebForm"
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
      When I go to "node/add/landing_page"
       And I wait
       And I fill in "Test Landing page WebForm" for "Title"
diff --git a/tests/features/varbase/step2-apply-tests/26-content-structure-features_anding-pages-varbase-text-and-image-paragraphs.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
old mode 100755
new mode 100644
similarity index 96%
rename from tests/features/varbase/step2-apply-tests/26-content-structure-features_anding-pages-varbase-text-and-image-paragraphs.feature
rename to tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
index bd7cbcb08422ac97d6fbf3bbbac57f914c62f6c0..9e6eb9e66f2e5ca5fecf8e5683502726cf98163c
--- a/tests/features/varbase/step2-apply-tests/26-content-structure-features_anding-pages-varbase-text-and-image-paragraphs.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
@@ -1,4 +1,4 @@
-Feature: Content Structure Features - Landing Pages - Varbase text and image paragraphs.
+Feature: Content Structure - Landing Pages - Varbase text and image paragraphs.
 As a logged in user with a permission to mange Landing pages
 I want to be able to add number of Text and image paragraph compoments
 So that the "Landing page" will have text and images in right and left view.
@@ -32,7 +32,7 @@ So that the "Landing page" will have text and images in right and left view.
      Then I should see "Add media"
       And I should see the "Edit" in the "Embed Flag Earth" row
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Landing page" content type create a new Landing page that will look like this page https://www.getopensocial.com/features
   
     Given I am a logged in user with the "test_site_admin" user
@@ -78,7 +78,7 @@ So that the "Landing page" will have text and images in right and left view.
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
       And I wait
-     Then I Expand the field "styling-settings"
+     Then I expand the field "styling-settings"
       And I select "Blue" from "Background color"
       And I click "Content settings"
       And I select "Right" from "Image position"
@@ -109,7 +109,7 @@ So that the "Landing page" will have text and images in right and left view.
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
       And I wait
-     Then I Expand the field "styling-settings"
+     Then I expand the field "styling-settings"
       And I click "Content settings"
       And I select "Medium" from "Width"
       And I select "Left" from "Image position"
diff --git a/tests/features/varbase/step2-apply-tests/16-navigational-features_breadcrumbs_standard-breadcrumbs_v4-0.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-05-standard-bredcrumbs.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/16-navigational-features_breadcrumbs_standard-breadcrumbs_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/04-content-structure/04-05-standard-bredcrumbs.feature
diff --git a/tests/features/varbase/step2-apply-tests/17-add-default-entityqueue-testing-content-and-config.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-00-add-default-entityqueue-testing-content-and-config.feature
similarity index 89%
rename from tests/features/varbase/step2-apply-tests/17-add-default-entityqueue-testing-content-and-config.feature
rename to tests/features/varbase/step2-apply-tests/05-content-management/05-00-add-default-entityqueue-testing-content-and-config.feature
index 2bcfe121a49bb564015b21eff7378148e46d17d2..92095d30d84f6ca347c868a778a31d0ef52b3035 100644
--- a/tests/features/varbase/step2-apply-tests/17-add-default-entityqueue-testing-content-and-config.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-00-add-default-entityqueue-testing-content-and-config.feature
@@ -1,6 +1,6 @@
-Feature: Add default [entityqueue] module testing content and configuration.
+Feature: Content Management - Add default [entityqueue] module testing content and configuration.
 
-@javascript @init @local @development
+@javascript @init @tools @local @development @staging
 Scenario: Create "Test Content" content type.
   Given I am a logged in user with the "webmaster" user
    When I go to "/admin/structure/types/add"
@@ -12,7 +12,7 @@ Scenario: Create "Test Content" content type.
     And I wait
    Then I should see "The content type Test Content has been added."
 
-@javascript @init @local @development
+@javascript @init @tools @local @development @staging
 Scenario: Add Entity Queue "Test Queue" and use "Test Content" content type.
   Given I am a logged in user with the "webmaster" user
    When I go to "/admin/structure/entityqueue"
@@ -28,7 +28,7 @@ Scenario: Add Entity Queue "Test Queue" and use "Test Content" content type.
     And I wait
    Then I should see "The entity queue Test Queue has been added."
 
-@javascript @init @local @development
+@javascript @init @tools @local @development @staging
 Scenario: Add Test content N1, N2, N3, N4 type of test content.
   Given I am a logged in user with the "webmaster" user
    When I go to "/node/add/test_content"
@@ -58,9 +58,7 @@ Scenario: Add Test content N1, N2, N3, N4 type of test content.
     And I wait
    Then I should see "Test Content Test content N3 has been created."
 
-
-
-@javascript @init @local @development
+@javascript @init @tools @local @development @staging
 Scenario: Add Test content N1, N2, N3, N4 nodes to the "Test Queue" entityqueue.
   Given I am a logged in user with the "webmaster" user
    When I go to "/admin/structure/entityqueue"
@@ -89,4 +87,4 @@ Scenario: Add Test content N1, N2, N3, N4 nodes to the "Test Queue" entityqueue.
    Then I should see "Edit subqueue Test Queue"
    When I fill in "Test content N3" for "items[2][target_id]"
     And I press "Save"
-   Then I should see "3 items" in the "Test Queue" row
\ No newline at end of file
+   Then I should see "3 items" in the "Test Queue" row
diff --git a/tests/features/varbase/step2-apply-tests/18-entityqueue-reverse-order-in-admin-view.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-01-entityqueue-reverse-order-in-admin-view.feature
similarity index 93%
rename from tests/features/varbase/step2-apply-tests/18-entityqueue-reverse-order-in-admin-view.feature
rename to tests/features/varbase/step2-apply-tests/05-content-management/05-01-entityqueue-reverse-order-in-admin-view.feature
index 94939e3a27485b04e24c428138a175f6d71f1d8f..3ce989025b188fc1508099f2c04a85eef92d0cf0 100644
--- a/tests/features/varbase/step2-apply-tests/18-entityqueue-reverse-order-in-admin-view.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-01-entityqueue-reverse-order-in-admin-view.feature
@@ -1,4 +1,4 @@
-Feature: Module Requirements - Standard Entity Queue Management - Have the option to Reverse order in admin view.
+Feature: Content Management - Standard Entity Queue Management - Have the option to Reverse order in admin view.
 As a logged in user with a permisstioto manage entityqueues 
 I well be able to view the order of entities in entity queues in a reverse order.
 So that they will have a flipped order at the front-end.
diff --git a/tests/features/varbase/step2-apply-tests/19-entityqueue-tab-for-content-types.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-02-entityqueue-tab-for-content-types.feature
similarity index 87%
rename from tests/features/varbase/step2-apply-tests/19-entityqueue-tab-for-content-types.feature
rename to tests/features/varbase/step2-apply-tests/05-content-management/05-02-entityqueue-tab-for-content-types.feature
index 8e621defcec6c45e1f273ec3d0374b57ff111249..7c97b274373c4d16da0ff20b3b06676e65ea76ac 100644
--- a/tests/features/varbase/step2-apply-tests/19-entityqueue-tab-for-content-types.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-02-entityqueue-tab-for-content-types.feature
@@ -1,4 +1,4 @@
-Feature: Module Requirements - Standard Entity Queue Management - Have Entityqueue tab inside the full content page and be able to Add to a queue or Remove from a queue
+Feature: Content Management - Standard Entity Queue Management - Have Entityqueue tab inside the full content page and be able to Add to a queue or Remove from a queue
 As a logged in user with a permission to manage entity queues
 I well be able to see an Entityqueue tab inside the full content page of a selected content
 So that I can Add to queue or Remove from queue for the content.
diff --git a/tests/features/varbase/step2-apply-tests/27-content-varbase-heroslider_add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
similarity index 85%
rename from tests/features/varbase/step2-apply-tests/27-content-varbase-heroslider_add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
rename to tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
index 34369b95fa55a1061c2f77e0a6ae591a7e56ceaa..398daa2afbba6b0a42606bf6226e1c43e822033b 100644
--- a/tests/features/varbase/step2-apply-tests/27-content-varbase-heroslider_add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
@@ -1,8 +1,8 @@
-Feature: Entityqueue form widget
+Feature: Content Management - Add hero slider to entityqueue using entityqueue form widget.
 As a logged in user with a permission to mange entityqueues
 I want to be able to add and remove entities to any allowed entityqueue.
 
-@local @development @staging @production
+  @local @development @staging @production
   Scenario: Upload the "Embed Flag Earth" file.
     Given I am a logged in user with the "test_super_admin" user
      When I go to "/admin/content/media"
@@ -31,7 +31,7 @@ I want to be able to add and remove entities to any allowed entityqueue.
      Then I should see "Add media"
       And I should see the "Edit" in the "Embed Flag Earth" row
 
-  @javascript @local @development
+  @javascript @local @development @staging @production
   Scenario: Check if a user with a permission to manage "Entity queues" can add a "heroslider" to "heroslider entityqueu"
     Given I am a logged in user with the "test_super_admin" user
      When I go to "node/add/varbase_heroslider_media"
@@ -49,19 +49,19 @@ I want to be able to add and remove entities to any allowed entityqueue.
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
       And I wait
-     Then I Expand the field "edit-entityqueue-form-widget"
+     Then I expand the field "edit-entityqueue-form-widget"
       And I check the box "varbase_heroslider_media"
       And I press "Save"
 
-  @javascript @local @development
-  Scenario: Check if the "Hero slider" added to the "varbase_heroslider_media" entityqueue
+  @javascript @local @development @staging @production
+  Scenario: Check if the "Hero slider" added to the "varbase_heroslider_media" entityqueue.
     Given I am a logged in user with the "test_super_admin" user
      When I go to "admin/structure/entityqueue/varbase_heroslider_media/varbase_heroslider_media"
       And I wait
      Then I should see "Test hero slider" value in the "edit-items-0-target-id" input element
 
-  @javascript @local @development
-  Scenario: Remove "Hero slider" from the "varbase_heroslider_media" entityqueue
+  @javascript @local @development @staging @production
+  Scenario: Remove a "Hero slider" from the "varbase_heroslider_media" entityqueue
     Given I am a logged in user with the "test_super_admin" user
      When I go to "admin/content"
       And I wait
@@ -74,7 +74,7 @@ I want to be able to add and remove entities to any allowed entityqueue.
       And I wait
      When I click "Edit"
       And I wait
-      And I Expand the field "edit-entityqueue-form-widget"
+      And I expand the field "edit-entityqueue-form-widget"
      Then the "varbase_heroslider_media" checkbox should be checked
      When I uncheck the box "varbase_heroslider_media"
       And I press "Save"
diff --git a/tests/features/varbase/step2-apply-tests/28-landing-page_use-entity-clone-module-to-clone.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
similarity index 95%
rename from tests/features/varbase/step2-apply-tests/28-landing-page_use-entity-clone-module-to-clone.feature
rename to tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
index ac44f5b3efa898fa652d208a15470a8099b51fee..19d48fb0b2b4e0bfc7a2cba21f2e630539c1b4b5 100644
--- a/tests/features/varbase/step2-apply-tests/28-landing-page_use-entity-clone-module-to-clone.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
@@ -1,4 +1,4 @@
-Feature: Entity clone module - test cloning an entity
+Feature: Content Management - Cloning content and entities.
 As a logged in user with a permission to mange entities
 I want to be able to clone an entity.
 
@@ -21,7 +21,7 @@ I want to be able to clone an entity.
      Then I should see "Components"
      When I fill in "Modal button" for "Modal button text"
       And I fill in "Modal title" for "Modal title"
-      And I Expand the "1" select list "dropbutton-multiple"
+      And I expand the "1" select list "dropbutton-multiple"
       And I press "Add Rich Text"
       And I wait
      Then I should see "Modal body"
diff --git a/tests/features/varbase/step2-apply-tests/13-file-and-media-management_assets-management_ability-to-embed-existing-media-image-library-in-the-rich-text-editor_v4-0.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
similarity index 98%
rename from tests/features/varbase/step2-apply-tests/13-file-and-media-management_assets-management_ability-to-embed-existing-media-image-library-in-the-rich-text-editor_v4-0.feature
rename to tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
index ae07793b50d431472ffa74597208a2f4b7e29388..77763fe9554d5714448ff27ccfef2f08ca8a44ab 100644
--- a/tests/features/varbase/step2-apply-tests/13-file-and-media-management_assets-management_ability-to-embed-existing-media-image-library-in-the-rich-text-editor_v4-0.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
@@ -4,7 +4,7 @@ I want to be able to embed existing files from the library of files in the CKEdi
 So that it will show up under that rich text field without having to upload the image for each content
 
   Background:
-    Given I am a logged in user with the "test_super_admin" user
+    Given I am a logged in user with the "test_site_admin" user
 
   # Create the Basic page and upload the file to the library before the test case.
   # ----------------------------------------------------------------------------
diff --git a/tests/features/varbase/step2-apply-tests/09-content-editing_rich-text-editor_easy-linking-internal-content-searching-content-by-its-titles-v4-0.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-06-easy-linking-internal-content-searching-content-by-its-titles.feature
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/09-content-editing_rich-text-editor_easy-linking-internal-content-searching-content-by-its-titles-v4-0.feature
rename to tests/features/varbase/step2-apply-tests/05-content-management/05-06-easy-linking-internal-content-searching-content-by-its-titles.feature
diff --git a/tests/features/varbase/step2-apply-tests/README.md b/tests/features/varbase/step2-apply-tests/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..f7328abd8d6a963aa8580af9e59349c6d810dcab
--- /dev/null
+++ b/tests/features/varbase/step2-apply-tests/README.md
@@ -0,0 +1,3 @@
+# Varbase Gherkin features
+# Apply tests
+# List of Features in the step 2
\ No newline at end of file
diff --git a/tests/features/varbase/step3-cleanup-tests/1-delete-default-testing-users.feature b/tests/features/varbase/step3-cleanup-tests/01-delete-default-testing-users.feature
similarity index 100%
rename from tests/features/varbase/step3-cleanup-tests/1-delete-default-testing-users.feature
rename to tests/features/varbase/step3-cleanup-tests/01-delete-default-testing-users.feature
diff --git a/tests/features/varbase/step3-cleanup-tests/2-delete-arabic.feature b/tests/features/varbase/step3-cleanup-tests/02-delete-arabic.feature
similarity index 100%
rename from tests/features/varbase/step3-cleanup-tests/2-delete-arabic.feature
rename to tests/features/varbase/step3-cleanup-tests/02-delete-arabic.feature
diff --git a/tests/features/varbase/step3-cleanup-tests/03-cleanup-after-entityqueue-tests.feature b/tests/features/varbase/step3-cleanup-tests/03-cleanup-after-entityqueue-tests.feature
new file mode 100644
index 0000000000000000000000000000000000000000..daf4c1d103f04c09560efb37866f8310af1c3a14
--- /dev/null
+++ b/tests/features/varbase/step3-cleanup-tests/03-cleanup-after-entityqueue-tests.feature
@@ -0,0 +1,22 @@
+Feature: Cleanup after [entityqueue] module tests.
+
+@javascript @cleanup @local @development
+Scenario: Delete Entity Queue "Test Queue".
+  Given I am a logged in user with the "webmaster" user
+   When I go to "/admin/structure/entityqueue/test_queue/delete"
+    And I wait
+   Then I should see "Are you sure you want to delete the entity queue Test Queue?"
+   When I press "Delete"
+    And I wait
+   Then I should see "The entity queue Test Queue has been deleted."
+
+
+@javascript @cleanup @local @development
+Scenario: Delete "Test Content" content type item
+  Given I am a logged in user with the "webmaster" user
+   When I go to "/admin/structure/types/manage/test_content/delete"
+    And I wait
+   Then I should see "Are you sure you want to delete the content type Test Content?"
+   When I press "Delete"
+    And I wait
+   Then I should see "The content type Test Content has been deleted."
diff --git a/tests/features/varbase/step3-cleanup-tests/3-cleanup-after-entityqueue-tests.feature b/tests/features/varbase/step3-cleanup-tests/3-cleanup-after-entityqueue-tests.feature
deleted file mode 100644
index 450075e46cc410cce48bad9a3e68b692a85a6489..0000000000000000000000000000000000000000
--- a/tests/features/varbase/step3-cleanup-tests/3-cleanup-after-entityqueue-tests.feature
+++ /dev/null
@@ -1,90 +0,0 @@
-Feature: Cleanup after [entityqueue] module tests.
-
-@javascript @cleanup @local @development
-Scenario: Delete Test content N1, N2, N3, N4 type of test content.
-  Given I am a logged in user with the "webmaster" user
-   When I go to "/admin/content"
-    And I wait
-   Then I should see "Content"
-   When I fill in "Test content N1" for "Title"
-    And I press "Filter"
-    And I wait
-   Then I should see "Test content N1"
-   When I click "Edit" in the "Test content N1" row
-    And I wait
-   Then I should see "Edit Test Content Test content N1"
-   When I click "Delete"
-    And I wait
-   Then I should see "Are you sure you want to delete the content Test content N1?"
-   When I press "Delete"
-   Then I should see "The Test Content Test content N1 has been deleted."
-
-   When I go to "/admin/content"
-    And I wait
-   Then I should see "Content"
-   When I fill in "Test content N2" for "Title"
-    And I press "Filter"
-    And I wait
-   Then I should see "Test content N2"
-   When I click "Edit" in the "Test content N2" row
-    And I wait
-   Then I should see "Edit Test Content Test content N2"
-   When I click "Delete"
-    And I wait
-   Then I should see "Are you sure you want to delete the content Test content N2?"
-   When I press "Delete"
-   Then I should see "The Test Content Test content N2 has been deleted."
-
-   When I go to "/admin/content"
-    And I wait
-   Then I should see "Content"
-   When I fill in "Test content N3" for "Title"
-    And I press "Filter"
-    And I wait
-   Then I should see "Test content N3"
-   When I click "Edit" in the "Test content N3" row
-    And I wait
-   Then I should see "Edit Test Content Test content N3"
-   When I click "Delete"
-    And I wait
-   Then I should see "Are you sure you want to delete the content Test content N3?"
-   When I press "Delete"
-   Then I should see "The Test Content Test content N3 has been deleted."
-
-   When I go to "/admin/content"
-    And I wait
-   Then I should see "Content"
-   When I fill in "Test tab content number 1" for "Title"
-    And I press "Filter"
-    And I wait
-   Then I should see "Test tab content number 1"
-   When I click "Edit" in the "Test tab content number 1" row
-    And I wait
-   Then I should see "Edit Test Content Test tab content number 1"
-   When I click "Delete"
-    And I wait
-   Then I should see "Are you sure you want to delete the content Test tab content number 1?"
-   When I press "Delete"
-   Then I should see "The Test Content Test tab content number 1 has been deleted."
-
-
-@javascript @cleanup @local @development
-Scenario: Delete Entity Queue "Test Queue".
-  Given I am a logged in user with the "webmaster" user
-   When I go to "/admin/structure/entityqueue/test_queue/delete"
-    And I wait
-   Then I should see "Are you sure you want to delete the entity queue Test Queue?"
-   When I press "Delete"
-    And I wait
-   Then I should see "The entity queue Test Queue has been deleted."
-
-
-@javascript @cleanup @local @development
-Scenario: Delete "Test Content" content type item
-  Given I am a logged in user with the "webmaster" user
-   When I go to "/admin/structure/types/manage/test_content/delete"
-    And I wait
-   Then I should see "Are you sure you want to delete the content type Test Content?"
-   When I press "Delete"
-    And I wait
-   Then I should see "The content type Test Content has been deleted."
diff --git a/tests/features/varbase/step3-cleanup-tests/README.md b/tests/features/varbase/step3-cleanup-tests/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..95d2bc4b0489dabf1977af78d366c36d3f27b4a8
--- /dev/null
+++ b/tests/features/varbase/step3-cleanup-tests/README.md
@@ -0,0 +1,3 @@
+# Varbase Gherkin features
+# Cleanup tests
+# List of features in the step 3
\ No newline at end of file