diff --git a/src/test/java/school/redrover/DashboardTest.java b/src/test/java/school/redrover/DashboardTest.java
index e1de5e573..2590ea945 100644
--- a/src/test/java/school/redrover/DashboardTest.java
+++ b/src/test/java/school/redrover/DashboardTest.java
@@ -4,11 +4,7 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.ArchitectingForScalePage;
-import school.redrover.page.CloudsPage;
-import school.redrover.page.EditViewPage;
-import school.redrover.page.HomePage;
-import school.redrover.page.NewNodePage;
+import school.redrover.page.*;
 
 import java.util.List;
 
@@ -215,7 +211,7 @@ public void testSetUpAgent() {
         NewNodePage newNodePage = new HomePage(getDriver())
                 .clickSetUpAnAgent();
 
-        Assert.assertEquals(newNodePage.getHeader().getText(),"New node");
+        Assert.assertEquals(newNodePage.getHeader().getText(), "New node");
         Assert.assertTrue(newNodePage.isFormDisplayed(), "New Node form is not visible");
     }
 
@@ -225,6 +221,6 @@ public void testConfigureCloudIntegration() {
                 .clickConfigureCloud();
 
         Assert.assertEquals(cloudsPage.getHeader().getText(), "Clouds");
-        Assert.assertEquals(cloudsPage.getParagraphText(), "There is no plugin installed that supports 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/page/CloudsPage.java b/src/test/java/school/redrover/page/CloudsPage.java
index 1dcc2d06a..5c8d0986c 100644
--- a/src/test/java/school/redrover/page/CloudsPage.java
+++ b/src/test/java/school/redrover/page/CloudsPage.java
@@ -1,13 +1,20 @@
 package school.redrover.page;
 
-import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.BasePage;
 
 
 public class CloudsPage extends BasePage<CloudsPage> {
 
+    @FindBy(tagName = "h1")
+    private WebElement header;
+
+    @FindBy(xpath = "//p")
+    private WebElement cloudsInfo;
+
     public CloudsPage(WebDriver driver) {
         super(driver);
     }
@@ -19,12 +26,12 @@ public CloudsPage getPage() {
 
     @Override
     public CloudsPage waitUntilPageLoad() {
-        getWait5().until(ExpectedConditions.visibilityOf(getDriver().findElement(By.tagName("h1"))));
+        getWait5().until(ExpectedConditions.visibilityOf(header));
 
         return this;
     }
 
-    public String getParagraphText() {
-        return getDriver().findElement(By.xpath("//p")).getText();
+    public String getCloudsPageInfoText() {
+        return cloudsInfo.getText();
     }
 }