diff --git a/src/test/java/school/redrover/BuildHistoryAccessTest.java b/src/test/java/school/redrover/BuildHistoryAccessTest.java
index 66f768627..976cac0e6 100644
--- a/src/test/java/school/redrover/BuildHistoryAccessTest.java
+++ b/src/test/java/school/redrover/BuildHistoryAccessTest.java
@@ -25,8 +25,7 @@ private Object[][] iconSize() {
     public void testQuickAccessBuildHistory() {
         String actualHeading = new HomePage(getDriver())
                 .clickBuildHistory()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualHeading, "Build History of Jenkins");
     }
diff --git a/src/test/java/school/redrover/ConfigureAppearanceTest.java b/src/test/java/school/redrover/ConfigureAppearanceTest.java
index 9b2e2e4ee..bce817ac0 100644
--- a/src/test/java/school/redrover/ConfigureAppearanceTest.java
+++ b/src/test/java/school/redrover/ConfigureAppearanceTest.java
@@ -16,8 +16,7 @@ public void testSystemThemeAndApplyButtonPopUp() {
                 .clickAppearanceLink()
                 .clickSystemTheme()
                 .clickApplyButton()
-                .getApplyPopUp()
-                .getText();
+                .getApplyPopUpText();
 
         Assert.assertEquals(popUpApplyButtonText, expectedText);
     }
@@ -45,8 +44,7 @@ public void changeThemeLight() {
                 .clickLightTheme()
                 .checkAllowTheme()
                 .clickApplyButton()
-                .getApplyPopUp()
-                .getText();
+                .getApplyPopUpText();
 
         Assert.assertEquals(checkingLight, finalTheme);
     }
diff --git a/src/test/java/school/redrover/CreateNewItemTest.java b/src/test/java/school/redrover/CreateNewItemTest.java
index cebb80d75..f60c8a787 100644
--- a/src/test/java/school/redrover/CreateNewItemTest.java
+++ b/src/test/java/school/redrover/CreateNewItemTest.java
@@ -8,7 +8,6 @@
 import org.testng.annotations.Test;
 import org.openqa.selenium.JavascriptExecutor;
 import school.redrover.common.BaseTest;
-import school.redrover.page.FreestyleProjectConfigurationPage;
 import school.redrover.page.FreestyleProjectStatusPage;
 import school.redrover.page.HomePage;
 import school.redrover.page.NewItemPage;
@@ -24,8 +23,7 @@ public class CreateNewItemTest extends BaseTest {
     public void testNewItemPageByClickingCreateAJobLink() {
         String result = new HomePage(getDriver())
                 .clickCreateJob()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(result, "New Item");
     }
@@ -34,8 +32,7 @@ public void testNewItemPageByClickingCreateAJobLink() {
     public void testNewItemPageByClickingNewItemLink() {
         String result = new HomePage(getDriver())
                 .clickSidebarNewItem()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(result, "New Item");
     }
@@ -110,8 +107,7 @@ public void testErrorMessageForDuplicateItemNames() {
                 .clickSidebarNewItem()
                 .sendName(PROJECT_NAME)
                 .selectFolder()
-                .getErrorMessage()
-                .getText();
+                .getErrorMessageText();
 
         Assert.assertEquals(errorMessage, "» A job already exists with the name ‘New Project’");
     }
@@ -136,8 +132,7 @@ public void testConfigurationPageIsVisible() {
                 .clickCreateJob()
                 .sendName(PROJECT_NAME)
                 .selectFreestyleProjectAndSubmit()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(headingText, "Configure");
     }
@@ -182,8 +177,7 @@ public void createNewFreeStyleProjectTest() {
                 .sendName(PROJECT_NAME)
                 .selectFreestyleProjectAndSubmit()
                 .clickSave()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(projectTitle, PROJECT_NAME);
     }
diff --git a/src/test/java/school/redrover/DashboardTest.java b/src/test/java/school/redrover/DashboardTest.java
index 75ac5c26b..e97e0b1f6 100644
--- a/src/test/java/school/redrover/DashboardTest.java
+++ b/src/test/java/school/redrover/DashboardTest.java
@@ -40,7 +40,7 @@ public void createProject(String name) {
     @Test
     public void testHomePageHeading() {
         Assert.assertEquals(
-                new HomePage(getDriver()).waitUntilPageLoadJS().getHeader().getText(),
+                new HomePage(getDriver()).waitUntilPageLoadJS().getHeaderText(),
                 "Welcome to Jenkins!"
         );
     }
@@ -83,8 +83,7 @@ public void testSearchCreatedJobs() {
                 .clickSearchButton()
                 .searchFor(CREATED_JOBS_NAME.get(0))
                 .moveAndClickResult()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(searchResults, CREATED_JOBS_NAME.get(0));
     }
@@ -125,7 +124,7 @@ public void testStatusProjectIconHasTooltip() {
 
     @Test
     public void testLogo() {
-        String logoText = new HomePage(getDriver()).getLogo().getText();
+        String logoText = new HomePage(getDriver()).getLogoText();
 
         Assert.assertEquals(logoText, "Jenkins", "Надпись рядом с логотипом должна быть 'Jenkins'");
     }
@@ -136,8 +135,7 @@ public void testGoToManageJenkinsPage() {
 
         String actualTitle = new HomePage(getDriver())
                 .clickManageJenkinsGear()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualTitle, expectedTitle);
     }
@@ -211,7 +209,7 @@ public void testSetUpAgent() {
         NewNodePage newNodePage = new HomePage(getDriver())
                 .clickSetUpAnAgent();
 
-        Assert.assertEquals(newNodePage.getHeader().getText(), "New node");
+        Assert.assertEquals(newNodePage.getHeaderText(), "New node");
         Assert.assertTrue(newNodePage.isFormDisplayed(), "New Node form is not visible");
     }
 
@@ -220,7 +218,7 @@ public void testConfigureCloudIntegration() {
         CloudsPage cloudsPage = new HomePage(getDriver())
                 .clickConfigureCloud();
 
-        Assert.assertEquals(cloudsPage.getHeader().getText(), "Clouds");
+        Assert.assertEquals(cloudsPage.getHeaderText(), "Clouds");
         Assert.assertEquals(cloudsPage.getCloudsPageInfoText(), "There is no plugin installed that supports clouds.");
     }
 }
\ No newline at end of file
diff --git a/src/test/java/school/redrover/DescriptionTest.java b/src/test/java/school/redrover/DescriptionTest.java
index 8a1d08362..e66bfcaa7 100644
--- a/src/test/java/school/redrover/DescriptionTest.java
+++ b/src/test/java/school/redrover/DescriptionTest.java
@@ -1,6 +1,7 @@
 package school.redrover;
 
 import org.testng.Assert;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
 import school.redrover.page.HomePage;
@@ -20,6 +21,7 @@ public void testCreateDescription() {
         Assert.assertEquals(actualDescription, description);
     }
 
+    @Ignore
     @Test
     public void testAddChangeDescription() {
         final String firstDescription = "First text!";
diff --git a/src/test/java/school/redrover/FolderManagementTest.java b/src/test/java/school/redrover/FolderManagementTest.java
index deac5a84d..56bfd452d 100644
--- a/src/test/java/school/redrover/FolderManagementTest.java
+++ b/src/test/java/school/redrover/FolderManagementTest.java
@@ -69,8 +69,7 @@ public void testNavigateToConfigurationViaSideMenuForPipeline() {
                 .openSubItemPage(itemName, new PipelineProjectStatusPage(getDriver()))
                 .getSidebarComponent()
                 .clickSidebarConfigure()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualHeadingText, "Configure");
     }
diff --git a/src/test/java/school/redrover/FolderTest.java b/src/test/java/school/redrover/FolderTest.java
index 33c76d11e..fea3d4a6b 100644
--- a/src/test/java/school/redrover/FolderTest.java
+++ b/src/test/java/school/redrover/FolderTest.java
@@ -84,8 +84,7 @@ public void testPreventDuplicateItemNamesInFolder() {
                 .clickSidebarNewItem()
                 .sendName(SUB_FOLDER_NAME)
                 .selectFolder()
-                .getErrorMessage()
-                .getText();
+                .getErrorMessageText();
 
         Assert.assertEquals(
                 duplicateErrorMessage,
@@ -214,8 +213,7 @@ public void testRenameFolder() {
                 .clearName()
                 .sendNewName(NEW_FOLDER_NAME)
                 .renameButtonClick()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(newNameFolder, NEW_FOLDER_NAME);
     }
diff --git a/src/test/java/school/redrover/FooterTest.java b/src/test/java/school/redrover/FooterTest.java
index f90238a61..43a11dc5b 100644
--- a/src/test/java/school/redrover/FooterTest.java
+++ b/src/test/java/school/redrover/FooterTest.java
@@ -23,8 +23,7 @@ public void testRestApiLink() {
     public void testApiPageHeading() {
         String actualHeading = new HomePage(getDriver())
                 .clickRestApiLink()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualHeading, NAME_PAGE);
     }
@@ -55,7 +54,7 @@ public void testRestApiLinkByFocusAndEnter() {
 
     @Test
     public void testJenkinsVersion() {
-        String version = new HomePage(getDriver()).getJenkinsVersionButton().getText();
+        String version = new HomePage(getDriver()).getJenkinsVersionButtonText();
 
         Assert.assertEquals(version,"Jenkins 2.516.3");
     }
@@ -80,8 +79,7 @@ public void testRestApiUserPage() {
         String actualHeading = new HomePage(getDriver())
                 .clickUserAccountIcon()
                 .clickRestApiLink()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
        Assert.assertEquals(actualHeading, NAME_PAGE);
     }
@@ -91,8 +89,7 @@ public void testRestApiNewItemPage() {
         String actualHeading = new HomePage(getDriver())
                 .clickSidebarNewItem()
                 .clickRestApiLink()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualHeading, NAME_PAGE);
     }
@@ -102,8 +99,7 @@ public void testRestApiNewNodesPage() {
         String actualHeading = new HomePage(getDriver())
                 .clickSetUpAnAgent()
                 .clickRestApiLink()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualHeading, NAME_PAGE);
     }
@@ -113,8 +109,7 @@ public void testRestApiNodesPage() {
         String actualHeading = new HomePage(getDriver())
                .clickBuildExecutorStatus()
                .clickRestApiLink()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualHeading, NAME_PAGE);
     }
@@ -124,8 +119,7 @@ public void testRestApiBuildHistoryOfJenkinsPage() {
         String actualHeading = new HomePage(getDriver())
                 .clickBuildHistory()
                 .clickRestApiLink()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualHeading, NAME_PAGE);
     }
diff --git a/src/test/java/school/redrover/FreestyleProjectTest.java b/src/test/java/school/redrover/FreestyleProjectTest.java
index 4c14cb445..b75e14352 100644
--- a/src/test/java/school/redrover/FreestyleProjectTest.java
+++ b/src/test/java/school/redrover/FreestyleProjectTest.java
@@ -111,16 +111,11 @@ public void testBuildStepsFilterNames() {
                 .clickBuildStepMenuOption();
 
         for (String buildStep : BUILD_STEPS) {
+            String visibleStep = configPage
+                    .typeIntoFilterBuildStep(buildStep.substring(0, Math.min(5, buildStep.length())))
+                    .verifySentNameIsInFilterText(buildStep);
 
-            configPage
-                    .typeIntoFilterBuildStep(buildStep.substring(0, Math.min(5, buildStep.length())));
-
-            WebElement visibleStep = configPage.verifySentNameIsInFilter(buildStep);
-
-            Assert.assertEquals(
-                    visibleStep.getText(),
-                    buildStep,
-                    "Filter didn't match expected build step");
+            Assert.assertEquals(visibleStep, buildStep, "Filter didn't match expected build step");
         }
     }
 
@@ -134,8 +129,10 @@ public void testBuildSteps() {
                 .clickBuildStepMenuOption();
 
         for (String step : BUILD_STEPS) {
-            WebElement buildStep = getDriver().findElement(By.xpath("//button[contains(text(),'%s')]".formatted(step)));
-            Assert.assertEquals(buildStep.getText(), step);
+            String buildStepText = new FreestyleProjectConfigurationPage(getDriver())
+                    .getBuildStepText(step);
+
+            Assert.assertEquals(buildStepText, step);
         }
     }
 
@@ -270,7 +267,7 @@ public void testDeleteFreestyleProject() {
                 .clickDeleteItemInDropdownMenu()
                 .confirmDelete();
 
-        Assert.assertEquals(homePage.getHeader().getText(), expectedHeadingText);
+        Assert.assertEquals(homePage.getHeaderText(), expectedHeadingText);
     }
 
     @Test
@@ -312,8 +309,7 @@ public void testNavigationToWorkspaceAfterBuild() {
                 .clickSidebarBuildNow()
                 .getSidebarComponent()
                 .clickSidebarWorkspace()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualHeadingText, expectedHeadingText);
     }
diff --git a/src/test/java/school/redrover/JenkinsManagementTest.java b/src/test/java/school/redrover/JenkinsManagementTest.java
index 4db3c1c31..378bc602c 100644
--- a/src/test/java/school/redrover/JenkinsManagementTest.java
+++ b/src/test/java/school/redrover/JenkinsManagementTest.java
@@ -109,8 +109,7 @@ public void testSearchAndOpenSetting() {
                 .clickManageJenkinsGear()
                 .sendTitle(SETTING_TITLE)
                 .clickSearchResult()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(searchHeading, "System");
     }
diff --git a/src/test/java/school/redrover/MultiConfigurationProjectTest.java b/src/test/java/school/redrover/MultiConfigurationProjectTest.java
index b09e81a45..a19c0d297 100644
--- a/src/test/java/school/redrover/MultiConfigurationProjectTest.java
+++ b/src/test/java/school/redrover/MultiConfigurationProjectTest.java
@@ -33,8 +33,7 @@ public void testCreateProject() {
                 .sendName(PROJECT_NAME)
                 .selectMultiConfigurationProjectAndSubmit()
                 .clickSave()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualProjectName, PROJECT_NAME);
     }
@@ -62,8 +61,7 @@ public void testRenameViaSidebar() {
                 .clickSidebarRename()
                 .clearNameField()
                 .sendNewProjectName(RENAMED_PROJECT)
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualProjectName, RENAMED_PROJECT);
     }
@@ -78,8 +76,7 @@ public void testRenameViaDashboardDropdownMenu() {
                 .clickRenameViaDashboardDropDownMenu()
                 .clearNameField()
                 .sendNewProjectName(RENAMED_PROJECT)
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualProjectName, RENAMED_PROJECT);
     }
@@ -94,8 +91,7 @@ public void testValidQuietPeriodValues(String seconds) {
                 .clickQuietPeriodCheckbox()
                 .setQuietPeriodInput(seconds)
                 .clickSave()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(configPage, PROJECT_NAME);
     }
diff --git a/src/test/java/school/redrover/MultibranchPipelineTest.java b/src/test/java/school/redrover/MultibranchPipelineTest.java
index 8636733ca..05b0d9ea2 100644
--- a/src/test/java/school/redrover/MultibranchPipelineTest.java
+++ b/src/test/java/school/redrover/MultibranchPipelineTest.java
@@ -98,8 +98,7 @@ public void testTryCreateProjectExistName() {
                 .clickSidebarNewItem()
                 .selectMultibranchPipeline()
                 .sendName(MULTIBRANCH_PIPELINE_NAME)
-                .getErrorMessage()
-                .getText();
+                .getErrorMessageText();
 
         Assert.assertEquals(duplicateProject, errorMessage, "Incorrect error message");
     }
@@ -166,8 +165,7 @@ public void testCreateItemWithSpecialCharacters(String specialCharacters) {
                 .clickSidebarNewItem()
                 .clearSendName()
                 .sendName("multib" + specialCharacters + "ranch")
-                .getErrorMessage()
-                .getText();
+                .getErrorMessageText();
 
         Assert.assertEquals(actualErrorMessage,
                 "» ‘%s’ is an unsafe character".formatted(specialCharacters),
@@ -207,8 +205,7 @@ public void testRenameViaSidebar() {
                 .getSidebarComponent()
                 .clickSidebarRename()
                 .renameMultibranchPipeline(RENAMED_MULTIBRANCH_PIPELINE)
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualRenamedMultibranchPipeline, RENAMED_MULTIBRANCH_PIPELINE);
     }
@@ -241,8 +238,7 @@ public void testDisplayNameIsSetOnCreation() {
                 .sendDisplayName(MULTIBRANCH_PIPELINE_DISPLAY_NAME)
                 .clickSave()
                 .gotoHomePage()
-                .findItem(MULTIBRANCH_PIPELINE_NAME)
-                .getText();
+                .getFoundItemText(MULTIBRANCH_PIPELINE_NAME);
 
         Assert.assertEquals(name, MULTIBRANCH_PIPELINE_DISPLAY_NAME);
     }
diff --git a/src/test/java/school/redrover/NavigateToDashboardTest.java b/src/test/java/school/redrover/NavigateToDashboardTest.java
index 8182a8d58..22e0f3eeb 100644
--- a/src/test/java/school/redrover/NavigateToDashboardTest.java
+++ b/src/test/java/school/redrover/NavigateToDashboardTest.java
@@ -39,7 +39,10 @@ public void testVerifyNavigationBehavior() {
                     .gotoHomePage()
                     .clickProject(project)
                     .getProjectName(project);
-            String check2 = new HomePage(getDriver()).gotoHomePage().clickSidebarNewItem().getHeader().getText();
+            String check2 = new HomePage(getDriver())
+                    .gotoHomePage()
+                    .clickSidebarNewItem()
+                    .getHeaderText();
 
             Assert.assertEquals(check, project);
             Assert.assertEquals(check2, "New Item");
diff --git a/src/test/java/school/redrover/PipelineConfigurationTest.java b/src/test/java/school/redrover/PipelineConfigurationTest.java
index ff777be12..c668d6655 100644
--- a/src/test/java/school/redrover/PipelineConfigurationTest.java
+++ b/src/test/java/school/redrover/PipelineConfigurationTest.java
@@ -151,7 +151,7 @@ public void testAdvancedSectionSendDisplayName() {
                 .clickAdvancedButton()
                 .sendDisplayName(displayName)
                 .clickSave()
-                .getDisplayNameInStatus();
+                .getStatusDisplayNameText();
 
         Assert.assertEquals(actualDisplayNameInStatus, displayName);
         Assert.assertEquals(new PipelineProjectStatusPage(getDriver()).
diff --git a/src/test/java/school/redrover/PipelineTest.java b/src/test/java/school/redrover/PipelineTest.java
index f48c57c40..70ba4b89c 100644
--- a/src/test/java/school/redrover/PipelineTest.java
+++ b/src/test/java/school/redrover/PipelineTest.java
@@ -174,8 +174,7 @@ public void testDeletePipelineViaDropDownMenu() {
                 .openDropdownMenu(PIPELINE_NAME)
                 .clickDeleteItemInDropdownMenu()
                 .confirmDelete()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualHomePageHeading, expectedHomePageHeading);
     }
@@ -191,8 +190,7 @@ public void testDeletePipelineViaSideMenu() {
                 .getSidebarComponent()
                 .clickSidebarDelete()
                 .confirmDeleteAtJobPage()
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(actualHomePageHeading, expectedHomePageHeading);
     }
@@ -208,8 +206,7 @@ public void testScheduleWithValidData(String validTimePeriod) {
                 .selectBuildPeriodicallyCheckbox()
                 .sendScheduleText(validTimePeriod)
                 .clickApply()
-                .getTextAreaValidationMessage()
-                .getText();
+                .getValidationMessageText();
 
         Assert.assertEquals(new PipelineProjectConfigurationPage(getDriver()).getSavedMessage(),
                 "Saved");
@@ -229,8 +226,7 @@ public void testScheduleWithInvalidData(String invalidTimePeriod, String expecte
                 .selectBuildPeriodicallyCheckbox()
                 .sendScheduleText(invalidTimePeriod)
                 .clickApply()
-                .getErrorMessage()
-                .getText();
+                .getErrorMessageText();
 
         new PipelineProjectConfigurationPage(getDriver()).closeModalWindow();
 
diff --git a/src/test/java/school/redrover/SignInOutTest.java b/src/test/java/school/redrover/SignInOutTest.java
index c0fa54d1c..96851038a 100644
--- a/src/test/java/school/redrover/SignInOutTest.java
+++ b/src/test/java/school/redrover/SignInOutTest.java
@@ -34,8 +34,7 @@ public void testSignInAfterSignOut() {
 
         String title = new LoginPage(getDriver())
                 .signIn(ProjectUtils.getUserName(),ProjectUtils.getPassword())
-                .getHeader()
-                .getText();
+                .getHeaderText();
 
         Assert.assertEquals(title, "Welcome to Jenkins!");
     }
diff --git a/src/test/java/school/redrover/common/BasePage.java b/src/test/java/school/redrover/common/BasePage.java
index fa35c788e..f6bf66022 100644
--- a/src/test/java/school/redrover/common/BasePage.java
+++ b/src/test/java/school/redrover/common/BasePage.java
@@ -15,8 +15,6 @@
 import school.redrover.page.RestApiPage;
 import school.redrover.page.UserStatusPage;
 
-import school.redrover.component.*;
-
 import java.util.Objects;
 
 
@@ -73,8 +71,8 @@ public HomePage gotoHomePage() {
         return new HomePage(getDriver()).waitUntilPageLoadJS();
     }
 
-    public WebElement getLogo() {
-        return logo;
+    public String getLogoText() {
+        return logo.getText();
     }
 
     public SearchComponent clickSearchButton() {
@@ -105,12 +103,12 @@ public String getCurrentUrl() {
         return getDriver().getCurrentUrl();
     }
 
-    public WebElement getHeader() {
-        return pageHeader;
+    public String getHeaderText() {
+        return pageHeader.getText();
     }
 
-    public WebElement getJenkinsVersionButton() {
-        return jenkinsVersionButton;
+    public String getJenkinsVersionButtonText() {
+        return jenkinsVersionButton.getText();
     }
 
     public JenkinsVersionFooterDropdown clickJenkinsVersion() {
diff --git a/src/test/java/school/redrover/component/common/UserAccountIconDropdown.java b/src/test/java/school/redrover/component/common/UserAccountIconDropdown.java
index 594e45feb..2674801f1 100644
--- a/src/test/java/school/redrover/component/common/UserAccountIconDropdown.java
+++ b/src/test/java/school/redrover/component/common/UserAccountIconDropdown.java
@@ -41,12 +41,12 @@ public UserStatusPage clickUserName() {
         return new UserStatusPage(getDriver()).waitUntilPageLoadJS();
     }
 
-    public WebElement getUserName() {
-        return userName;
+    public String getUserNameText() {
+        return userName.getText();
     }
 
     public UserAccountIconDropdown getUserName(Consumer<String> stringConsumer) {
-        stringConsumer.accept(getUserName().getText());
+        stringConsumer.accept(getUserNameText());
 
         return this;
     }
diff --git a/src/test/java/school/redrover/cucumber/FreestyleSteps.java b/src/test/java/school/redrover/cucumber/FreestyleSteps.java
index 663e64914..b900429be 100644
--- a/src/test/java/school/redrover/cucumber/FreestyleSteps.java
+++ b/src/test/java/school/redrover/cucumber/FreestyleSteps.java
@@ -71,7 +71,7 @@ public void saveConfigAndGoToFreestyleJob() {
 
     @Then("Freestyle job name is {string}")
     public void assertFreestyleJobName(String jobName) {
-        Assert.assertEquals(freestyleProjectPage.getHeader().getText(), jobName);
+        Assert.assertEquals(freestyleProjectPage.getHeaderText(), jobName);
     }
 
     @When("Click Freestyle job {string}")
diff --git a/src/test/java/school/redrover/page/AppearancePage.java b/src/test/java/school/redrover/page/AppearancePage.java
index 150363d17..35383809c 100644
--- a/src/test/java/school/redrover/page/AppearancePage.java
+++ b/src/test/java/school/redrover/page/AppearancePage.java
@@ -83,8 +83,8 @@ public AppearancePage clickApplyButton() {
         return this;
     }
 
-    public WebElement getApplyPopUp() {
-        return getWait10().until(ExpectedConditions.visibilityOf(applyPopUp));
+    public String getApplyPopUpText() {
+        return getWait10().until(ExpectedConditions.visibilityOf(applyPopUp)).getText();
     }
 
     public JenkinsManagementPage clickSaveButton() {
diff --git a/src/test/java/school/redrover/page/FreestyleProjectConfigurationPage.java b/src/test/java/school/redrover/page/FreestyleProjectConfigurationPage.java
index 2d0a0c378..298815e69 100644
--- a/src/test/java/school/redrover/page/FreestyleProjectConfigurationPage.java
+++ b/src/test/java/school/redrover/page/FreestyleProjectConfigurationPage.java
@@ -7,11 +7,9 @@
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
 import org.testng.Assert;
 import school.redrover.common.PageUtils;
 
-import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -216,10 +214,10 @@ public String getGitTooltipText() {
         return gitHelpIcon.getAttribute("tooltip");
     }
 
-    public WebElement verifySentNameIsInFilter(String buildStep) {
-        return new WebDriverWait(getDriver(), Duration.ofSeconds(5))
-                .until(ExpectedConditions.visibilityOfElementLocated
-                        (By.xpath("//button[contains(@style,'inline-flex') and normalize-space()='%s']".formatted(buildStep))));
+    public String verifySentNameIsInFilterText(String buildStep) {
+        return getWait5().until(ExpectedConditions.visibilityOfElementLocated(By
+                         .xpath("//button[contains(@style,'inline-flex') and normalize-space()='%s']".formatted(buildStep))))
+                         .getText();
     }
 
     public FreestyleProjectConfigurationPage typeIntoFilterBuildStep(String text) {
@@ -308,4 +306,8 @@ public List<String> getSelectedParameterList() {
                 .map(String::trim)
                 .toList();
     }
+
+    public String getBuildStepText(String step) {
+        return getDriver().findElement(By.xpath("//button[contains(text(),'%s')]".formatted(step))).getText();
+    }
 }
diff --git a/src/test/java/school/redrover/page/HomePage.java b/src/test/java/school/redrover/page/HomePage.java
index 2e70da7d7..eb587c02d 100644
--- a/src/test/java/school/redrover/page/HomePage.java
+++ b/src/test/java/school/redrover/page/HomePage.java
@@ -103,8 +103,9 @@ public CloudsPage clickConfigureCloud() {
         return new CloudsPage(getDriver()).waitUntilPageLoadJS();
     }
 
-    public WebElement findItem(String itemName) {
-        return getDriver().findElement(By.xpath("//a[@href='job/" + itemName + "/']"));
+    public String getFoundItemText(String itemName) {
+        return getDriver().findElement(By
+                .xpath("//a[@href='job/" + itemName + "/']")).getText();
     }
 
     public String getSystemMessageText() {
diff --git a/src/test/java/school/redrover/page/NewItemPage.java b/src/test/java/school/redrover/page/NewItemPage.java
index b644efc1a..ab5335afb 100644
--- a/src/test/java/school/redrover/page/NewItemPage.java
+++ b/src/test/java/school/redrover/page/NewItemPage.java
@@ -38,6 +38,8 @@ public class NewItemPage extends BasePage<NewItemPage> {
     @FindBy(className = "input-validation-message")
     private List<WebElement> validationMessages;
 
+    @FindBy(id = "itemname-invalid")
+    private WebElement errorMessage;
 
     public NewItemPage(WebDriver driver) {
         super(driver);
@@ -105,8 +107,8 @@ public PipelineProjectConfigurationPage selectPipelineAndSubmit() {
         return new PipelineProjectConfigurationPage(getDriver());
     }
 
-    public WebElement getErrorMessage() {
-        return getWait10().until(ExpectedConditions.visibilityOfElementLocated(By.id("itemname-invalid")));
+    public String getErrorMessageText() {
+        return getWait10().until(ExpectedConditions.visibilityOf(errorMessage)).getText();
     }
 
     // дизайн сделан так, что нельзя использовать <T extends BaseConfigurationPage>
diff --git a/src/test/java/school/redrover/page/PipelineProjectConfigurationPage.java b/src/test/java/school/redrover/page/PipelineProjectConfigurationPage.java
index affa68d26..8cdb3394f 100644
--- a/src/test/java/school/redrover/page/PipelineProjectConfigurationPage.java
+++ b/src/test/java/school/redrover/page/PipelineProjectConfigurationPage.java
@@ -234,14 +234,14 @@ public PipelineProjectConfigurationPage sendScheduleText(String validTimePeriod)
         return this;
     }
 
-    public WebElement getTextAreaValidationMessage() {
+    public String getValidationMessageText() {
         getWait5().until(ExpectedConditions.visibilityOf(textAreaValidationMessage));
-        return textAreaValidationMessage;
+        return textAreaValidationMessage.getText();
     }
 
-    public WebElement getErrorMessage() {
+    public String getErrorMessageText() {
         getWait5().until(ExpectedConditions.visibilityOf(textErrorMessage));
-        return textErrorMessage;
+        return textErrorMessage.getText();
     }
 
     public String getErrorDescriptionModalWindow() {
diff --git a/src/test/java/school/redrover/page/PipelineProjectStatusPage.java b/src/test/java/school/redrover/page/PipelineProjectStatusPage.java
index 8c7e58d77..4a43658d3 100644
--- a/src/test/java/school/redrover/page/PipelineProjectStatusPage.java
+++ b/src/test/java/school/redrover/page/PipelineProjectStatusPage.java
@@ -69,8 +69,8 @@ public PipelineProjectStatusPage waitUntilPageLoad() {
         return this;
     }
 
-    public String getDisplayNameInStatus() {
-        return getHeader().getText();
+    public String getStatusDisplayNameText() {
+        return getHeaderText();
     }
 
     public String getDisplayNameInBreadcrumbBar(String displayName) {