diff --git a/packages/commands/src/add-data-source.ts b/packages/commands/src/add-data-source.ts
index 4277e0e3a..b2d7a6be9 100644
--- a/packages/commands/src/add-data-source.ts
+++ b/packages/commands/src/add-data-source.ts
@@ -17,7 +17,7 @@ export class AddDataSource {
 
   toCLICommand(): string {
     return (
-      '"data-source add --name= ' +
+      '"data-source add --name=' +
       this.name +
       " --jndi-name=" +
       this.jndiName +
diff --git a/packages/testsuite/cypress/e2e/transaction/transactions-configuration-subsystem-transaction-jdbc.cy.ts b/packages/testsuite/cypress/e2e/transaction/transactions-configuration-subsystem-transaction-jdbc.cy.ts
index 0c68e101a..d51b4db9d 100644
--- a/packages/testsuite/cypress/e2e/transaction/transactions-configuration-subsystem-transaction-jdbc.cy.ts
+++ b/packages/testsuite/cypress/e2e/transaction/transactions-configuration-subsystem-transaction-jdbc.cy.ts
@@ -20,20 +20,20 @@ describe("TESTS: Configuration => Sybsystem => Transaction => Path", () => {
 
   const datasourceBase = {
     connectionUrl:
-      "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=${wildfly.h2.compatibility.mode:REGULAR}",
+      "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=\\${wildfly.h2.compatibility.mode:REGULAR}",
     driverName: "h2",
   };
 
   const nonEmptyDS = {
     ...datasourceBase,
     name: "nonEmptyDS",
-    jndiName: "java:jboss/datasources/nonEmptyDS,",
+    jndiName: "java:jboss/datasources/nonEmptyDS",
   };
 
   const nonEmptyDSUpdated = {
     ...datasourceBase,
-    name: "nonEmptyDS",
-    jndiName: "java:jboss/datasources/nonEmptyDS,",
+    name: "nonEmptyDSUpdated",
+    jndiName: "java:jboss/datasources/nonEmptyDSUpdated",
   };
 
   // Here we start our WildFly container prior to test execution
diff --git a/packages/testsuite/cypress/support/form-editing.ts b/packages/testsuite/cypress/support/form-editing.ts
index 2084c550d..630ea2d1c 100644
--- a/packages/testsuite/cypress/support/form-editing.ts
+++ b/packages/testsuite/cypress/support/form-editing.ts
@@ -141,6 +141,8 @@ Cypress.Commands.add(
     formInput.type(value as string, { parseSpecialCharSequences: parseSpecialCharSequences });
     formInput.should("have.value", value);
     formInput.trigger("change");
+    // lose focus of current input to close suggestions which can hide buttons. 
+    formInput.blur();
   }
 );
 
@@ -305,7 +307,7 @@ declare global {
        */
       clearAttribute(formId: string, attributeName: string): Chainable<void>;
       /**
-       * Select value from <select> input which isn't part of a form. 
+       * Select value from <select> input which isn't part of a form.
        * @category Data inserting
        *
        * @example The form input have select with id "#dw-routing-select"