diff --git a/behat.yml b/behat.yml
index db80ae6142accdd5d9ab19878e482cfc8670f12b..cac6df82c6fbf5f224bf53258e038793ba04de21 100644
--- a/behat.yml
+++ b/behat.yml
@@ -73,7 +73,7 @@ default:
                 - "--headless"
                 - "--start-maximized"
                 - "--disable-gpu"
-                - "--window-size=1600,1200"
+                - "--window-size=3000,1200"
                 - "--no-sandbox"
                 - "--disable-dev-shm-usage"
                 - "--disable-setuid-sandbox"
diff --git a/tests/features/bootstrap/VarbaseContext.php b/tests/features/bootstrap/VarbaseContext.php
index 2da10bf8bcb9659fcdc9a7787ffd022083dc891c..20ac4953778107272d7ce01d857768288d0647cd 100644
--- a/tests/features/bootstrap/VarbaseContext.php
+++ b/tests/features/bootstrap/VarbaseContext.php
@@ -703,7 +703,7 @@ class VarbaseContext extends RawDrupalContext implements SnippetAcceptingContext
    * @When I save the section
    */
   public function iSaveTheSection() {
-    $save = $this->getSession()->getPage()->find('xpath', "//button[contains(@value, 'Add section')]");
+    $save = $this->getSession()->getPage()->find('xpath', "//input[contains(@value, 'Add section')]");
     if (is_null($save)) {
       throw new \Exception('The "Add section" button was not found or not visible');
     }
diff --git a/tests/features/varbase/02-user-management/02-03-user-login.feature b/tests/features/varbase/02-user-management/02-03-user-login.feature
index 218ac438c35e9e1f0f2140d0616a264f90da251b..c97785b33d8b91a68a15075ad93be1af9c2a1af7 100644
--- a/tests/features/varbase/02-user-management/02-03-user-login.feature
+++ b/tests/features/varbase/02-user-management/02-03-user-login.feature
@@ -25,5 +25,4 @@ So that I will be able to view/add/edit/ or delete content in the site
       And I wait 2s
      When I press "Log in"
       And wait
-     Then I should see "Email or username field is required."
-      And I should see "Password field is required"
+     Then I should see "2 errors have been found"
diff --git a/tests/features/varbase/02-user-management/02-04-persistent-login.feature b/tests/features/varbase/02-user-management/02-04-persistent-login.feature
index eeafde4d7aa94a0ff1ac3f94c7a433a8ac0cd072..e351cbcf5b2c3abd5e4ffd3ea046aa54ba1b7a93 100644
--- a/tests/features/varbase/02-user-management/02-04-persistent-login.feature
+++ b/tests/features/varbase/02-user-management/02-04-persistent-login.feature
@@ -17,7 +17,7 @@ Feature: User Management - Have persistent login options and configurations
     Given I am not logged in
      When I go to "/user/login"
       And I wait
-     Then I should see "Log in"
+     Then I should see "Login with"
       And I should see "Remember me"
      When I fill in "Normal user" for "Email or username"
       And I fill in "dD.123123ddd" for "Password"
diff --git a/tests/features/varbase/03-admin-management/03-00-pre-check-important-admin-development-pages.feature b/tests/features/varbase/03-admin-management/03-00-pre-check-important-admin-development-pages.feature
index 2d5d2923cca3f5a8f052e77b43faf604e747d9fe..3d29c66aa9980f01345353020652ee640eb9c129 100644
--- a/tests/features/varbase/03-admin-management/03-00-pre-check-important-admin-development-pages.feature
+++ b/tests/features/varbase/03-admin-management/03-00-pre-check-important-admin-development-pages.feature
@@ -84,7 +84,7 @@ So that I can use them after the install or update.
       And I wait
      Then I should see "Appearance"
       And I should see "Vartheme"
-      And I should see "(Bootstrap 5 - SASS)"
+      And I should see "Base theme for Varbase standard websites. Based on Bootstrap 5 framework using SASS, and extending Radix theme."
       And I should see "Claro"
       And I should see "Radix"
       And I should see "Vartheme Claro"
diff --git a/tests/features/varbase/03-admin-management/03-03-admins-can-disable-users.feature b/tests/features/varbase/03-admin-management/03-03-admins-can-disable-users.feature
index 19588bae3edc70fdf9ae35cb29d0ca985d755f31..2ac1e0c105b803f90f2f862b0b2dc78077883b98 100644
--- a/tests/features/varbase/03-admin-management/03-03-admins-can-disable-users.feature
+++ b/tests/features/varbase/03-admin-management/03-03-admins-can-disable-users.feature
@@ -43,7 +43,7 @@ So that they will be disabled and not be able to use the site.
       And I wait 2s
       And I press "Log in"
       And I wait
-     Then I should see "The username Normal user has not been activated or is blocked."
+     Then I should see "1 error has been found"
 
   @javascript @local @development @staging @production
   Scenario: Check flood control default settings
diff --git a/tests/features/varbase/04-content-structure/04-08-landing-page-layout-builder_check-to-add-sections-and-choose-layouts-for-sections.feature b/tests/features/varbase/04-content-structure/04-08-landing-page-layout-builder_check-to-add-sections-and-choose-layouts-for-sections.feature
index 27c5947f08dd00e4a16620d94aebcf2eedd0ca04..50b3add697ccaef9c40e20babc70187365512f92 100644
--- a/tests/features/varbase/04-content-structure/04-08-landing-page-layout-builder_check-to-add-sections-and-choose-layouts-for-sections.feature
+++ b/tests/features/varbase/04-content-structure/04-08-landing-page-layout-builder_check-to-add-sections-and-choose-layouts-for-sections.feature
@@ -35,8 +35,8 @@ So that the "Landing (Layout Builder) page" will show up having the listed secti
       And I should not see "Bootstrap 11 Cols"
       And I should not see "Bootstrap 12 Cols"
      When I scroll to the top of the page
-     Then I should see "Save layout"
-     When I press the "Save layout" button
+      And I wait 2s
+      And I press the "Save layout" button
       And I wait
      Then I should see "The layout override has been saved."
       And I should see "Test Landing page (Layout Builder)"
@@ -86,8 +86,7 @@ So that the "Landing (Layout Builder) page" will show up having the listed secti
 
      When I scroll to the top of the page
       And I wait 2s
-     Then I should see "Save layout"
-     When I press the "Save layout" button
+      And I press the "Save layout" button
       And I wait
      Then I should see "The layout override has been saved."
       And I should see "Test Landing page (Layout Builder)"
@@ -156,8 +155,7 @@ So that the "Landing (Layout Builder) page" will show up having the listed secti
   
      When I scroll to the top of the page
       And I wait 2s
-     Then I should see "Save layout"
-     When I press the "Save layout" button
+      And I press the "Save layout" button
       And I wait
      Then I should see "The layout override has been saved."
       And I should see "Test Landing page (Layout Builder)"
@@ -243,8 +241,7 @@ So that the "Landing (Layout Builder) page" will show up having the listed secti
   
      When I scroll to the top of the page
       And I wait 2s
-     Then I should see "Save layout"
-     When I press the "Save layout" button
+      And I press the "Save layout" button
       And I wait
      Then I should see "The layout override has been saved."
       And I should see "Test Landing page (Layout Builder)"
@@ -348,8 +345,7 @@ So that the "Landing (Layout Builder) page" will show up having the listed secti
 
      When I scroll to the top of the page
       And I wait 2s
-     Then I should see "Save layout"
-     When I press the "Save layout" button
+      And I press the "Save layout" button
       And I wait
      Then I should see "The layout override has been saved."
       And I should see "Test Landing page (Layout Builder)"
@@ -488,8 +484,7 @@ So that the "Landing (Layout Builder) page" will show up having the listed secti
 
      When I scroll to the top of the page
       And I wait 2s
-     Then I should see "Save layout"
-     When I press the "Save layout" button
+      And I press the "Save layout" button
       And I wait
      Then I should see "The layout override has been saved."
       And I should see "Rich text in 6 cols section, col 1"
@@ -498,4 +493,3 @@ So that the "Landing (Layout Builder) page" will show up having the listed secti
       And I should see "Rich text in 6 cols section, col 4"
       And I should see "Rich text in 6 cols section, col 5"
       And I should see "Rich text in 6 cols section, col 6"
-
diff --git a/tests/features/varbase/04-content-structure/04-10-landing-page-section-configurations.feature b/tests/features/varbase/04-content-structure/04-10-landing-page-section-configurations.feature
index 2c07752445cc15b46c14fb4a50dfd474af7cb7b7..dac7bbffe9266304ee3247afc5aff19164cc2d44 100644
--- a/tests/features/varbase/04-content-structure/04-10-landing-page-section-configurations.feature
+++ b/tests/features/varbase/04-content-structure/04-10-landing-page-section-configurations.feature
@@ -63,8 +63,6 @@ As a site admin, I will create a new landing page, add a section with different
      Then I should see "Test Rich text in 2 cols section, col 2" 
 
      When I scroll to the top of the page
-      And I wait 2s
-     Then I should see "Save layout"
       And I press the "Save layout" button
       And I wait
       And I should see "Test Rich text in 2 cols section, col 1"