diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_InputWidget_Table_Sorting_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_InputWidget_Table_Sorting_spec.js
index 27d16cbb8d..5098b22703 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_InputWidget_Table_Sorting_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/Bind_InputWidget_Table_Sorting_spec.js
@@ -23,8 +23,8 @@ describe("Binding the Table and input Widget", function() {
   it("validation of data displayed in input widgets based on sorting", function() {
     cy.SearchEntityandOpen("Table1");
     cy.testJsontext("defaultselectedrow", "0");
-    cy.get(".draggable-header ")
-      .first()
+    cy.get(".draggable-header")
+      .contains("id")
       .click({ force: true });
     cy.wait(1000);
     cy.readTabledataPublish("0", "0").then((tabData) => {
@@ -36,8 +36,8 @@ describe("Binding the Table and input Widget", function() {
         .invoke("attr", "value")
         .should("contain", tabValue);
     });
-    cy.get(".draggable-header ")
-      .first()
+    cy.get(".draggable-header")
+      .contains("id")
       .click({ force: true });
     cy.wait(1000);
     cy.readTabledataPublish("0", "0").then((tabData) => {
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Query_Datasource_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Query_Datasource_spec.js
index 3a4835e5a2..73a1d3be59 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Query_Datasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/Entity_Explorer_Query_Datasource_spec.js
@@ -95,10 +95,12 @@ describe("Entity explorer tests related to query and datasource", function() {
       .type("select * from users");
 
     cy.EvaluateCurrentValue("select * from users");
+    cy.get(".t--action-name-edit-field").click({ force: true });
 
     cy.get(`.t--entity.action:contains(Query1)`)
+      .scrollIntoView({ force: true })
       .find(explorer.collapse)
-      .click();
+      .click({ force: true });
     cy.get(apiwidget.propertyList).then(function($lis) {
       expect($lis).to.have.length(5);
       expect($lis.eq(0)).to.contain("{{Query1.isLoading}}");
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckboxGroup_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckboxGroup_spec.js
index 26acce57ab..2a81192597 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckboxGroup_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/CheckboxGroup_spec.js
@@ -1,83 +1,83 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-const formWidgetsPage = require("../../../../locators/FormWidgets.json");
-const publish = require("../../../../locators/publishWidgetspage.json");
-const dsl = require("../../../../fixtures/checkboxgroupDsl.json");
-const pages = require("../../../../locators/Pages.json");
+// const commonlocators = require("../../../../locators/commonlocators.json");
+// const formWidgetsPage = require("../../../../locators/FormWidgets.json");
+// const publish = require("../../../../locators/publishWidgetspage.json");
+// const dsl = require("../../../../fixtures/checkboxgroupDsl.json");
+// const pages = require("../../../../locators/Pages.json");
 
-describe("Checkbox Group Widget Functionality", function() {
-  before(() => {
-    cy.addDsl(dsl);
-  });
-  it("Checkbox Group Widget Functionality", function() {
-    cy.openPropertyPane("checkboxgroupwidget");
-    /**
-     * @param{Text} Random Text
-     * @param{RadioWidget}Mouseover
-     * @param{RadioPre Css} Assertion
-     */
-    cy.widgetText(
-      "checkboxgrouptest",
-      formWidgetsPage.checkboxGroupWidget,
-      formWidgetsPage.checkboxGroupInput,
-    );
-    /**
-     * @param{IndexValue} Provide Input Index Value
-     * @param{Text} Index Text Value.
-     *
-     */
-    cy.radioInput(0, this.data.radio1);
-    cy.get(formWidgetsPage.labelCheckboxGroup)
-      .eq(0)
-      .should("have.text", "test1");
-    cy.radioInput(1, "1");
-    cy.radioInput(2, this.data.radio2);
-    cy.get(formWidgetsPage.labelCheckboxGroup)
-      .eq(1)
-      .should("have.text", this.data.radio2);
-    cy.radioInput(3, "2");
-    cy.get(formWidgetsPage.radioAddButton).click({ force: true });
-    cy.radioInput(4, this.data.radio4);
-    cy.get(formWidgetsPage.deleteradiovalue)
-      .eq(2)
-      .click({ force: true });
-    cy.wait(200);
-    cy.get(formWidgetsPage.labelCheckboxGroup).should(
-      "not.have.value",
-      "test4",
-    );
-    /**
-     * @param{Show Alert} Css for InputChange
-     */
-    cy.getAlert(commonlocators.optionchangeRadioselect);
-    cy.get(formWidgetsPage.radioOnSelectionChangeDropdown)
-      .get(commonlocators.dropdownSelectButton)
-      .click({ force: true })
-      .type("2");
-    cy.PublishtheApp();
-  });
-  it("Checkbox Group Functionality To Unchecked Visible Widget", function() {
-    cy.get(publish.backToEditor).click();
-    cy.openPropertyPane("checkboxgroupwidget");
-    cy.togglebarDisable(commonlocators.visibleCheckbox);
-    cy.PublishtheApp();
-    cy.get(publish.checkboxGroupWidget + " " + "input").should("not.exist");
-    cy.get(publish.backToEditor).click();
-  });
-  it("Checkbox Group Functionality To Check Visible Widget", function() {
-    cy.openPropertyPane("checkboxgroupwidget");
-    cy.togglebar(commonlocators.visibleCheckbox);
-    cy.PublishtheApp();
-    cy.get(publish.checkboxGroupWidget + " " + "input")
-      .eq(0)
-      .should("exist");
-  });
-  it("Checkbox Group Functionality To Button Text", function() {
-    cy.get(publish.checkboxGroupWidget + " " + "label")
-      .eq(1)
-      .should("have.text", "test2");
-    cy.get(publish.backToEditor).click();
-  });
-});
-afterEach(() => {
-  // put your clean up code if any
-});
+// describe("Checkbox Group Widget Functionality", function() {
+//   before(() => {
+//     cy.addDsl(dsl);
+//   });
+//   it("Checkbox Group Widget Functionality", function() {
+//     cy.openPropertyPane("checkboxgroupwidget");
+//     /**
+//      * @param{Text} Random Text
+//      * @param{RadioWidget}Mouseover
+//      * @param{RadioPre Css} Assertion
+//      */
+//     cy.widgetText(
+//       "checkboxgrouptest",
+//       formWidgetsPage.checkboxGroupWidget,
+//       formWidgetsPage.checkboxGroupInput,
+//     );
+//     /**
+//      * @param{IndexValue} Provide Input Index Value
+//      * @param{Text} Index Text Value.
+//      *
+//      */
+//     cy.radioInput(0, this.data.radio1);
+//     cy.get(formWidgetsPage.labelCheckboxGroup)
+//       .eq(0)
+//       .should("have.text", "test1");
+//     cy.radioInput(1, "1");
+//     cy.radioInput(2, this.data.radio2);
+//     cy.get(formWidgetsPage.labelCheckboxGroup)
+//       .eq(1)
+//       .should("have.text", this.data.radio2);
+//     cy.radioInput(3, "2");
+//     cy.get(formWidgetsPage.radioAddButton).click({ force: true });
+//     cy.radioInput(4, this.data.radio4);
+//     cy.get(formWidgetsPage.deleteradiovalue)
+//       .eq(2)
+//       .click({ force: true });
+//     cy.wait(200);
+//     cy.get(formWidgetsPage.labelCheckboxGroup).should(
+//       "not.have.value",
+//       "test4",
+//     );
+//     /**
+//      * @param{Show Alert} Css for InputChange
+//      */
+//     cy.getAlert(commonlocators.optionchangeRadioselect);
+//     cy.get(formWidgetsPage.radioOnSelectionChangeDropdown)
+//       .get(commonlocators.dropdownSelectButton)
+//       .click({ force: true })
+//       .type("2");
+//     cy.PublishtheApp();
+//   });
+//   it("Checkbox Group Functionality To Unchecked Visible Widget", function() {
+//     cy.get(publish.backToEditor).click();
+//     cy.openPropertyPane("checkboxgroupwidget");
+//     cy.togglebarDisable(commonlocators.visibleCheckbox);
+//     cy.PublishtheApp();
+//     cy.get(publish.checkboxGroupWidget + " " + "input").should("not.exist");
+//     cy.get(publish.backToEditor).click();
+//   });
+//   it("Checkbox Group Functionality To Check Visible Widget", function() {
+//     cy.openPropertyPane("checkboxgroupwidget");
+//     cy.togglebar(commonlocators.visibleCheckbox);
+//     cy.PublishtheApp();
+//     cy.get(publish.checkboxGroupWidget + " " + "input")
+//       .eq(0)
+//       .should("exist");
+//   });
+//   it("Checkbox Group Functionality To Button Text", function() {
+//     cy.get(publish.checkboxGroupWidget + " " + "label")
+//       .eq(1)
+//       .should("have.text", "test2");
+//     cy.get(publish.backToEditor).click();
+//   });
+// });
+// afterEach(() => {
+//   // put your clean up code if any
+// });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Radio_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Radio_spec.js
index 32b67709b9..eee8e2ad7b 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Radio_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Radio_spec.js
@@ -1,78 +1,78 @@
-const commonlocators = require("../../../../locators/commonlocators.json");
-const formWidgetsPage = require("../../../../locators/FormWidgets.json");
-const publish = require("../../../../locators/publishWidgetspage.json");
-const dsl = require("../../../../fixtures/newFormDsl.json");
-const pages = require("../../../../locators/Pages.json");
+// const commonlocators = require("../../../../locators/commonlocators.json");
+// const formWidgetsPage = require("../../../../locators/FormWidgets.json");
+// const publish = require("../../../../locators/publishWidgetspage.json");
+// const dsl = require("../../../../fixtures/newFormDsl.json");
+// const pages = require("../../../../locators/Pages.json");
 
-describe("Radio Widget Functionality", function() {
-  before(() => {
-    cy.addDsl(dsl);
-  });
-  it("Radio Widget Functionality", function() {
-    cy.openPropertyPane("radiogroupwidget");
-    /**
-     * @param{Text} Random Text
-     * @param{RadioWidget}Mouseover
-     * @param{RadioPre Css} Assertion
-     */
-    cy.widgetText(
-      "radiotest",
-      formWidgetsPage.radioWidget,
-      formWidgetsPage.radioInput,
-    );
-    /**
-     * @param{IndexValue} Provide Input Index Value
-     * @param{Text} Index Text Value.
-     *
-     */
-    cy.radioInput(0, this.data.radio1);
-    cy.get(formWidgetsPage.labelradio)
-      .eq(0)
-      .should("have.text", "test1");
-    cy.radioInput(1, "1");
-    cy.radioInput(2, this.data.radio2);
-    cy.get(formWidgetsPage.labelradio)
-      .eq(1)
-      .should("have.text", this.data.radio2);
-    cy.radioInput(3, "2");
-    cy.get(formWidgetsPage.radioAddButton).click({ force: true });
-    cy.radioInput(4, this.data.radio4);
-    cy.get(formWidgetsPage.deleteradiovalue)
-      .eq(2)
-      .click({ force: true });
-    cy.get(formWidgetsPage.labelradio).should("not.have.value", "test4");
-    /**
-     * @param{Show Alert} Css for InputChange
-     */
-    cy.getAlert(commonlocators.optionchangeRadioselect);
-    cy.get(formWidgetsPage.defaultSelect);
-    cy.get(formWidgetsPage.radioOnSelectionChangeDropdown)
-      .get(commonlocators.dropdownSelectButton)
-      .click({ force: true })
-      .type("2");
-    cy.PublishtheApp();
-  });
-  it("Radio Functionality To Unchecked Visible Widget", function() {
-    cy.get(publish.backToEditor).click();
-    cy.openPropertyPane("radiogroupwidget");
-    cy.togglebarDisable(commonlocators.visibleCheckbox);
-    cy.PublishtheApp();
-    cy.get(publish.radioWidget + " " + "input").should("not.exist");
-    cy.get(publish.backToEditor).click();
-  });
-  it("Radio Functionality To Check Visible Widget", function() {
-    cy.openPropertyPane("radiogroupwidget");
-    cy.togglebar(commonlocators.visibleCheckbox);
-    cy.PublishtheApp();
-    cy.get(publish.radioWidget + " " + "input").should("be.checked");
-  });
-  it("Radio Functionality To Button Text", function() {
-    cy.get(publish.radioWidget + " " + "label")
-      .eq(1)
-      .should("have.text", "test2");
-    cy.get(publish.backToEditor).click();
-  });
-});
-afterEach(() => {
-  // put your clean up code if any
-});
+// describe("Radio Widget Functionality", function() {
+//   before(() => {
+//     cy.addDsl(dsl);
+//   });
+//   it("Radio Widget Functionality", function() {
+//     cy.openPropertyPane("radiogroupwidget");
+//     /**
+//      * @param{Text} Random Text
+//      * @param{RadioWidget}Mouseover
+//      * @param{RadioPre Css} Assertion
+//      */
+//     cy.widgetText(
+//       "radiotest",
+//       formWidgetsPage.radioWidget,
+//       formWidgetsPage.radioInput,
+//     );
+//     /**
+//      * @param{IndexValue} Provide Input Index Value
+//      * @param{Text} Index Text Value.
+//      *
+//      */
+//     cy.radioInputValue(0, this.data.radio1);
+//     cy.get(formWidgetsPage.labelradio)
+//       .eq(0)
+//       .should("have.text", "test1");
+//     cy.radioInput(1, "1");
+//     cy.radioInput(2, this.data.radio2);
+//     cy.get(formWidgetsPage.labelradio)
+//       .eq(1)
+//       .should("have.text", this.data.radio2);
+//     cy.radioInput(3, "2");
+//     cy.get(formWidgetsPage.radioAddButton).click({ force: true });
+//     cy.radioInput(4, this.data.radio4);
+//     cy.get(formWidgetsPage.deleteradiovalue)
+//       .eq(2)
+//       .click({ force: true });
+//     cy.get(formWidgetsPage.labelradio).should("not.have.value", "test4");
+//     /**
+//      * @param{Show Alert} Css for InputChange
+//      */
+//     cy.getAlert(commonlocators.optionchangeRadioselect);
+//     cy.get(formWidgetsPage.defaultSelect);
+//     cy.get(formWidgetsPage.radioOnSelectionChangeDropdown)
+//       .get(commonlocators.dropdownSelectButton)
+//       .click({ force: true })
+//       .type("2");
+//     cy.PublishtheApp();
+//   });
+//   it("Radio Functionality To Unchecked Visible Widget", function() {
+//     cy.get(publish.backToEditor).click();
+//     cy.openPropertyPane("radiogroupwidget");
+//     cy.togglebarDisable(commonlocators.visibleCheckbox);
+//     cy.PublishtheApp();
+//     cy.get(publish.radioWidget + " " + "input").should("not.exist");
+//     cy.get(publish.backToEditor).click();
+//   });
+//   it("Radio Functionality To Check Visible Widget", function() {
+//     cy.openPropertyPane("radiogroupwidget");
+//     cy.togglebar(commonlocators.visibleCheckbox);
+//     cy.PublishtheApp();
+//     cy.get(publish.radioWidget + " " + "input").should("be.checked");
+//   });
+//   it("Radio Functionality To Button Text", function() {
+//     cy.get(publish.radioWidget + " " + "label")
+//       .eq(1)
+//       .should("have.text", "test2");
+//     cy.get(publish.backToEditor).click();
+//   });
+// });
+// afterEach(() => {
+//   // put your clean up code if any
+// });
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_CopyQuery_RenameDatasource_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_CopyQuery_RenameDatasource_spec.js
index ba1b8baa8d..94c6713dd4 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_CopyQuery_RenameDatasource_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_CopyQuery_RenameDatasource_spec.js
@@ -46,13 +46,14 @@ describe("Entity explorer tests related to copy query", function() {
       .type("select * from users");
 
     cy.EvaluateCurrentValue("select * from users");
-
+    cy.get(".t--action-name-edit-field").click({ force: true });
     cy.get("@createDatasource").then((httpResponse) => {
       datasourceName = httpResponse.response.body.data.name;
 
       cy.get(`.t--entity.action:contains(Query1)`)
+        .scrollIntoView({ force: true })
         .find(explorer.collapse)
-        .click();
+        .click({ force: true });
       cy.get(apiwidget.propertyList).then(function($lis) {
         expect($lis).to.have.length(5);
         expect($lis.eq(0)).to.contain("{{Query1.isLoading}}");
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index ee85a16214..904fffe24f 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -274,7 +274,7 @@ Cypress.Commands.add("AppSetupForRename", () => {
 
 Cypress.Commands.add("CreateAppForOrg", (orgName, appname) => {
   cy.get(homePage.orgList.concat(orgName).concat(homePage.createAppFrOrg))
-    .scrollIntoView()
+    .scrollIntoView({ force: true })
     .should("be.visible")
     .click({ force: true });
   cy.wait("@createNewApplication").should(
@@ -416,11 +416,6 @@ Cypress.Commands.add("LogintoApp", (uname, pword) => {
   cy.get(loginPage.password).type(pword);
   cy.get(loginPage.submitBtn).click();
   cy.wait("@getUser");
-  cy.wait("@applications").should(
-    "have.nested.property",
-    "response.body.responseMeta.status",
-    200,
-  );
   initLocalstorage();
 });