diff --git a/.changeset/easy-planets-post.md b/.changeset/easy-planets-post.md
new file mode 100644
index 000000000..e32bdbf0e
--- /dev/null
+++ b/.changeset/easy-planets-post.md
@@ -0,0 +1,5 @@
+---
+'@orchestrator-ui/orchestrator-ui-components': patch
+---
+
+Fixes for pydanticforms integration
diff --git a/apps/wfo-ui b/apps/wfo-ui
index 39ec12463..d9d24f91e 160000
--- a/apps/wfo-ui
+++ b/apps/wfo-ui
@@ -1 +1 @@
-Subproject commit 39ec12463a6c53b9d29ae60831c4940d5a123224
+Subproject commit d9d24f91e0912b40856d97d10b87c733e3cdaed7
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Footer.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Footer.tsx
index dd449cb9b..9fbc74bef 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Footer.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Footer.tsx
@@ -29,6 +29,7 @@ export const Footer = () => {
 
     const PreviousButton = () => (
         <EuiButton
+            data-testid="button-submit-form-previous"
             id="button-submit-form-submit"
             tabIndex={0}
             fill
@@ -47,6 +48,7 @@ export const Footer = () => {
 
     const CancelButton = () => (
         <div
+            data-testid="button-submit-form-cancel"
             onClick={handlePrevious}
             css={{
                 cursor: 'pointer',
@@ -75,6 +77,7 @@ export const Footer = () => {
          */
         return (
             <EuiButton
+                data-testid="button-submit-form-submit"
                 id="button-submit-form-submit"
                 tabIndex={0}
                 fill
@@ -89,7 +92,7 @@ export const Footer = () => {
     };
 
     return (
-        <div>
+        <div data-testid="pydantic-form-footer">
             <RenderFormErrors />
             <EuiHorizontalRule />
             <div style={{ display: 'flex', justifyContent: 'space-between' }}>
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Header.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Header.tsx
index 64e1a9d7a..fb9c61174 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Header.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Header.tsx
@@ -16,6 +16,8 @@ export const Header = () => {
 
     return pydanticFormSchema?.title &&
         pydanticFormSchema.title !== 'unknown' ? (
-        <h3 css={headerStyling}>{pydanticFormSchema?.title}</h3>
+        <h3 data-testid="pydantic-form-header" css={headerStyling}>
+            {pydanticFormSchema?.title}
+        </h3>
     ) : undefined;
 };
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Row.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Row.tsx
index 38b44fe57..ae8e256b4 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Row.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/Row.tsx
@@ -29,6 +29,7 @@ export const Row: RowRenderComponent = ({
 
     return (
         <EuiFormRow
+            data-testid="pydantic-form-row"
             css={formRowStyle}
             label={<Label />}
             labelAppend={<EuiText size="m">{description}</EuiText>}
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/WfoPydanticForm.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/WfoPydanticForm.tsx
index 547d6a479..64ad824ef 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/WfoPydanticForm.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/WfoPydanticForm.tsx
@@ -25,16 +25,16 @@ import { Footer } from './Footer';
 import { Header } from './Header';
 import { Row } from './Row';
 import {
-    Checkbox,
-    Divider,
-    Integer,
-    Label,
-    Radio,
-    Summary,
-    Text,
-    TextArea,
     WfoArrayField,
+    WfoCheckbox,
+    WfoDivider,
+    WfoInteger,
+    WfoLabel,
     WfoObjectField,
+    WfoRadio,
+    WfoSummary,
+    WfoText,
+    WfoTextArea,
 } from './fields';
 
 interface WfoPydanticFormProps {
@@ -146,7 +146,7 @@ export const WfoPydanticForm = ({
             {
                 id: 'textarea',
                 ElementMatch: {
-                    Element: TextArea,
+                    Element: WfoTextArea,
                     isControlledElement: true,
                 },
                 matcher(field) {
@@ -159,7 +159,7 @@ export const WfoPydanticForm = ({
             {
                 id: 'summary',
                 ElementMatch: {
-                    Element: Summary,
+                    Element: WfoSummary,
                     isControlledElement: false,
                 },
                 matcher(field) {
@@ -172,7 +172,7 @@ export const WfoPydanticForm = ({
             {
                 id: 'label',
                 ElementMatch: {
-                    Element: Label,
+                    Element: WfoLabel,
                     isControlledElement: false,
                 },
                 matcher(field) {
@@ -185,7 +185,7 @@ export const WfoPydanticForm = ({
             {
                 id: 'divider',
                 ElementMatch: {
-                    Element: Divider,
+                    Element: WfoDivider,
                     isControlledElement: false,
                 },
                 matcher(field) {
@@ -198,7 +198,7 @@ export const WfoPydanticForm = ({
             {
                 id: 'checkbox',
                 ElementMatch: {
-                    Element: Checkbox,
+                    Element: WfoCheckbox,
                     isControlledElement: true,
                 },
                 matcher(field) {
@@ -208,7 +208,7 @@ export const WfoPydanticForm = ({
             {
                 id: 'radio',
                 ElementMatch: {
-                    Element: Radio,
+                    Element: WfoRadio,
                     isControlledElement: true,
                 },
                 matcher(field) {
@@ -223,7 +223,7 @@ export const WfoPydanticForm = ({
             {
                 id: 'integerfield',
                 ElementMatch: {
-                    Element: Integer,
+                    Element: WfoInteger,
                     isControlledElement: true,
                 },
                 matcher(field) {
@@ -259,7 +259,7 @@ export const WfoPydanticForm = ({
             {
                 id: 'text',
                 ElementMatch: {
-                    Element: Text,
+                    Element: WfoText,
                     isControlledElement: true,
                 },
                 matcher(field) {
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoArrayField/WfoArrayField.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoArrayField/WfoArrayField.tsx
index 441d401cf..2d83c6f3d 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoArrayField/WfoArrayField.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoArrayField/WfoArrayField.tsx
@@ -91,7 +91,7 @@ export const WfoArrayField = ({
     };
 
     return (
-        <div css={container}>
+        <div data-testid={arrayName} css={container}>
             {fields.map(renderField)}
 
             {showPlus && (
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Checkbox.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoCheckbox.tsx
similarity index 82%
rename from packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Checkbox.tsx
rename to packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoCheckbox.tsx
index 6f4a3db55..87d81d86a 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Checkbox.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoCheckbox.tsx
@@ -4,7 +4,7 @@ import type { PydanticFormControlledElement } from 'pydantic-forms';
 
 import { EuiCheckbox } from '@elastic/eui';
 
-export const Checkbox: PydanticFormControlledElement = ({
+export const WfoCheckbox: PydanticFormControlledElement = ({
     pydanticFormField,
     onChange,
     value,
@@ -12,6 +12,7 @@ export const Checkbox: PydanticFormControlledElement = ({
 }) => {
     return (
         <EuiCheckbox
+            data-testid={pydanticFormField.id}
             checked={value || false}
             disabled={disabled}
             id={pydanticFormField.id}
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Divider.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoDivider.tsx
similarity index 75%
rename from packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Divider.tsx
rename to packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoDivider.tsx
index c707c0c27..0042ee66f 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Divider.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoDivider.tsx
@@ -6,10 +6,11 @@ import { EuiHorizontalRule } from '@elastic/eui';
 
 import { useOrchestratorTheme } from '@/hooks';
 
-export const Divider: PydanticFormElement = ({ pydanticFormField }) => {
+export const WfoDivider: PydanticFormElement = ({ pydanticFormField }) => {
     const { theme } = useOrchestratorTheme();
     return (
         <EuiHorizontalRule
+            data-testid={pydanticFormField.id}
             style={{ marginTop: theme.base }}
             id={pydanticFormField.id}
         />
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Integer.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoInteger.tsx
similarity index 90%
rename from packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Integer.tsx
rename to packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoInteger.tsx
index 70f54a2ca..cb21be44a 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Integer.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoInteger.tsx
@@ -22,7 +22,7 @@ const getFormFieldsBaseStyle = ({ theme }: WfoTheme) => {
     };
 };
 
-export const Integer: PydanticFormControlledElement = ({
+export const WfoInteger: PydanticFormControlledElement = ({
     pydanticFormField,
     onChange,
     value,
@@ -34,6 +34,7 @@ export const Integer: PydanticFormControlledElement = ({
 
     return (
         <EuiFieldNumber
+            data-testid={pydanticFormField.id}
             css={formFieldBaseStyle}
             name={pydanticFormField.id}
             onChange={(event) => onChange(parseInt(event.target.value))}
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Label.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoLabel.tsx
similarity index 79%
rename from packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Label.tsx
rename to packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoLabel.tsx
index e6d8039b3..c6adcc592 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Label.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoLabel.tsx
@@ -4,11 +4,11 @@ import { PydanticFormElement } from 'pydantic-forms';
 
 import { useOrchestratorTheme } from '@/hooks';
 
-export const Label: PydanticFormElement = ({ pydanticFormField }) => {
+export const WfoLabel: PydanticFormElement = ({ pydanticFormField }) => {
     const { theme } = useOrchestratorTheme();
 
     return (
-        <div>
+        <div data-testid={pydanticFormField.id}>
             <label
                 css={{
                     color: theme.colors.text,
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoObjectField/WfoObjectField.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoObjectField/WfoObjectField.tsx
index 29418ba98..eeddfc563 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoObjectField/WfoObjectField.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoObjectField/WfoObjectField.tsx
@@ -22,7 +22,10 @@ export const WfoObjectField = ({
     );
 
     return (
-        <EuiFlexGroup css={wfoObjectFieldStyles}>
+        <EuiFlexGroup
+            data-testid={pydanticFormField.id}
+            css={wfoObjectFieldStyles}
+        >
             <RenderFields pydanticFormComponents={components} />
         </EuiFlexGroup>
     );
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Radio.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoRadio.tsx
similarity index 84%
rename from packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Radio.tsx
rename to packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoRadio.tsx
index efbaaf128..ba55032b8 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Radio.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoRadio.tsx
@@ -4,7 +4,7 @@ import type { PydanticFormControlledElement } from 'pydantic-forms';
 
 import { EuiRadioGroup } from '@elastic/eui';
 
-export const Radio: PydanticFormControlledElement = ({
+export const WfoRadio: PydanticFormControlledElement = ({
     pydanticFormField,
     onChange,
     value,
@@ -17,6 +17,7 @@ export const Radio: PydanticFormControlledElement = ({
 
     return (
         <EuiRadioGroup
+            data-testid={pydanticFormField.id}
             options={radioOptions}
             idSelected={value}
             onChange={(id) => onChange(id)}
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Summary.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoSummary.tsx
similarity index 96%
rename from packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Summary.tsx
rename to packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoSummary.tsx
index 6ff638c9f..00617d4fd 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Summary.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoSummary.tsx
@@ -52,7 +52,7 @@ export const getStyles = ({ theme }: WfoTheme) => {
     };
 };
 
-export const Summary: PydanticFormElement = ({ pydanticFormField }) => {
+export const WfoSummary: PydanticFormElement = ({ pydanticFormField }) => {
     const { summaryFieldStyle } = useWithOrchestratorTheme(getStyles);
     const { formRowStyle } = useWithOrchestratorTheme(getCommonFormFieldStyles);
 
@@ -103,7 +103,7 @@ export const Summary: PydanticFormElement = ({ pydanticFormField }) => {
         );
 
     return (
-        <EuiFlexItem css={[summaryFieldStyle, formRowStyle]}>
+        <EuiFlexItem data-testid={id} css={[summaryFieldStyle, formRowStyle]}>
             <section>
                 <EuiFormRow
                     label={description}
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Text.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoText.tsx
similarity index 83%
rename from packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Text.tsx
rename to packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoText.tsx
index 61a6711bf..02eb62bc6 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/Text.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoText.tsx
@@ -7,10 +7,11 @@ import { EuiFieldText } from '@elastic/eui';
 import { useWithOrchestratorTheme } from '@/hooks';
 import { getFormFieldsBaseStyle } from '@/theme';
 
-export const Text: PydanticFormControlledElement = ({
+export const WfoText: PydanticFormControlledElement = ({
     onChange,
     value,
     disabled,
+    pydanticFormField,
 }) => {
     const { formFieldBaseStyle } = useWithOrchestratorTheme(
         getFormFieldsBaseStyle,
@@ -18,6 +19,7 @@ export const Text: PydanticFormControlledElement = ({
 
     return (
         <EuiFieldText
+            data-testid={pydanticFormField.id}
             css={formFieldBaseStyle}
             disabled={disabled}
             onChange={(event) => onChange(event.target.value)}
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/TextArea.tsx b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoTextArea.tsx
similarity index 82%
rename from packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/TextArea.tsx
rename to packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoTextArea.tsx
index 825fd3b1d..9c81e5786 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/TextArea.tsx
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/WfoTextArea.tsx
@@ -4,7 +4,7 @@ import type { PydanticFormControlledElement } from 'pydantic-forms';
 
 import { EuiTextArea } from '@elastic/eui';
 
-export const TextArea: PydanticFormControlledElement = ({
+export const WfoTextArea: PydanticFormControlledElement = ({
     pydanticFormField,
     onChange,
     value,
@@ -12,6 +12,7 @@ export const TextArea: PydanticFormControlledElement = ({
 }) => {
     return (
         <EuiTextArea
+            data-testid={pydanticFormField.id}
             disabled={disabled}
             name={pydanticFormField.id}
             onChange={(event) => onChange(event.target.value)}
diff --git a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/index.ts b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/index.ts
index ee28548a8..3274593be 100644
--- a/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/index.ts
+++ b/packages/orchestrator-ui-components/src/components/WfoPydanticForm/fields/index.ts
@@ -1,10 +1,10 @@
-export * from './TextArea';
-export * from './Text';
-export * from './Label';
-export * from './Divider';
-export * from './Checkbox';
-export * from './Summary';
+export * from './WfoTextArea';
+export * from './WfoText';
+export * from './WfoLabel';
+export * from './WfoDivider';
+export * from './WfoCheckbox';
+export * from './WfoSummary';
 export * from './WfoObjectField';
 export * from './WfoArrayField';
-export * from './Radio';
-export * from './Integer';
+export * from './WfoRadio';
+export * from './WfoInteger';