From 4e42516caf74e340d00a20c93759cf3a1fa577ce Mon Sep 17 00:00:00 2001
From: Emily Jablonski <65367387+emilyjablonski@users.noreply.github.com>
Date: Wed, 29 May 2024 15:46:01 -0600
Subject: [PATCH] fix: saving household member (#4108)

---
 api/prisma/seed-helpers/listing-factory.ts    |  32 +-
 api/prisma/seed-staging.ts                    | 131 +++++++-
 .../sections/DetailsHouseholdMembers.tsx      |  10 +-
 .../sections/FormHouseholdMembers.tsx         |  26 +-
 sites/public/cypress.config.ts                |   2 +-
 .../e2e/pages/submit-application.spec.ts      |   4 +-
 .../cypress/mockData/applicationData.ts       | 137 +++++----
 sites/public/cypress/support/commands.js      | 282 +++++++++++++++---
 sites/public/cypress/support/index.d.ts       |   7 +-
 .../applications/ValidateAddress.tsx          |   1 +
 .../components/shared/FormSummaryDetails.tsx  |  63 ++--
 .../pages/applications/contact/address.tsx    |  25 +-
 .../pages/applications/household/member.tsx   |  48 +--
 .../household/preferred-units.tsx             |   1 +
 14 files changed, 570 insertions(+), 199 deletions(-)

diff --git a/api/prisma/seed-helpers/listing-factory.ts b/api/prisma/seed-helpers/listing-factory.ts
index 232e5e05fc..57a83b522c 100644
--- a/api/prisma/seed-helpers/listing-factory.ts
+++ b/api/prisma/seed-helpers/listing-factory.ts
@@ -95,16 +95,30 @@ export const listingFactory = async (
       : new Date(),
     listingMultiselectQuestions: optionalParams?.multiselectQuestions
       ? {
-          create: optionalParams.multiselectQuestions.map(
-            (question, index) => ({
-              multiselectQuestions: {
-                connect: {
-                  id: question.id,
+          create: [
+            ...optionalParams?.multiselectQuestions
+              ?.filter(
+                (question) => question.applicationSection === 'preferences',
+              )
+              .map((question, index) => ({
+                multiselectQuestions: {
+                  connect: {
+                    id: question.id,
+                  },
                 },
-              },
-              ordinal: index + 1,
-            }),
-          ),
+                ordinal: index + 1,
+              })),
+            ...optionalParams?.multiselectQuestions
+              ?.filter((question) => question.applicationSection === 'programs')
+              .map((question, index) => ({
+                multiselectQuestions: {
+                  connect: {
+                    id: question.id,
+                  },
+                },
+                ordinal: index + 1,
+              })),
+          ],
         }
       : undefined,
     applications: optionalParams?.applications
diff --git a/api/prisma/seed-staging.ts b/api/prisma/seed-staging.ts
index b5156b9708..848e1e4735 100644
--- a/api/prisma/seed-staging.ts
+++ b/api/prisma/seed-staging.ts
@@ -161,6 +161,21 @@ export const stagingSeed = async (
       },
     }),
   });
+  const multiselectQuestion3 = await prismaClient.multiselectQuestions.create({
+    data: multiselectQuestionFactory(jurisdiction.id, {
+      multiselectQuestion: {
+        text: 'Veteran',
+        description:
+          'Have you or anyone in your household served in the US military?',
+        applicationSection: MultiselectQuestionsApplicationSectionEnum.programs,
+        optOutText: 'Prefer not to say',
+        options: [
+          { text: 'Yes', exclusive: true, ordinal: 1 },
+          { text: 'No', exclusive: true, ordinal: 2 },
+        ],
+      },
+    }),
+  });
   const multiselectQuestionPrograms =
     await prismaClient.multiselectQuestions.create({
       data: multiselectQuestionFactory(jurisdiction.id, {
@@ -875,7 +890,121 @@ export const stagingSeed = async (
           ],
         },
       },
-      multiselectQuestions: [multiselectQuestion2, multiselectQuestion1],
+      multiselectQuestions: [
+        multiselectQuestion2,
+        multiselectQuestion1,
+        multiselectQuestion3,
+      ],
+      units: [
+        {
+          amiPercentage: '30',
+          monthlyIncomeMin: '2000',
+          floor: 1,
+          maxOccupancy: 3,
+          minOccupancy: 1,
+          monthlyRent: '1200',
+          numBathrooms: 1,
+          numBedrooms: 1,
+          number: '101',
+          sqFeet: '750.00',
+          amiChart: { connect: { id: amiChart.id } },
+          unitTypes: {
+            connect: {
+              id: unitTypes[0].id,
+            },
+          },
+        },
+        {
+          amiPercentage: '30',
+          monthlyIncomeMin: '2000',
+          floor: 1,
+          maxOccupancy: 3,
+          minOccupancy: 1,
+          monthlyRent: '1200',
+          numBathrooms: 1,
+          numBedrooms: 1,
+          number: '101',
+          sqFeet: '750.00',
+          amiChart: { connect: { id: amiChart.id } },
+          unitTypes: {
+            connect: {
+              id: unitTypes[1].id,
+            },
+          },
+        },
+        {
+          amiPercentage: '30',
+          monthlyIncomeMin: '2000',
+          floor: 1,
+          maxOccupancy: 3,
+          minOccupancy: 1,
+          monthlyRent: '1200',
+          numBathrooms: 1,
+          numBedrooms: 1,
+          number: '101',
+          sqFeet: '750.00',
+          amiChart: { connect: { id: amiChart.id } },
+          unitTypes: {
+            connect: {
+              id: unitTypes[2].id,
+            },
+          },
+        },
+        {
+          amiPercentage: '30',
+          monthlyIncomeMin: '2000',
+          floor: 1,
+          maxOccupancy: 3,
+          minOccupancy: 1,
+          monthlyRent: '1200',
+          numBathrooms: 1,
+          numBedrooms: 1,
+          number: '101',
+          sqFeet: '750.00',
+          amiChart: { connect: { id: amiChart.id } },
+          unitTypes: {
+            connect: {
+              id: unitTypes[3].id,
+            },
+          },
+        },
+        {
+          amiPercentage: '30',
+          monthlyIncomeMin: '2000',
+          floor: 1,
+          maxOccupancy: 3,
+          minOccupancy: 1,
+          monthlyRent: '1200',
+          numBathrooms: 1,
+          numBedrooms: 1,
+          number: '101',
+          sqFeet: '750.00',
+          amiChart: { connect: { id: amiChart.id } },
+          unitTypes: {
+            connect: {
+              id: unitTypes[4].id,
+            },
+          },
+        },
+        {
+          amiPercentage: '30',
+          monthlyIncomeMin: '2000',
+          floor: 1,
+          maxOccupancy: 3,
+          minOccupancy: 1,
+          monthlyRent: '1200',
+          numBathrooms: 1,
+          numBedrooms: 1,
+          number: '101',
+          sqFeet: '750.00',
+          amiChart: { connect: { id: amiChart.id } },
+          unitTypes: {
+            connect: {
+              id: unitTypes[5].id,
+            },
+          },
+        },
+      ],
     },
   ].map(
     async (
diff --git a/sites/partners/src/components/applications/PaperApplicationDetails/sections/DetailsHouseholdMembers.tsx b/sites/partners/src/components/applications/PaperApplicationDetails/sections/DetailsHouseholdMembers.tsx
index 25d8038974..01f3b4b296 100644
--- a/sites/partners/src/components/applications/PaperApplicationDetails/sections/DetailsHouseholdMembers.tsx
+++ b/sites/partners/src/components/applications/PaperApplicationDetails/sections/DetailsHouseholdMembers.tsx
@@ -14,11 +14,11 @@ const DetailsHouseholdMembers = ({ setMembersDrawer }: DetailsHouseholdMembersPr
   const application = useContext(ApplicationContext)
 
   const householdMembersHeaders = {
-    name: t("t.name"),
-    relationship: t("t.relationship"),
-    birth: t("application.household.member.dateOfBirth"),
-    sameResidence: t("application.add.sameResidence"),
-    workInRegion: t("application.details.workInRegion"),
+    name: "t.name",
+    relationship: "t.relationship",
+    birth: "application.household.member.dateOfBirth",
+    sameResidence: "application.add.sameResidence",
+    workInRegion: "application.details.workInRegion",
     action: "",
   }
 
diff --git a/sites/partners/src/components/applications/PaperApplicationForm/sections/FormHouseholdMembers.tsx b/sites/partners/src/components/applications/PaperApplicationForm/sections/FormHouseholdMembers.tsx
index 38c00847d5..10535e5ddb 100644
--- a/sites/partners/src/components/applications/PaperApplicationForm/sections/FormHouseholdMembers.tsx
+++ b/sites/partners/src/components/applications/PaperApplicationForm/sections/FormHouseholdMembers.tsx
@@ -18,21 +18,23 @@ const FormHouseholdMembers = ({
   householdMembers,
   setHouseholdMembers,
 }: FormHouseholdMembersProps) => {
-  const [membersDrawer, setMembersDrawer] = useState<number | null>(null)
+  type MembersDrawer = HouseholdMember | null
+
+  const [membersDrawer, setMembersDrawer] = useState<MembersDrawer>(null)
   const [membersDeleteModal, setMembersDeleteModal] = useState<number | null>(null)
 
   const memberTableHeaders = {
-    name: t("t.name"),
-    relationship: t("t.relationship"),
-    dob: t("application.household.member.dateOfBirth"),
-    sameResidence: t("application.add.sameResidence"),
-    workInRegion: t("application.details.workInRegion"),
+    name: "t.name",
+    relationship: "t.relationship",
+    dob: "application.household.member.dateOfBirth",
+    sameResidence: "application.add.sameResidence",
+    workInRegion: "application.details.workInRegion",
     action: "",
   }
 
   const editMember = useCallback(
-    (orderId: number) => {
-      setMembersDrawer(orderId)
+    (member: HouseholdMember) => {
+      setMembersDrawer(member)
     },
     [setMembersDrawer]
   )
@@ -108,7 +110,7 @@ const FormHouseholdMembers = ({
               <Button
                 type="button"
                 className="font-semibold"
-                onClick={() => editMember(member.orderId)}
+                onClick={() => editMember(member)}
                 variant="text"
               >
                 {t("t.edit")}
@@ -142,7 +144,9 @@ const FormHouseholdMembers = ({
           type="button"
           variant="primary-outlined"
           size="sm"
-          onClick={() => setMembersDrawer(householdMembers.length + 1)}
+          onClick={() =>
+            setMembersDrawer({ orderId: householdMembers.length + 1 } as HouseholdMember)
+          }
           id={"addHouseholdMemberButton"}
         >
           {t("application.add.addHouseholdMember")}
@@ -159,7 +163,7 @@ const FormHouseholdMembers = ({
           onSubmit={(member) => saveMember(member)}
           onClose={() => setMembersDrawer(null)}
           members={householdMembers}
-          editedMemberId={membersDrawer}
+          editedMemberId={membersDrawer?.orderId}
         />
       </Drawer>
 
diff --git a/sites/public/cypress.config.ts b/sites/public/cypress.config.ts
index 2566bd324e..7b4919b15b 100644
--- a/sites/public/cypress.config.ts
+++ b/sites/public/cypress.config.ts
@@ -7,7 +7,7 @@ export default defineConfig({
   video: true,
   videoUploadOnPasses: false,
   numTestsKeptInMemory: 0,
-
+  viewportHeight: 1500,
   env: {
     codeCoverage: {
       url: "/api/__coverage__",
diff --git a/sites/public/cypress/e2e/pages/submit-application.spec.ts b/sites/public/cypress/e2e/pages/submit-application.spec.ts
index a1854fd53c..f24792bde1 100644
--- a/sites/public/cypress/e2e/pages/submit-application.spec.ts
+++ b/sites/public/cypress/e2e/pages/submit-application.spec.ts
@@ -2,9 +2,9 @@ import { ElmVillageApplication, minimalDataApplication } from "../../mockData/ap
 
 describe("Submit", function () {
   it("should submit an application for the Elm Village listing", function () {
-    cy.submitApplication("Elm Village", ElmVillageApplication, false)
+    cy.submitApplication("Elm Village", ElmVillageApplication, false, true)
   })
   it("should submit a minimal application for the Test: Default, No Preferences", function () {
-    cy.submitApplication("Blue Sky Apartments", minimalDataApplication, false)
+    cy.submitApplication("Blue Sky Apartments", minimalDataApplication, false, false)
   })
 })
diff --git a/sites/public/cypress/mockData/applicationData.ts b/sites/public/cypress/mockData/applicationData.ts
index 766f232c12..ac6deda635 100644
--- a/sites/public/cypress/mockData/applicationData.ts
+++ b/sites/public/cypress/mockData/applicationData.ts
@@ -3,6 +3,10 @@ import {
   ApplicationSubmissionTypeEnum,
   IncomePeriodEnum,
   LanguagesEnum,
+  Application,
+  YesNoEnum,
+  UnitTypeEnum,
+  ApplicationMultiselectQuestion,
 } from "@bloom-housing/shared-helpers/src/types/backend-swagger"
 
 const idDefaults = {
@@ -59,10 +63,10 @@ export const raceCheckboxesOrder = [
   "declineToRespond",
 ]
 
-export const ElmVillageApplication = {
+export const ElmVillageApplication: Application = {
   markedAsDuplicate: false,
   ...idDefaults,
-  listing: {
+  listings: {
     id: "abcd1234",
   },
   applicant: {
@@ -70,8 +74,8 @@ export const ElmVillageApplication = {
     phoneNumber: "(444) 444-4444",
     noPhone: false,
     phoneNumberType: "work",
-    workInRegion: "yes",
-    address: {
+    workInRegion: YesNoEnum.yes,
+    applicantAddress: {
       ...idDefaults,
       street: "600 Montgomery St",
       street2: "Unit",
@@ -82,7 +86,7 @@ export const ElmVillageApplication = {
       latitude: null,
       longitude: null,
     },
-    workAddress: {
+    applicantWorkAddress: {
       ...idDefaults,
       street: "Work Street",
       street2: "Work Unit",
@@ -111,7 +115,7 @@ export const ElmVillageApplication = {
   sendMailToMailingAddress: true,
   householdExpectingChanges: true,
   householdStudent: true,
-  mailingAddress: {
+  applicationsMailingAddress: {
     ...idDefaults,
     street: "Mailing Street",
     street2: "Mailing Unit",
@@ -119,7 +123,7 @@ export const ElmVillageApplication = {
     state: "AK",
     zipCode: "90220",
   },
-  alternateAddress: {
+  applicationsAlternateAddress: {
     ...idDefaults,
     street: "",
     street2: "",
@@ -136,7 +140,7 @@ export const ElmVillageApplication = {
     phoneNumber: "(333) 333-3333",
     otherType: "Other Relationship",
     emailAddress: "test2@bloom.com",
-    mailingAddress: {
+    address: {
       ...idDefaults,
       street: "Contact Street",
       street2: "Contact Street 2",
@@ -148,13 +152,13 @@ export const ElmVillageApplication = {
   accessibility: {
     ...idDefaults,
     mobility: true,
-    vision: false,
-    hearing: false,
+    vision: true,
+    hearing: true,
   },
-  incomeVouchers: false,
+  incomeVouchers: true,
   income: "3000.00",
   incomePeriod: IncomePeriodEnum.perMonth,
-  householdMembers: [
+  householdMember: [
     {
       ...idDefaults,
       firstName: "Member Name",
@@ -163,12 +167,7 @@ export const ElmVillageApplication = {
       birthMonth: "07",
       birthDay: "17",
       birthYear: "1996",
-      emailAddress: "",
-      noEmail: null,
-      phoneNumber: "",
-      phoneNumberType: "",
-      noPhone: null,
-      address: {
+      householdMemberAddress: {
         ...idDefaults,
         street: "Member Street",
         street2: "Member Unit",
@@ -176,7 +175,7 @@ export const ElmVillageApplication = {
         state: "AZ",
         zipCode: "90223",
       },
-      workAddress: {
+      householdMemberWorkAddress: {
         ...idDefaults,
         street: "Member Work Street",
         street2: "Member Work Unit",
@@ -184,18 +183,48 @@ export const ElmVillageApplication = {
         state: "AR",
         zipCode: "90224",
       },
-      sameAddress: "no",
+      sameAddress: YesNoEnum.no,
       relationship: "spouse",
-      workInRegion: "yes",
+      workInRegion: YesNoEnum.yes,
     },
   ],
-  preferredUnit: [
+  preferredUnitTypes: [
+    {
+      ...idDefaults,
+      id: "dff3ff70-7085-4dab-afd9-de4b33e0ec1e",
+      name: "SRO" as UnitTypeEnum,
+      numBedrooms: 0,
+    },
+    {
+      ...idDefaults,
+      id: "dff3ff70-7085-4dab-afd9-de4b33e0ec1e",
+      name: "Studio" as UnitTypeEnum,
+      numBedrooms: 0,
+    },
     {
       ...idDefaults,
       id: "dff3ff70-7085-4dab-afd9-de4b33e0ec1e",
-      name: "1 Bedroom",
+      name: "1 Bedroom" as UnitTypeEnum,
       numBedrooms: 1,
     },
+    {
+      ...idDefaults,
+      id: "dff3ff70-7085-4dab-afd9-de4b33e0ec1e",
+      name: "2 Bedroom" as UnitTypeEnum,
+      numBedrooms: 2,
+    },
+    {
+      ...idDefaults,
+      id: "dff3ff70-7085-4dab-afd9-de4b33e0ec1e",
+      name: "3 Bedroom" as UnitTypeEnum,
+      numBedrooms: 3,
+    },
+    {
+      ...idDefaults,
+      id: "dff3ff70-7085-4dab-afd9-de4b33e0ec1e",
+      name: "4 Bedroom" as UnitTypeEnum,
+      numBedrooms: 3,
+    },
   ],
   demographics: {
     ...idDefaults,
@@ -207,7 +236,7 @@ export const ElmVillageApplication = {
   },
   preferences: [
     {
-      key: "liveWork",
+      key: "Work in the city",
       claimed: true,
       options: [
         {
@@ -217,11 +246,11 @@ export const ElmVillageApplication = {
           address: {
             street: "1600 pennsylvania ave",
             city: "Washington",
-            state: "District Of Columbia",
-            zipCode: "20005",
+            state: "DC",
+            zipCode: "20500",
           },
           addressHolder: {
-            name: "first last",
+            name: "First Last",
             relationship: "Friend",
           },
         },
@@ -232,15 +261,15 @@ export const ElmVillageApplication = {
           address: {
             street: "1600 pennsylvania ave",
             city: "Washington",
-            state: "District Of Columbia",
-            zipCode: "20005",
+            state: "DC",
+            zipCode: "20500",
           },
         },
       ],
     },
     {
       key: "cityEmployee",
-      claimed: true,
+      claimed: false,
       options: [
         {
           key: "cityEmployee",
@@ -249,11 +278,11 @@ export const ElmVillageApplication = {
         },
       ],
     },
-  ],
+  ] as ApplicationMultiselectQuestion[],
   programs: [
     {
       claimed: true,
-      key: "servedInMilitary",
+      key: "Veteran",
       options: [
         {
           key: "servedInMilitary",
@@ -269,35 +298,17 @@ export const ElmVillageApplication = {
         },
       ],
     },
-    {
-      key: "tay",
-      claimed: true,
-      options: [
-        {
-          key: "tay",
-          checked: true,
-        },
-        {
-          key: "doNotConsider",
-          checked: false,
-        },
-        {
-          key: "preferNotToSay",
-          checked: false,
-        },
-      ],
-    },
-  ],
+  ] as ApplicationMultiselectQuestion[],
   confirmationCode: "",
   status: ApplicationStatusEnum.draft,
   submissionType: ApplicationSubmissionTypeEnum.electronical,
   language: LanguagesEnum.en,
 }
 
-export const minimalDataApplication = {
+export const minimalDataApplication: Application = {
   markedAsDuplicate: false,
   ...idDefaults,
-  listing: {
+  listings: {
     id: "abcd1234",
   },
   applicant: {
@@ -305,8 +316,8 @@ export const minimalDataApplication = {
     phoneNumber: null,
     noPhone: true,
     phoneNumberType: null,
-    workInRegion: "no",
-    address: {
+    workInRegion: YesNoEnum.no,
+    applicantAddress: {
       ...idDefaults,
       street: "600 Montgomery St",
       street2: "Unit",
@@ -315,7 +326,7 @@ export const minimalDataApplication = {
       zipCode: "94111",
       county: "",
     },
-    workAddress: {
+    applicantWorkAddress: {
       ...idDefaults,
       street: "",
       street2: "",
@@ -341,7 +352,7 @@ export const minimalDataApplication = {
   sendMailToMailingAddress: false,
   householdExpectingChanges: false,
   householdStudent: false,
-  mailingAddress: {
+  applicationsMailingAddress: {
     ...idDefaults,
     street: "",
     street2: "",
@@ -349,7 +360,7 @@ export const minimalDataApplication = {
     state: "",
     zipCode: "",
   },
-  alternateAddress: {
+  applicationsAlternateAddress: {
     ...idDefaults,
     street: "",
     street2: "",
@@ -366,7 +377,7 @@ export const minimalDataApplication = {
     phoneNumber: "",
     otherType: "",
     emailAddress: "",
-    mailingAddress: {
+    address: {
       ...idDefaults,
       street: "",
       street2: "",
@@ -384,12 +395,12 @@ export const minimalDataApplication = {
   incomeVouchers: false,
   income: "50000",
   incomePeriod: IncomePeriodEnum.perYear,
-  householdMembers: [],
-  preferredUnit: [
+  householdMember: [],
+  preferredUnitTypes: [
     {
       ...idDefaults,
       id: "dff3ff70-7085-4dab-afd9-de4b33e0ec1e",
-      name: "2 Bedroom",
+      name: "2 Bedroom" as UnitTypeEnum,
       numBedrooms: 2,
     },
   ],
@@ -490,7 +501,7 @@ export const minimalDataApplication = {
         },
       ],
     },
-  ],
+  ] as ApplicationMultiselectQuestion[],
   confirmationCode: "",
   status: ApplicationStatusEnum.draft,
   submissionType: ApplicationSubmissionTypeEnum.electronical,
diff --git a/sites/public/cypress/support/commands.js b/sites/public/cypress/support/commands.js
index 2f1be24f1b..ad2f353a30 100644
--- a/sites/public/cypress/support/commands.js
+++ b/sites/public/cypress/support/commands.js
@@ -114,19 +114,29 @@ Cypress.Commands.add("step2PrimaryApplicantAddresses", (application) => {
     )
   }
 
-  cy.getByTestId("app-primary-address-street").type(application.applicant.address.street)
-  cy.getByTestId("app-primary-address-street2").type(application.applicant.address.street2)
-  cy.getByTestId("app-primary-address-city").type(application.applicant.address.city)
-  cy.getByTestId("app-primary-address-state").select(application.applicant.address.state)
-  cy.getByTestId("app-primary-address-zip").type(application.applicant.address.zipCode)
+  cy.getByTestId("app-primary-address-street").type(application.applicant.applicantAddress.street)
+  cy.getByTestId("app-primary-address-street2").type(application.applicant.applicantAddress.street2)
+  cy.getByTestId("app-primary-address-city").type(application.applicant.applicantAddress.city)
+  cy.getByTestId("app-primary-address-state").select(application.applicant.applicantAddress.state)
+  cy.getByTestId("app-primary-address-zip").type(application.applicant.applicantAddress.zipCode)
 
   if (application.sendMailToMailingAddress) {
     cy.getByTestId("app-primary-send-to-mailing").check()
-    cy.getByTestId("app-primary-mailing-address-street").type(application.mailingAddress.street2)
-    cy.getByTestId("app-primary-mailing-address-street2").type(application.mailingAddress.street2)
-    cy.getByTestId("app-primary-mailing-address-city").type(application.mailingAddress.city)
-    cy.getByTestId("app-primary-mailing-address-state").select(application.mailingAddress.state)
-    cy.getByTestId("app-primary-mailing-address-zip").type(application.mailingAddress.zipCode)
+    cy.getByTestId("app-primary-mailing-address-street").type(
+      application.applicationsMailingAddress.street
+    )
+    cy.getByTestId("app-primary-mailing-address-street2").type(
+      application.applicationsMailingAddress.street2
+    )
+    cy.getByTestId("app-primary-mailing-address-city").type(
+      application.applicationsMailingAddress.city
+    )
+    cy.getByTestId("app-primary-mailing-address-state").select(
+      application.applicationsMailingAddress.state
+    )
+    cy.getByTestId("app-primary-mailing-address-zip").type(
+      application.applicationsMailingAddress.zipCode
+    )
   }
 
   application.contactPreferences.forEach((contactPreference) => {
@@ -136,13 +146,21 @@ Cypress.Commands.add("step2PrimaryApplicantAddresses", (application) => {
 
   if (application.applicant.workInRegion === "yes") {
     cy.getByTestId("app-primary-work-in-region-yes").check()
-    cy.getByTestId("app-primary-work-address-street").type(application.applicant.workAddress.street)
+    cy.getByTestId("app-primary-work-address-street").type(
+      application.applicant.applicantWorkAddress.street
+    )
     cy.getByTestId("app-primary-work-address-street2").type(
-      application.applicant.workAddress.street2
+      application.applicant.applicantWorkAddress.street2
+    )
+    cy.getByTestId("app-primary-work-address-city").type(
+      application.applicant.applicantWorkAddress.city
+    )
+    cy.getByTestId("app-primary-work-address-state").select(
+      application.applicant.applicantWorkAddress.state
+    )
+    cy.getByTestId("app-primary-work-address-zip").type(
+      application.applicant.applicantWorkAddress.zipCode
     )
-    cy.getByTestId("app-primary-work-address-city").type(application.applicant.workAddress.city)
-    cy.getByTestId("app-primary-work-address-state").select(application.applicant.workAddress.state)
-    cy.getByTestId("app-primary-work-address-zip").type(application.applicant.workAddress.zipCode)
   } else {
     cy.getByTestId("app-primary-work-in-region-no").check()
   }
@@ -186,16 +204,19 @@ Cypress.Commands.add("step5AlternateContactInfo", (application) => {
   )
   cy.getByTestId("app-alternate-email").type(application.alternateContact.emailAddress)
   cy.getByTestId("app-alternate-mailing-address-street").type(
-    application.alternateContact.mailingAddress.street
+    application.alternateContact.address.street
+  )
+  cy.getByTestId("app-alternate-mailing-address-street2").type(
+    application.alternateContact.address.street2
   )
   cy.getByTestId("app-alternate-mailing-address-city").type(
-    application.alternateContact.mailingAddress.city
+    application.alternateContact.address.city
   )
   cy.getByTestId("app-alternate-mailing-address-state").select(
-    application.alternateContact.mailingAddress.state
+    application.alternateContact.address.state
   )
   cy.getByTestId("app-alternate-mailing-address-zip").type(
-    application.alternateContact.mailingAddress.zipCode
+    application.alternateContact.address.zipCode
   )
 
   cy.goNext()
@@ -205,7 +226,7 @@ Cypress.Commands.add("step5AlternateContactInfo", (application) => {
 })
 
 Cypress.Commands.add("step6HouseholdSize", (application) => {
-  if (application.householdMembers.length > 0) {
+  if (application.householdMember.length > 0) {
     cy.getByID("householdSizeLiveWithOthers").click()
     cy.goNext()
     cy.checkErrorAlert("not.exist")
@@ -226,7 +247,7 @@ Cypress.Commands.add("step7AddHouseholdMembers", (application) => {
   cy.checkErrorMessages("not.exist")
   cy.location("pathname").should("include", "applications/household/add-members")
 
-  application.householdMembers.forEach((householdMember) => {
+  application.householdMember.forEach((householdMember) => {
     cy.getByID("app-add-household-member-button").click()
     cy.checkErrorAlert("not.exist")
     cy.checkErrorMessages("not.exist")
@@ -241,11 +262,21 @@ Cypress.Commands.add("step7AddHouseholdMembers", (application) => {
 
     if (householdMember.sameAddress === "no") {
       cy.getByTestId("app-household-member-same-address").eq(1).check()
-      cy.getByTestId("app-household-member-address-street").type(householdMember.address.street)
-      cy.getByTestId("app-household-member-address-street2").type(householdMember.address.street2)
-      cy.getByTestId("app-household-member-address-city").type(householdMember.address.city)
-      cy.getByTestId("app-household-member-address-state").select(householdMember.address.state)
-      cy.getByTestId("app-household-member-address-zip").type(householdMember.address.zipCode)
+      cy.getByTestId("app-household-member-address-street").type(
+        householdMember.householdMemberAddress.street
+      )
+      cy.getByTestId("app-household-member-address-street2").type(
+        householdMember.householdMemberAddress.street2
+      )
+      cy.getByTestId("app-household-member-address-city").type(
+        householdMember.householdMemberAddress.city
+      )
+      cy.getByTestId("app-household-member-address-state").select(
+        householdMember.householdMemberAddress.state
+      )
+      cy.getByTestId("app-household-member-address-zip").type(
+        householdMember.householdMemberAddress.zipCode
+      )
     } else {
       cy.getByTestId("app-household-member-same-address").eq(0).check()
     }
@@ -253,19 +284,19 @@ Cypress.Commands.add("step7AddHouseholdMembers", (application) => {
     if (householdMember.workInRegion === "yes") {
       cy.getByTestId("app-household-member-work-in-region").eq(0).check()
       cy.getByTestId("app-household-member-work-address-street").type(
-        householdMember.workAddress.street
+        householdMember.householdMemberWorkAddress.street
       )
       cy.getByTestId("app-household-member-work-address-street2").type(
-        householdMember.workAddress.street2
+        householdMember.householdMemberWorkAddress.street2
       )
       cy.getByTestId("app-household-member-work-address-city").type(
-        householdMember.workAddress.city
+        householdMember.householdMemberWorkAddress.city
       )
       cy.getByTestId("app-household-member-work-address-state").select(
-        householdMember.workAddress.state
+        householdMember.householdMemberWorkAddress.state
       )
       cy.getByTestId("app-household-member-work-address-zip").type(
-        householdMember.workAddress.zipCode
+        householdMember.householdMemberWorkAddress.zipCode
       )
     } else {
       cy.getByTestId("app-household-member-work-in-region").eq(1).check()
@@ -282,8 +313,8 @@ Cypress.Commands.add("step7AddHouseholdMembers", (application) => {
 })
 
 Cypress.Commands.add("step8PreferredUnits", (application) => {
-  application.preferredUnit.forEach((_, index) => {
-    cy.getByTestId("app-preferred-units").eq(index).check()
+  application.preferredUnitTypes.forEach((prefUnit) => {
+    cy.getByTestId(prefUnit.name).check()
   })
   cy.goNext()
   cy.checkErrorAlert("not.exist")
@@ -377,7 +408,7 @@ Cypress.Commands.add("step13IncomeVouchers", (application) => {
 })
 
 Cypress.Commands.add("step14Income", (application) => {
-  cy.getByTestId("app-income").type(application.income)
+  cy.getByTestId("app-income").type(application.income, { force: true })
   if (application.incomePeriod === "perMonth") {
     cy.getByTestId("app-income-period").eq(0).check()
   } else {
@@ -455,8 +486,180 @@ Cypress.Commands.add("step17Demographics", (application) => {
   cy.isNextRouteValid("demographics")
 })
 
-Cypress.Commands.add("step18Summary", () => {
-  // TODO check values
+Cypress.Commands.add("step18Summary", (application, verify) => {
+  const fields = [
+    {
+      id: "app-summary-applicant-name",
+      fieldValue: `${application.applicant.firstName}${
+        application.applicant.middleName ? ` ${application.applicant.middleName}` : ``
+      } ${application.applicant.lastName}`,
+    },
+    {
+      id: "app-summary-applicant-dob",
+      fieldValue: `${application.applicant.birthMonth}/${application.applicant.birthDay}/${application.applicant.birthYear}`,
+    },
+    { id: "app-summary-applicant-phone", fieldValue: application.applicant.phoneNumber },
+    {
+      id: "app-summary-applicant-email",
+      fieldValue: application.applicant.emailAddress,
+    },
+    {
+      id: "app-summary-applicant-address",
+      fieldValue: application.applicant.applicantAddress.street,
+    },
+    {
+      id: "app-summary-applicant-address",
+      fieldValue: application.applicant.applicantAddress.street2,
+    },
+    {
+      id: "app-summary-applicant-address",
+      fieldValue: `${application.applicant.applicantAddress.city}, ${application.applicant.applicantAddress.state} ${application.applicant.applicantAddress.zipCode}`,
+    },
+    {
+      id: "app-summary-applicant-work-address",
+      fieldValue: application.applicant.applicantWorkAddress.street,
+    },
+    {
+      id: "app-summary-applicant-work-address",
+      fieldValue: application.applicant.applicantWorkAddress.street2,
+    },
+    {
+      id: "app-summary-applicant-work-address",
+      fieldValue: `${application.applicant.applicantWorkAddress.city}, ${application.applicant.applicantWorkAddress.state} ${application.applicant.applicantWorkAddress.zipCode}`,
+    },
+    {
+      id: "app-summary-contact-preference-type",
+      fieldValue: application.contactPreferences[0],
+    },
+    {
+      id: "app-summary-preferred-units",
+      fieldValue: application.preferredUnitTypes
+        .reduce((acc, item) => {
+          acc.push(item.name)
+          return acc
+        }, [])
+        .join(", "),
+    },
+    {
+      id: "app-summary-household-changes",
+      fieldValue: application.householdExpectingChanges ? "Yes" : "No",
+    },
+    {
+      id: "app-summary-household-student",
+      fieldValue: application.householdStudent ? "Yes" : "No",
+    },
+    {
+      id: "app-summary-income-vouchers",
+      fieldValue: application.incomeVouchers ? "Yes" : "No",
+    },
+    {
+      id: "app-summary-income",
+      fieldValue: parseFloat(application.income).toLocaleString("en-US", {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      }),
+    },
+    {
+      id: "app-summary-income",
+      fieldValue: application.incomePeriod === "perMonth" ? "per month" : "per year",
+    },
+  ]
+
+  if (application.accessibility.mobility) {
+    const val = "For Mobility Impairments"
+    fields.push({ id: val, fieldValue: val })
+  }
+  if (application.accessibility.vision) {
+    const val = "For Vision Impairments"
+    fields.push({ id: val, fieldValue: val })
+  }
+  if (application.accessibility.hearing) {
+    const val = "For Hearing Impairments"
+    fields.push({ id: val, fieldValue: val })
+  }
+
+  if (application.alternateContact.type !== "dontHave") {
+    fields.push({
+      id: "app-summary-alternate-name",
+      fieldValue: `${application.alternateContact.firstName} ${application.alternateContact.lastName}`,
+    })
+    fields.push({
+      id: "app-summary-alternate-email",
+      fieldValue: application.alternateContact.emailAddress,
+    })
+    fields.push({
+      id: "app-summary-alternate-phone",
+      fieldValue: application.alternateContact.phoneNumber,
+    })
+    fields.push({
+      id: "app-summary-alternate-mailing-address",
+      fieldValue: application.alternateContact.address.street,
+    })
+    fields.push({
+      id: "app-summary-alternate-mailing-address",
+      fieldValue: application.alternateContact.address.street2,
+    })
+    fields.push({
+      id: "app-summary-alternate-mailing-address",
+      fieldValue: `${application.alternateContact.address.city}, ${application.alternateContact.address.state} ${application.alternateContact.address.zipCode}`,
+    })
+  }
+
+  application.householdMember.forEach((member) => {
+    fields.push({
+      id: "app-summary-household-member-name",
+      fieldValue: `${member.firstName} ${member.lastName}`,
+    })
+    fields.push({
+      id: "app-summary-household-member-dob",
+      fieldValue: `${member.birthMonth}/${member.birthDay}/${member.birthYear}`,
+    })
+    fields.push({
+      id: "app-summary-household-member-address",
+      fieldValue: `${member.householdMemberAddress.street} ${member.householdMemberAddress.street2} ${member.householdMemberAddress.city}, ${member.householdMemberAddress.state} ${member.householdMemberAddress.zipCode}`,
+    })
+  })
+
+  const pushMultiselect = (section) => {
+    application[section]
+      .filter((item) => item.claimed)
+      .forEach((claimedPref) => {
+        fields.push({ id: claimedPref.key, fieldValue: claimedPref.key })
+        claimedPref.options
+          .filter((opt) => opt.checked)
+          .forEach((optionClaimed) => {
+            if (optionClaimed.address) {
+              fields.push({
+                id: claimedPref.key,
+                fieldValue: optionClaimed.address.street,
+              })
+              fields.push({
+                id: claimedPref.key,
+                fieldValue: `${optionClaimed.address.city}, ${optionClaimed.address.state} ${optionClaimed.address.zipCode}`,
+              })
+            }
+            if (optionClaimed.addressHolder) {
+              fields.push({
+                id: claimedPref.key,
+                fieldValue: optionClaimed.addressHolder.name,
+              })
+              fields.push({
+                id: claimedPref.key,
+                fieldValue: optionClaimed.addressHolder.relationship,
+              })
+            }
+          })
+      })
+  }
+  pushMultiselect("preferences")
+  pushMultiselect("programs")
+
+  if (verify) {
+    fields.forEach(({ id, fieldValue }) => {
+      cy.getByTestId(id).contains(fieldValue, { matchCase: false }).should("be.visible")
+    })
+  }
+
   cy.getByID("app-summary-confirm").click()
   cy.isNextRouteValid("summary")
 })
@@ -470,7 +673,7 @@ Cypress.Commands.add("step19TermsAndSubmit", () => {
   cy.getByTestId("app-confirmation-id").should("be.visible").and("not.be.empty")
 })
 
-Cypress.Commands.add("submitApplication", (listingName, application, signedIn) => {
+Cypress.Commands.add("submitApplication", (listingName, application, signedIn, verify) => {
   if (signedIn) {
     cy.beginApplicationSignedIn(listingName)
   } else {
@@ -484,7 +687,7 @@ Cypress.Commands.add("submitApplication", (listingName, application, signedIn) =
     cy.step5AlternateContactInfo(application)
   }
   cy.step6HouseholdSize(application)
-  if (application.householdMembers.length > 0) {
+  if (application.householdMember.length > 0) {
     cy.step7AddHouseholdMembers(application)
   }
   cy.step8PreferredUnits(application)
@@ -520,8 +723,7 @@ Cypress.Commands.add("submitApplication", (listingName, application, signedIn) =
     }
 
     cy.step17Demographics(application)
-    cy.step18Summary(application)
-    // TODO: Check values on summary
+    cy.step18Summary(application, verify)
     cy.step19TermsAndSubmit(application)
   })
 })
diff --git a/sites/public/cypress/support/index.d.ts b/sites/public/cypress/support/index.d.ts
index a4eff58a9d..8eeaaf44c0 100644
--- a/sites/public/cypress/support/index.d.ts
+++ b/sites/public/cypress/support/index.d.ts
@@ -34,6 +34,11 @@ declare namespace Cypress {
     step17Demographics(application: Application): Chainable
     step18Summary(application: Application): Chainable
     step19TermsAndSubmit(application: Application): Chainable
-    submitApplication(listingName: string, application: Application, signedIn: boolean)
+    submitApplication(
+      listingName: string,
+      application: Application,
+      signedIn: boolean,
+      verify?: boolean
+    )
   }
 }
diff --git a/sites/public/src/components/applications/ValidateAddress.tsx b/sites/public/src/components/applications/ValidateAddress.tsx
index 4d87b17061..0658d17c9b 100644
--- a/sites/public/src/components/applications/ValidateAddress.tsx
+++ b/sites/public/src/components/applications/ValidateAddress.tsx
@@ -72,6 +72,7 @@ export const AddressValidationSelection = (props: AddressValidationSelectionProp
     setVerifyAddress,
     setVerifyAddressStep,
   } = props
+
   return (
     <>
       {foundAddress.newAddress && (
diff --git a/sites/public/src/components/shared/FormSummaryDetails.tsx b/sites/public/src/components/shared/FormSummaryDetails.tsx
index 0733469bcd..30174b49c5 100644
--- a/sites/public/src/components/shared/FormSummaryDetails.tsx
+++ b/sites/public/src/components/shared/FormSummaryDetails.tsx
@@ -9,6 +9,7 @@ import {
 import {
   Address,
   AllExtraDataTypes,
+  Application,
   ApplicationMultiselectQuestion,
   ApplicationMultiselectQuestionOption,
   InputType,
@@ -18,8 +19,7 @@ import {
 import styles from "./FormSummaryDetails.module.scss"
 
 type FormSummaryDetailsProps = {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  application: any
+  application: Application
   listing: Listing
   editMode?: boolean
   hidePreferences?: boolean
@@ -161,10 +161,10 @@ const FormSummaryDetails = ({
                         label={question.key}
                         helpText={multiselectQuestionHelpText(option?.extraData)}
                         key={index}
-                        testId={"app-summary-preference"}
+                        testId={question.key}
                         className={"pb-6 whitespace-pre-wrap"}
                       >
-                        {getOptionText(question, option)}
+                        <div data-testid={option.key}>{getOptionText(question, option)}</div>
                       </FieldValue>
                     ))
                 )}
@@ -177,8 +177,10 @@ const FormSummaryDetails = ({
 
   const allListingUnitTypes = getUniqueUnitTypes(listing?.units)
 
-  const preferredUnits = application.preferredUnit?.map((unit) => {
-    const unitDetails = allListingUnitTypes?.find((unitType) => unitType.id === unit.id)
+  const preferredUnits = application.preferredUnitTypes?.map((unit) => {
+    const unitDetails = allListingUnitTypes?.find(
+      (unitType) => unitType.name === unit.name || unit.id === unitType.id
+    )
     return unitDetails?.name || unit.name
   })
 
@@ -193,16 +195,17 @@ const FormSummaryDetails = ({
 
       <Card.Section className={styles["summary-section"]}>
         <FieldValue
-          testId={"app-summary-name"}
+          testId={"app-summary-applicant-name"}
           id="applicantName"
           label={t("t.name")}
           className={styles["summary-value"]}
         >
-          {application.applicant.firstName} {application.applicant.middleName}{" "}
-          {application.applicant.lastName}
+          {`${application.applicant.firstName}${
+            application.applicant.middleName ? ` ${application.applicant.middleName}` : ``
+          } ${application.applicant.lastName}`}
         </FieldValue>
         <FieldValue
-          testId={"app-summary-dob"}
+          testId={"app-summary-applicant-dob"}
           id="applicantbirthDay"
           label={t("application.household.member.dateOfBirth")}
           className={styles["summary-value"]}
@@ -212,7 +215,7 @@ const FormSummaryDetails = ({
         </FieldValue>
         {application.applicant.phoneNumber && (
           <FieldValue
-            testId={"app-summary-phone"}
+            testId={"app-summary-applicant-phone"}
             id="applicantPhone"
             label={t("t.phone")}
             helpText={t(
@@ -225,7 +228,7 @@ const FormSummaryDetails = ({
         )}
         {application.additionalPhoneNumber && (
           <FieldValue
-            testId={"app-summary-additional-phone"}
+            testId={"app-summary-applicant-additional-phone"}
             id="applicantAdditionalPhone"
             label={t("t.additionalPhone")}
             helpText={t(
@@ -238,7 +241,7 @@ const FormSummaryDetails = ({
         )}
         {application.applicant.emailAddress && (
           <FieldValue
-            testId={"app-summary-email"}
+            testId={"app-summary-applicant-email"}
             id="applicantEmail"
             label={t("t.email")}
             className={styles["summary-value"]}
@@ -247,42 +250,38 @@ const FormSummaryDetails = ({
           </FieldValue>
         )}
         <FieldValue
+          testId={"app-summary-applicant-address"}
           id="applicantAddress"
           label={t("application.contact.address")}
           className={styles["summary-value"]}
         >
-          <MultiLineAddress
-            data-testid={"app-summary-address"}
-            address={reformatAddress(application.applicant.applicantAddress)}
-          />
+          <MultiLineAddress address={reformatAddress(application.applicant.applicantAddress)} />
         </FieldValue>
         {application.sendMailToMailingAddress && (
           <FieldValue
+            testId={"app-summary-applicant-mailing-address"}
             id="applicantMailingAddress"
             label={t("application.contact.mailingAddress")}
             className={styles["summary-value"]}
           >
-            <MultiLineAddress
-              data-testid={"app-summary-mailing-address"}
-              address={reformatAddress(application.applicationsMailingAddress)}
-            />
+            <MultiLineAddress address={reformatAddress(application.applicationsMailingAddress)} />
           </FieldValue>
         )}
         {application.applicant.workInRegion === "yes" && (
           <FieldValue
+            testId={"app-summary-applicant-work-address"}
             id="applicantWorkAddress"
             label={t("application.contact.workAddress")}
             className={styles["summary-value"]}
           >
             <MultiLineAddress
-              data-testid={"app-summary-work-address"}
               address={reformatAddress(application.applicant.applicantWorkAddress)}
             />
           </FieldValue>
         )}
         {application.contactPreferences && (
           <FieldValue
-            testId={"app-summary-contact-type"}
+            testId={"app-summary-contact-preference-type"}
             id="applicantPreferredContactType"
             label={t("application.contact.preferredContactType")}
             className={styles["summary-value"]}
@@ -387,12 +386,14 @@ const FormSummaryDetails = ({
                 >
                   {member.birthMonth}/{member.birthDay}/{member.birthYear}
                 </FieldValue>
+
                 {member.sameAddress === "no" && (
-                  <FieldValue label={t("application.contact.address")} className={"pb-4"}>
-                    <MultiLineAddress
-                      data-testid={"app-summary-household-member-address"}
-                      address={reformatAddress(member.householdMemberAddress)}
-                    />
+                  <FieldValue
+                    label={t("application.contact.address")}
+                    className={"pb-4"}
+                    testId={"app-summary-household-member-address"}
+                  >
+                    <MultiLineAddress address={reformatAddress(member.householdMemberAddress)} />
                   </FieldValue>
                 )}
                 {member.sameAddress !== "no" && (
@@ -439,13 +440,14 @@ const FormSummaryDetails = ({
             className={styles["summary-value"]}
           >
             {accessibilityLabels(application.accessibility).map((item) => (
-              <Fragment key={item}>
+              <div key={item} data-testid={item}>
                 {item}
                 <br />
-              </Fragment>
+              </div>
             ))}
           </FieldValue>
           <FieldValue
+            testId={"app-summary-household-changes"}
             id="householdChanges"
             label={t("application.household.expectingChanges.title")}
             className={styles["summary-value"]}
@@ -453,6 +455,7 @@ const FormSummaryDetails = ({
             {application.householdExpectingChanges ? t("t.yes") : t("t.no")}
           </FieldValue>
           <FieldValue
+            testId={"app-summary-household-student"}
             id="householdStudent"
             label={t("application.household.householdStudent.title")}
             className={styles["summary-value"]}
diff --git a/sites/public/src/pages/applications/contact/address.tsx b/sites/public/src/pages/applications/contact/address.tsx
index f405a85243..57fd262b18 100644
--- a/sites/public/src/pages/applications/contact/address.tsx
+++ b/sites/public/src/pages/applications/contact/address.tsx
@@ -53,7 +53,7 @@ const ApplicationAddress = () => {
       "applicant.phoneNumberType": application.applicant.phoneNumberType,
       sendMailToMailingAddress: application.sendMailToMailingAddress,
       "applicant.workInRegion": application.applicant.workInRegion,
-      "applicant.address.state": application.applicant.applicantAddress.state,
+      "applicant.applicantAddress.state": application.applicant.applicantAddress.state,
     },
     shouldFocusError: false,
   })
@@ -64,7 +64,7 @@ const ApplicationAddress = () => {
     if (!verifyAddress) {
       setFoundAddress({})
       setVerifyAddress(true)
-      findValidatedAddress(data.applicant.address, setFoundAddress, setNewAddressSelected)
+      findValidatedAddress(data.applicant.applicantAddress, setFoundAddress, setNewAddressSelected)
 
       return // Skip rest of the submit process
     }
@@ -72,6 +72,7 @@ const ApplicationAddress = () => {
     mergeDeep(application, data)
     if (newAddressSelected && foundAddress.newAddress) {
       application.applicant.applicantAddress.street = foundAddress.newAddress.street
+      application.applicant.applicantAddress.street2 = foundAddress.newAddress.street2
       application.applicant.applicantAddress.city = foundAddress.newAddress.city
       application.applicant.applicantAddress.zipCode = foundAddress.newAddress.zipCode
       application.applicant.applicantAddress.state = foundAddress.newAddress.state
@@ -295,7 +296,7 @@ const ApplicationAddress = () => {
 
                 <Field
                   id="addressStreet"
-                  name="applicant.address.street"
+                  name="applicant.applicantAddress.street"
                   label={t("application.contact.streetAddress")}
                   defaultValue={application.applicant.applicantAddress.street}
                   validation={{ required: true, maxLength: 64 }}
@@ -304,19 +305,19 @@ const ApplicationAddress = () => {
                       ? t("errors.maxLength")
                       : t("errors.streetError")
                   }
-                  error={errors.applicant?.address?.street}
+                  error={errors.applicant?.applicantAddress?.street}
                   register={register}
                   dataTestId={"app-primary-address-street"}
                 />
 
                 <Field
                   id="addressStreet2"
-                  name="applicant.address.street2"
+                  name="applicant.applicantAddress.street2"
                   label={t("application.contact.apt")}
                   defaultValue={application.applicant.applicantAddress.street2}
                   register={register}
                   dataTestId={"app-primary-address-street2"}
-                  error={errors.applicant?.address?.street2}
+                  error={errors.applicant?.applicantAddress?.street2}
                   validation={{ maxLength: 64 }}
                   errorMessage={t("errors.maxLength")}
                 />
@@ -324,7 +325,7 @@ const ApplicationAddress = () => {
                 <div className="flex max-w-2xl">
                   <Field
                     id="addressCity"
-                    name="applicant.address.city"
+                    name="applicant.applicantAddress.city"
                     label={t("application.contact.cityName")}
                     defaultValue={application.applicant.applicantAddress.city}
                     validation={{ required: true, maxLength: 64 }}
@@ -333,19 +334,19 @@ const ApplicationAddress = () => {
                         ? t("errors.maxLength")
                         : t("errors.cityError")
                     }
-                    error={errors.applicant?.address?.city}
+                    error={errors.applicant?.applicantAddress?.city}
                     register={register}
                     dataTestId={"app-primary-address-city"}
                   />
 
                   <Select
                     id="addressState"
-                    name="applicant.address.state"
+                    name="applicant.applicantAddress.state"
                     label={t("application.contact.state")}
                     validation={{ required: true, maxLength: 64 }}
                     error={errors.applicant?.address?.state}
                     errorMessage={
-                      errors.applicant?.address?.state?.type === "maxLength"
+                      errors.applicant?.applicantAddress?.state?.type === "maxLength"
                         ? t("errors.maxLength")
                         : t("errors.stateError")
                     }
@@ -358,12 +359,12 @@ const ApplicationAddress = () => {
                 </div>
                 <Field
                   id="addressZipCode"
-                  name="applicant.address.zipCode"
+                  name="applicant.applicantAddress.zipCode"
                   label={t("application.contact.zip")}
                   defaultValue={application.applicant.applicantAddress.zipCode}
                   validation={{ required: true, maxLength: 64 }}
                   errorMessage={
-                    errors.applicant?.address?.zipCode?.type === "maxLength"
+                    errors.applicant?.applicantAddress?.zipCode?.type === "maxLength"
                       ? t("errors.maxLength")
                       : t("errors.zipCodeError")
                   }
diff --git a/sites/public/src/pages/applications/household/member.tsx b/sites/public/src/pages/applications/household/member.tsx
index c743cf199f..32b1a3662e 100644
--- a/sites/public/src/pages/applications/household/member.tsx
+++ b/sites/public/src/pages/applications/household/member.tsx
@@ -32,6 +32,10 @@ import ApplicationFormLayout from "../../../layouts/application-form"
 import styles from "../../../layouts/application-form.module.scss"
 
 export class Member implements HouseholdMemberUpdate {
+  constructor(orderId: number) {
+    this.orderId = orderId
+  }
+
   id: string
   orderId = undefined as number | undefined
   firstName = ""
@@ -45,10 +49,6 @@ export class Member implements HouseholdMemberUpdate {
   phoneNumber = ""
   phoneNumberType = ""
   noPhone = undefined
-
-  constructor(orderId: number) {
-    this.orderId = orderId
-  }
   householdMemberAddress = {
     placeName: undefined,
     city: "",
@@ -284,8 +284,8 @@ const ApplicationMember = () => {
                 <legend className="text__caps-spaced">{t("application.contact.address")}</legend>
 
                 <Field
-                  id="addressStreet"
-                  name="address.street"
+                  id="householdMemberAddress.street"
+                  name="householdMemberAddress.street"
                   defaultValue={member.householdMemberAddress.street}
                   validation={{ required: true, maxLength: 64 }}
                   errorMessage={
@@ -300,8 +300,8 @@ const ApplicationMember = () => {
                 />
 
                 <Field
-                  id="addressStreet2"
-                  name="address.street2"
+                  id="householdMemberAddress.street2"
+                  name="householdMemberAddress.street2"
                   label={t("application.contact.apt")}
                   defaultValue={member.householdMemberAddress.street2}
                   error={errors.address?.street2}
@@ -313,8 +313,8 @@ const ApplicationMember = () => {
 
                 <div className="flex max-w-2xl">
                   <Field
-                    id="addressCity"
-                    name="address.city"
+                    id="householdMemberAddress.city"
+                    name="householdMemberAddress.city"
                     label={t("application.contact.city")}
                     defaultValue={member.householdMemberAddress.city}
                     validation={{ required: true, maxLength: 64 }}
@@ -329,8 +329,8 @@ const ApplicationMember = () => {
                   />
 
                   <Select
-                    id="addressState"
-                    name="address.state"
+                    id="householdMemberAddress.state"
+                    name="householdMemberAddress.state"
                     label={t("application.contact.state")}
                     defaultValue={member.householdMemberAddress.state}
                     validation={{ required: true, maxLength: 64 }}
@@ -349,8 +349,8 @@ const ApplicationMember = () => {
                 </div>
 
                 <Field
-                  id="addressZipCode"
-                  name="address.zipCode"
+                  id="householdMemberAddress.zipCode"
+                  name="householdMemberAddress.zipCode"
                   label={t("application.contact.zip")}
                   defaultValue={member.householdMemberAddress.zipCode}
                   validation={{ required: true, maxLength: 64 }}
@@ -394,8 +394,8 @@ const ApplicationMember = () => {
                 <legend className="text__caps-spaced">{t("application.contact.address")}</legend>
 
                 <Field
-                  id="workAddress.street"
-                  name="workAddress.street"
+                  id="householdMemberWorkAddress.street"
+                  name="householdMemberWorkAddress.street"
                   label={t("application.contact.streetAddress")}
                   defaultValue={member.householdMemberWorkAddress.street}
                   validation={{ required: true, maxLength: 64 }}
@@ -410,8 +410,8 @@ const ApplicationMember = () => {
                 />
 
                 <Field
-                  id="workAddress.street2"
-                  name="workAddress.street2"
+                  id="householdMemberWorkAddress.street2"
+                  name="householdMemberWorkAddress.street2"
                   label={t("application.contact.apt")}
                   defaultValue={member.householdMemberWorkAddress.street2}
                   error={errors.workAddress?.street2}
@@ -423,8 +423,8 @@ const ApplicationMember = () => {
 
                 <div className="flex max-w-2xl">
                   <Field
-                    id="workAddress.city"
-                    name="workAddress.city"
+                    id="householdMemberWorkAddress.city"
+                    name="householdMemberWorkAddress.city"
                     label={t("application.contact.city")}
                     defaultValue={member.householdMemberWorkAddress.city}
                     validation={{ required: true, maxLength: 64 }}
@@ -439,8 +439,8 @@ const ApplicationMember = () => {
                   />
 
                   <Select
-                    id="workAddress.state"
-                    name="workAddress.state"
+                    id="householdMemberWorkAddress.state"
+                    name="householdMemberWorkAddress.state"
                     label={t("application.contact.state")}
                     defaultValue={member.householdMemberWorkAddress.state}
                     validation={{ required: true, maxLength: 64 }}
@@ -459,8 +459,8 @@ const ApplicationMember = () => {
                 </div>
 
                 <Field
-                  id="workAddress.zipCode"
-                  name="workAddress.zipCode"
+                  id="householdMemberWorkAddress.zipCode"
+                  name="householdMemberWorkAddress.zipCode"
                   label={t("application.contact.zip")}
                   defaultValue={member.householdMemberWorkAddress.zipCode}
                   validation={{ required: true, maxLength: 64 }}
diff --git a/sites/public/src/pages/applications/household/preferred-units.tsx b/sites/public/src/pages/applications/household/preferred-units.tsx
index cd9b854077..a5080a5897 100644
--- a/sites/public/src/pages/applications/household/preferred-units.tsx
+++ b/sites/public/src/pages/applications/household/preferred-units.tsx
@@ -51,6 +51,7 @@ const ApplicationPreferredUnits = () => {
     label: t(`application.household.preferredUnit.options.${item.name}`),
     value: item.id,
     defaultChecked: !!application.preferredUnitTypes?.find((unit) => unit.id === item.id),
+    dataTestId: t(`application.household.preferredUnit.options.${item.name}`),
   }))
 
   useEffect(() => {