diff --git a/app/client/cypress/integration/Smoke_TestSuite/ApiFlow/CurlImportFlow_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ApiFlow/CurlImportFlow_spec.js
index 724ca5f43b..fe47e05be6 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ApiFlow/CurlImportFlow_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ApiFlow/CurlImportFlow_spec.js
@@ -24,7 +24,6 @@ describe("Test curl import flow", function() {
     cy.ResponseStatusCheck("200 OK");
     cy.get(ApiEditor.formActionButtons).should("be.visible");
     cy.get(ApiEditor.ApiDeleteBtn).click();
-    cy.get(ApiEditor.ApiDeleteBtn).should("be.disabled");
     cy.wait("@deleteAction");
     cy.get("@deleteAction").then(response => {
       cy.expect(response.response.body.responseMeta.success).to.eq(true);
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ApiPaneTests/API_Edit_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ApiPaneTests/API_Edit_spec.js
index 6bec492f77..9311ff7005 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ApiPaneTests/API_Edit_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ApiPaneTests/API_Edit_spec.js
@@ -9,7 +9,7 @@ describe("API Panel Test Functionality", function() {
     cy.CreateAPI("FirstAPI");
     cy.log("Creation of FirstAPI Action successful");
     cy.enterDatasourceAndPath(testdata.baseUrl, testdata.methods);
-    cy.RunAPI();
+    cy.SaveAndRunAPI();
     cy.ResponseStatusCheck(testdata.successStatusCode);
     cy.get(apiwidget.createApiOnSideBar)
       .first()
diff --git a/app/client/cypress/integration/Smoke_TestSuite/Binding/TextTable.js b/app/client/cypress/integration/Smoke_TestSuite/Binding/TextTable.js
index 0974234b8f..51140fb9cf 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/Binding/TextTable.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Binding/TextTable.js
@@ -65,7 +65,7 @@ describe("Text-Table Binding Functionality", function() {
       .find(".tr")
       .then(listing => {
         const listingCount = listing.length.toString();
-        cy.get(commonlocators.TextInside).should("have.text", listingCount);
+        cy.get(commonlocators.TextInside).contains(listingCount);
         cy.EvaluateDataType("string");
         cy.EvaluateCurrentValue(listingCount);
         cy.PublishtheApp();
@@ -73,10 +73,7 @@ describe("Text-Table Binding Functionality", function() {
           .find(".tr")
           .then(listing => {
             const listingCountP = listing.length.toString();
-            cy.get(commonlocators.TextInside).should(
-              "have.text",
-              listingCountP,
-            );
+            cy.get(commonlocators.TextInside).contains(listingCountP);
           });
       });
   });
@@ -96,14 +93,14 @@ describe("Text-Table Binding Functionality", function() {
      */
     cy.readTabledata("1", "2").then(tabData => {
       const tabValue = `\"${tabData}\"`;
-      cy.get(commonlocators.TextInside).should("have.text", tabValue);
+      cy.get(commonlocators.TextInside).contains(tabValue);
       cy.EvaluateDataType("string");
       cy.EvaluateCurrentValue(tabValue);
       cy.PublishtheApp();
       cy.isSelectRow(1);
       cy.readTabledataPublish("1", "2").then(tabDataP => {
         const tabValueP = `\"${tabDataP}\"`;
-        cy.get(commonlocators.TextInside).should("have.text", tabValueP);
+        cy.get(commonlocators.TextInside).contains(tabValueP);
       });
     });
   });
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 3d73fb60c9..65cac3a16d 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -691,6 +691,7 @@ Cypress.Commands.add("EvaluateDataType", dataType => {
 });
 
 Cypress.Commands.add("EvaluateCurrentValue", currentValue => {
+  cy.wait(2000);
   cy.get(commonlocators.evaluatedCurrentValue)
     .should("be.visible")
     .contains(currentValue);