diff --git a/packages/builder/cypress/integration/createAutomation.spec.js b/packages/builder/cypress/integration/createAutomation.spec.js
index 6ff013cd7a..efd3c7d023 100644
--- a/packages/builder/cypress/integration/createAutomation.spec.js
+++ b/packages/builder/cypress/integration/createAutomation.spec.js
@@ -35,19 +35,20 @@ context("Create a automation", () => {
     cy.contains("dog").click()
     cy.get(".spectrum-Textfield-input")
     .first()
-    .type("goodboy")
+    .type("{{ trigger.row.name }}", { parseSpecialCharSequences: false })
     cy.get(".spectrum-Textfield-input")
       .eq(1)
       .type("11")
+    cy.contains("Finish and test automation").click()
 
-    cy.contains("Run test").click()
     cy.get(".modal-inner-wrapper").within(() => {
       cy.wait(1000)
       cy.get(".spectrum-Picker-label").click()
       cy.contains("dog").click()
+      cy.wait(1000)
       cy.get(".spectrum-Textfield-input")
         .first()
-        .type("goodboy")
+        .type("automationGoodboy")
       cy.get(".spectrum-Textfield-input")
         .eq(1)
         .type("11")
@@ -57,6 +58,9 @@ context("Create a automation", () => {
       cy.get(".spectrum-Textfield-input")
         .eq(3)
         .type("123456")
+      cy.contains("Test").click()
     })
+    cy.contains("Data").click()
+    cy.contains("automationGoodboy")
   })
 })
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 3c75c9963d..e43729edbe 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -25,7 +25,7 @@
 
   // Check the schema to see if required fields have been entered
   $: isError = !trigger.schema.outputs.required.every(
-    required => testData[required]
+    required => testData[required] || required !== "row"
   )
 
   function parseTestJSON(e) {
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index acda9b89e0..d648b3f989 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -244,7 +244,7 @@
             value={inputData[key]}
           />
         </CodeEditorModal>
-      {:else if value.type === "string" || value.type === "number"}
+      {:else if value.type === "string" || value.type === "number" || value.type === "integer"}
         {#if isTestModal}
           <ModalBindableInput
             title={value.title}
diff --git a/packages/server/src/api/controllers/webhook.js b/packages/server/src/api/controllers/webhook.js
index 15ee748d8d..2d687955e3 100644
--- a/packages/server/src/api/controllers/webhook.js
+++ b/packages/server/src/api/controllers/webhook.js
@@ -65,6 +65,10 @@ exports.buildSchema = async ctx => {
     let automation = await db.get(webhook.action.target)
     const autoOutputs = automation.definition.trigger.schema.outputs
     let properties = webhook.bodySchema.properties
+    // reset webhook outputs
+    autoOutputs.properties = {
+      body: autoOutputs.properties.body,
+    }
     for (let prop of Object.keys(properties)) {
       autoOutputs.properties[prop] = {
         type: properties[prop].type,