diff --git a/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-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
index 34574804272ffade9373ea68c499b8a107e61488..57c88ce3242859a0f88dd27029fcd2e2fea2eabd 100644
--- a/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-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
@@ -45,8 +45,10 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Drupal Block" for "Title"
       And I fill in "Test Landing page description Drupal Block" for "Page description"
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I wait
+      And I press "+ Add"
       And I wait for AJAX to finish
+      And I wait
       And I press "Drupal Block"
       And I wait for AJAX to finish
      Then I should see "Block"
@@ -64,8 +66,10 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Columns (Equal)" for "Title"
       And I fill in "Test Landing page description Columns (Equal)" for "Page description"
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I wait
+      And I press "+ Add"
       And I wait for AJAX to finish
+      And I wait
       And I press "Columns (Equal)"
       And I wait for AJAX to finish
       And I press "Save"
@@ -80,8 +84,10 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Columns (Two Uneven)" for "Title"
       And I fill in "Test Landing page description Columns (Two Uneven)" for "Page description"
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I wait
+      And I press "+ Add"
       And I wait for AJAX to finish
+      And I wait
       And I press "Columns (Two Uneven)"
       And I wait for AJAX to finish
       And I press "Save"
@@ -96,14 +102,17 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Modal" for "Title"
       And I fill in "Test Landing page description Modal" for "Page description"
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I wait
+      And I press "+ Add"
       And I wait for AJAX to finish
+      And I wait
       And I press "Modal"
       And I wait for AJAX to finish
      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 press "Add Component"
+      And I wait for AJAX to finish
       And I press "field_lp_paragraphs_0_subform_bp_modal_body_bp_simple_add_more"
       And I wait
      Then I should see "Modal body"
@@ -121,8 +130,11 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait
       And I fill in "Test Landing page Rich Text" for "Title"
       And I fill in "Test Landing page description Rich Text" for "Page description"
-      And I press "Add Component"
       And I wait for AJAX to finish
+      And I wait
+      And I press "+ Add"
+      And I wait for AJAX to finish
+      And I wait
       And I press "Rich Text"
       And I wait for AJAX to finish
      Then I should see "Components"
@@ -140,13 +152,16 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Tabs" for "Title"
       And I fill in "Test Landing page description Tabs" for "Page description"
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I wait
+      And I press "+ Add"
       And I wait for AJAX to finish
+      And I wait
       And I press "Tabs"
       And I wait for AJAX to finish
      Then I should see "Components"
      When I fill in "Tab 1" for "Tab name"
       And I press "Add Component"
+      And I wait for AJAX to finish
       And I press "field_lp_paragraphs_0_subform_bp_tab_section_0_subform_bp_tab_section_body_bp_simple_add_more"
       And I wait
      Then I should see "Tab body"
@@ -164,8 +179,10 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page WebForm" for "Title"
       And I fill in "Test Landing page description WebForm" for "Page description"
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I wait
+      And I press "+ Add"
       And I wait for AJAX to finish
+      And I wait
       And I press "Webform"
       And I wait for AJAX to finish
      Then I should see "Components"
diff --git a/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
index a1ccd8e51cbc290dd70868091d960245c01d3236..5f12632f95dd7ea4e83b1506b024a5a8a3e758f2 100644
--- a/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
@@ -37,7 +37,10 @@ So that the "Landing page" will have text and images in right and left view.
       And I fill in "Test landing page body description." for "Page description"
 
   # Add Rich text centered
-      And I press "Add Component"
+      And I wait for AJAX to finish
+      And I wait
+      And I press "+ Add"
+      And I wait for AJAX to finish
       And I wait
       And I scrolldown
       And I press "Rich Text"
@@ -54,7 +57,10 @@ So that the "Landing page" will have text and images in right and left view.
      When I click "Edit"
       And I wait
       And I scrolldown
-      And I press "Add Component"
+      And I wait for AJAX to finish
+      And I wait
+      And I press "+ Add"
+      And I wait for AJAX to finish
       And I wait
       And I press "Text and image"
       And I wait for AJAX to finish
diff --git a/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
index 557b571df555902d8dcdb93b81c81b7180db1cab..a9eaf6fdfde1cebb4631f5284368eb199e87e10e 100644
--- a/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
@@ -12,8 +12,10 @@ I want to be able to clone an entity.
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "Add Component"
+      And I wait
+      And I press "+ Add"
       And I wait for AJAX to finish
+      And I wait
       And I scrolldown
       And I wait for AJAX to finish
       And I press "Modal"
@@ -22,6 +24,7 @@ I want to be able to clone an entity.
      When I fill in "Modal button" for "Modal button text"
       And I fill in "Modal title" for "Modal title"
       And I press "Add Component"
+      And I wait for AJAX to finish
       And I press "field_lp_paragraphs_0_subform_bp_modal_body_bp_simple_add_more"
       And I wait
      Then I should see "Modal body"