diff --git a/app/services/state_file/submission_id_lookup.yml b/app/services/state_file/submission_id_lookup.yml
index bc6fa2e9e3..eac522f9a8 100644
--- a/app/services/state_file/submission_id_lookup.yml
+++ b/app/services/state_file/submission_id_lookup.yml
@@ -59,9 +59,11 @@ nc_superman_mfj: 1016422025017h93wzyp
 nc_wylie_mfs: 10164220243274vip4ag
 nc_zeus_mfj_deps: 1016422024327ahu7xl7
 nj_blackburn_mfj: 10164220243470bd1hef
+nj_bog_turtle_mfs: 7812652025030jqdd6x3
 nj_bon_jovi_health_exempt_deps: 78126520250034nzlizg
 nj_david_mfj: 1016422024344s4n9nnq
 nj_devito_single: 78126520243462cdhtih
+nj_eastern_goldfinch_mfs: 7812652025030e1ojzfb
 nj_houston_single_under18: 7812652024352z8gbjs2
 nj_jennifer_single: 7812652024343fmsriru
 nj_jones_mfj: 10164220243476cusnvc
diff --git a/spec/fixtures/state_file/fed_return_jsons/nj/bog_turtle_mfs.json b/spec/fixtures/state_file/fed_return_jsons/nj/bog_turtle_mfs.json
new file mode 100644
index 0000000000..81808f8acb
--- /dev/null
+++ b/spec/fixtures/state_file/fed_return_jsons/nj/bog_turtle_mfs.json
@@ -0,0 +1,45 @@
+{
+  "familyAndHousehold": [],
+  "filers": [
+    {
+      "lastName": "Turtle",
+      "dateOfBirth": "1950-12-05",
+      "suffix": null,
+      "isPrimaryFiler": true,
+      "firstName": "Bog",
+      "middleInitial": "Q",
+      "educatorExpenses": "0.00",
+      "tin": "300-00-2211",
+      "interestReportsTotal": "0.00",
+      "isDisabled": false,
+      "form1099GsTotal": "0.00",
+      "isStudent": false,
+      "ssnNotValidForEmployment": null,
+      "hsaTotalDeductibleAmount": null
+    },
+    {
+      "lastName": "Tortoise",
+      "dateOfBirth": null,
+      "suffix": null,
+      "isPrimaryFiler": false,
+      "firstName": "Box",
+      "middleInitial": null,
+      "educatorExpenses": "0.00",
+      "tin": null,
+      "interestReportsTotal": "0.00",
+      "isDisabled": null,
+      "form1099GsTotal": "0.00",
+      "isStudent": null,
+      "hsaTotalDeductibleAmount": null,
+      "ssnNotValidForEmployment": null
+    }
+  ],
+  "form1099Gs": [],
+  "formW2s": [
+    {
+      "usedTin": "300-00-2211",
+      "unionDuesAmount": null
+    }
+  ],
+  "interestReports": []
+}
diff --git a/spec/fixtures/state_file/fed_return_jsons/nj/eastern_goldfinch_mfs.json b/spec/fixtures/state_file/fed_return_jsons/nj/eastern_goldfinch_mfs.json
new file mode 100644
index 0000000000..392760485b
--- /dev/null
+++ b/spec/fixtures/state_file/fed_return_jsons/nj/eastern_goldfinch_mfs.json
@@ -0,0 +1,45 @@
+{
+  "familyAndHousehold": [],
+  "filers": [
+    {
+      "lastName": "Greenpigeon",
+      "dateOfBirth": null,
+      "suffix": null,
+      "isPrimaryFiler": false,
+      "firstName": "Western",
+      "middleInitial": null,
+      "educatorExpenses": "0.00",
+      "tin": null,
+      "interestReportsTotal": "0.00",
+      "isDisabled": null,
+      "form1099GsTotal": "0.00",
+      "isStudent": null,
+      "hsaTotalDeductibleAmount": null,
+      "ssnNotValidForEmployment": null
+    },
+    {
+      "lastName": "Goldfinch",
+      "dateOfBirth": "1940-12-06",
+      "suffix": null,
+      "isPrimaryFiler": true,
+      "firstName": "Eastern",
+      "middleInitial": "Z",
+      "educatorExpenses": "0.00",
+      "tin": "300-00-3211",
+      "interestReportsTotal": "0.00",
+      "isDisabled": false,
+      "form1099GsTotal": "0.00",
+      "isStudent": false,
+      "ssnNotValidForEmployment": null,
+      "hsaTotalDeductibleAmount": null
+    }
+  ],
+  "form1099Gs": [],
+  "formW2s": [
+    {
+      "usedTin": "300-00-3211",
+      "unionDuesAmount": null
+    }
+  ],
+  "interestReports": []
+}
diff --git a/spec/fixtures/state_file/fed_return_xmls/nj/bog_turtle_mfs.xml b/spec/fixtures/state_file/fed_return_xmls/nj/bog_turtle_mfs.xml
new file mode 100644
index 0000000000..65a9638e6d
--- /dev/null
+++ b/spec/fixtures/state_file/fed_return_xmls/nj/bog_turtle_mfs.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Return xmlns="http://www.irs.gov/efile" xmlns:efile="http://www.irs.gov/efile" returnVersion="2024v5.0">
+    <ReturnHeader binaryAttachmentCnt="0">
+        <TaxYr>2024</TaxYr>
+        <TaxPeriodBeginDt>2024-01-01</TaxPeriodBeginDt>
+        <TaxPeriodEndDt>2024-12-31</TaxPeriodEndDt>
+        <SoftwareVersionNum>c21d6eb3</SoftwareVersionNum>
+        <ReturnTypeCd>1040</ReturnTypeCd>
+        <Filer>
+            <PrimarySSN>300002211</PrimarySSN>
+            <NameLine1Txt>BOG Q&lt;TURTLE</NameLine1Txt>
+            <PrimaryNameControlTxt>TURT</PrimaryNameControlTxt>
+            <SpouseNameControlTxt>TORT</SpouseNameControlTxt>
+            <USAddress>
+                <AddressLine1Txt>10 New Jersey St</AddressLine1Txt>
+                <CityNm>Newark</CityNm>
+                <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                <ZIPCd>07102</ZIPCd>
+            </USAddress>
+            <PhoneNum>2015551515</PhoneNum>
+        </Filer>
+        <AdditionalFilerInformation>
+            <AtSubmissionFilingGrp>
+                <EmailAddressTxt>test-user+30000221-121c-4cf6-8089-85ad9800a945@directfile.test</EmailAddressTxt>
+            </AtSubmissionFilingGrp>
+        </AdditionalFilerInformation>
+    </ReturnHeader>
+    <ReturnData documentCnt="3">
+        <IRS1040 documentId="IRS10400001">
+            <Form1040SRInd>X</Form1040SRInd>
+            <IndividualReturnFilingStatusCd>3</IndividualReturnFilingStatusCd>
+            <SpouseNm>Box Tortoise</SpouseNm>
+            <VirtualCurAcquiredDurTYInd>false</VirtualCurAcquiredDurTYInd>
+            <Primary65OrOlderInd>X</Primary65OrOlderInd>
+            <TotalBoxesCheckedCnt>1</TotalBoxesCheckedCnt>
+            <TotalExemptPrimaryAndSpouseCnt>1</TotalExemptPrimaryAndSpouseCnt>
+            <ChldWhoLivedWithYouCnt>0</ChldWhoLivedWithYouCnt>
+            <OtherDependentsListedCnt>0</OtherDependentsListedCnt>
+            <TotalExemptionsCnt>1</TotalExemptionsCnt>
+            <WagesAmt referenceDocumentId="W20001" referenceDocumentName="IRSW2">10000</WagesAmt>
+            <WagesSalariesAndTipsAmt>10000</WagesSalariesAndTipsAmt>
+            <PensionsAnnuitiesAmt>70000</PensionsAnnuitiesAmt>
+            <TotalTaxablePensionsAmt>30000</TotalTaxablePensionsAmt>
+            <TotalIncomeAmt>40000</TotalIncomeAmt>
+            <AdjustedGrossIncomeAmt>40000</AdjustedGrossIncomeAmt>
+            <TotalItemizedOrStandardDedAmt>16150</TotalItemizedOrStandardDedAmt>
+            <TotalDeductionsAmt>16150</TotalDeductionsAmt>
+            <TaxableIncomeAmt>23850</TaxableIncomeAmt>
+            <TaxAmt>2633</TaxAmt>
+            <TotalTaxBeforeCrAndOthTaxesAmt>2633</TotalTaxBeforeCrAndOthTaxesAmt>
+            <TaxLessCreditsAmt>2633</TaxLessCreditsAmt>
+            <TotalTaxAmt>2633</TotalTaxAmt>
+            <FormW2WithheldTaxAmt>2000</FormW2WithheldTaxAmt>
+            <WithholdingTaxAmt>2000</WithholdingTaxAmt>
+            <TotalPaymentsAmt>2000</TotalPaymentsAmt>
+            <OwedAmt>633</OwedAmt>
+            <ThirdPartyDesigneeInd>false</ThirdPartyDesigneeInd>
+            <PrimaryOccupationTxt>Reptile</PrimaryOccupationTxt>
+            <RefundProductCd>NO FINANCIAL PRODUCT</RefundProductCd>
+        </IRS1040>
+        <IRS1099R documentId="IRS1099R0001">
+            <PayerNameControlTxt>FIDE</PayerNameControlTxt>
+            <PayerName>
+                <BusinessNameLine1Txt>Fidelity</BusinessNameLine1Txt>
+            </PayerName>
+            <PayerUSAddress>
+                <AddressLine1Txt>1 Retirement St</AddressLine1Txt>
+                <CityNm>St Louis</CityNm>
+                <StateAbbreviationCd>MO</StateAbbreviationCd>
+                <ZIPCd>63129</ZIPCd>
+            </PayerUSAddress>
+            <PayerEIN>001414141</PayerEIN>
+            <RecipientSSN>300002211</RecipientSSN>
+            <RecipientNm>Bog Q Turtle</RecipientNm>
+            <RecipientUSAddress>
+                <AddressLine1Txt>10 New Jersey St</AddressLine1Txt>
+                <CityNm>Newark</CityNm>
+                <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                <ZIPCd>07102</ZIPCd>
+            </RecipientUSAddress>
+            <GrossDistributionAmt>70000</GrossDistributionAmt>
+            <TaxableAmt>30000</TaxableAmt>
+            <F1099RDistributionCd>7</F1099RDistributionCd>
+            <OtherDistributionAmt>0</OtherDistributionAmt>
+            <IRRAllocatedAmt>0</IRRAllocatedAmt>
+            <F1099RStateLocalTaxGrp>
+                <F1099RStateTaxGrp>
+                    <StateTaxWithheldAmt>1000</StateTaxWithheldAmt>
+                    <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                    <PayerStateIdNum>1414141</PayerStateIdNum>
+                    <StateDistributionAmt>70000</StateDistributionAmt>
+                    <F1099RLocalTaxGrp/>
+                </F1099RStateTaxGrp>
+            </F1099RStateLocalTaxGrp>
+            <StandardOrNonStandardCd>S</StandardOrNonStandardCd>
+        </IRS1099R>
+        <IRSW2 documentId="W20001" documentName="IRSW2">
+            <EmployeeSSN>300002211</EmployeeSSN>
+            <EmployerEIN>011234567</EmployerEIN>
+            <EmployerNameControlTxt>REPT</EmployerNameControlTxt>
+            <EmployerName>
+                <BusinessNameLine1Txt>Reptile Center</BusinessNameLine1Txt>
+            </EmployerName>
+            <EmployerUSAddress>
+                <AddressLine1Txt>1 Main St</AddressLine1Txt>
+                <CityNm>Newark</CityNm>
+                <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                <ZIPCd>07101</ZIPCd>
+            </EmployerUSAddress>
+            <EmployeeNm>Bog Q Turtle</EmployeeNm>
+            <EmployeeUSAddress>
+                <AddressLine1Txt>10 New Jersey St</AddressLine1Txt>
+                <CityNm>Newark</CityNm>
+                <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                <ZIPCd>07102</ZIPCd>
+            </EmployeeUSAddress>
+            <WagesAmt>10000</WagesAmt>
+            <WithholdingAmt>2000</WithholdingAmt>
+            <SocialSecurityWagesAmt>10000</SocialSecurityWagesAmt>
+            <SocialSecurityTaxAmt>1000</SocialSecurityTaxAmt>
+            <MedicareWagesAndTipsAmt>10000</MedicareWagesAndTipsAmt>
+            <MedicareTaxWithheldAmt>500</MedicareTaxWithheldAmt>
+            <OtherDeductionsBenefitsGrp>
+                <Desc>FLI</Desc>
+                <Amt>145</Amt>
+            </OtherDeductionsBenefitsGrp>
+            <OtherDeductionsBenefitsGrp>
+                <Desc>UIHCWD</Desc>
+                <Amt>101</Amt>
+            </OtherDeductionsBenefitsGrp>
+            <OtherDeductionsBenefitsGrp>
+                <Desc>UIWFSWF</Desc>
+                <Amt>180</Amt>
+            </OtherDeductionsBenefitsGrp>
+            <W2StateLocalTaxGrp>
+                <W2StateTaxGrp>
+                    <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                    <EmployerStateIdNum>7654321</EmployerStateIdNum>
+                    <StateWagesAmt>10000</StateWagesAmt>
+                    <StateIncomeTaxAmt>2000</StateIncomeTaxAmt>
+                    <W2LocalTaxGrp/>
+                </W2StateTaxGrp>
+            </W2StateLocalTaxGrp>
+            <StandardOrNonStandardCd>S</StandardOrNonStandardCd>
+        </IRSW2>
+    </ReturnData>
+</Return>
diff --git a/spec/fixtures/state_file/fed_return_xmls/nj/eastern_goldfinch_mfs.xml b/spec/fixtures/state_file/fed_return_xmls/nj/eastern_goldfinch_mfs.xml
new file mode 100644
index 0000000000..09aaeeb5a1
--- /dev/null
+++ b/spec/fixtures/state_file/fed_return_xmls/nj/eastern_goldfinch_mfs.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Return xmlns="http://www.irs.gov/efile" xmlns:efile="http://www.irs.gov/efile" returnVersion="2024v5.0">
+    <ReturnHeader binaryAttachmentCnt="0">
+        <TaxYr>2024</TaxYr>
+        <TaxPeriodBeginDt>2024-01-01</TaxPeriodBeginDt>
+        <TaxPeriodEndDt>2024-12-31</TaxPeriodEndDt>
+        <SoftwareVersionNum>c21d6eb3</SoftwareVersionNum>
+        <ReturnTypeCd>1040</ReturnTypeCd>
+        <Filer>
+            <PrimarySSN>300003211</PrimarySSN>
+            <NameLine1Txt>EASTERN Z&lt;GOLDFINCH</NameLine1Txt>
+            <PrimaryNameControlTxt>GOLD</PrimaryNameControlTxt>
+            <SpouseNameControlTxt>GREE</SpouseNameControlTxt>
+            <USAddress>
+                <AddressLine1Txt>1 Bird Street</AddressLine1Txt>
+                <CityNm>Newark</CityNm>
+                <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                <ZIPCd>07121</ZIPCd>
+            </USAddress>
+            <PhoneNum>2015557676</PhoneNum>
+        </Filer>
+        <AdditionalFilerInformation>
+            <AtSubmissionFilingGrp>
+                <EmailAddressTxt>test-user+30000321-12bb-4442-84e8-4df975a55f09@directfile.test</EmailAddressTxt>
+            </AtSubmissionFilingGrp>
+        </AdditionalFilerInformation>
+    </ReturnHeader>
+    <ReturnData documentCnt="3">
+        <IRS1040 documentId="IRS10400001">
+            <Form1040SRInd>X</Form1040SRInd>
+            <IndividualReturnFilingStatusCd>3</IndividualReturnFilingStatusCd>
+            <NRALiteralCd>NRA</NRALiteralCd>
+            <VirtualCurAcquiredDurTYInd>false</VirtualCurAcquiredDurTYInd>
+            <Primary65OrOlderInd>X</Primary65OrOlderInd>
+            <TotalBoxesCheckedCnt>1</TotalBoxesCheckedCnt>
+            <TotalExemptPrimaryAndSpouseCnt>1</TotalExemptPrimaryAndSpouseCnt>
+            <ChldWhoLivedWithYouCnt>0</ChldWhoLivedWithYouCnt>
+            <OtherDependentsListedCnt>0</OtherDependentsListedCnt>
+            <TotalExemptionsCnt>1</TotalExemptionsCnt>
+            <WagesAmt referenceDocumentId="W20001" referenceDocumentName="IRSW2">2000</WagesAmt>
+            <WagesSalariesAndTipsAmt>2000</WagesSalariesAndTipsAmt>
+            <PensionsAnnuitiesAmt>30000</PensionsAnnuitiesAmt>
+            <TotalTaxablePensionsAmt>25000</TotalTaxablePensionsAmt>
+            <TotalIncomeAmt>27000</TotalIncomeAmt>
+            <AdjustedGrossIncomeAmt>27000</AdjustedGrossIncomeAmt>
+            <TotalItemizedOrStandardDedAmt>16150</TotalItemizedOrStandardDedAmt>
+            <TotalDeductionsAmt>16150</TotalDeductionsAmt>
+            <TaxableIncomeAmt>10850</TaxableIncomeAmt>
+            <TaxAmt>1088</TaxAmt>
+            <TotalTaxBeforeCrAndOthTaxesAmt>1088</TotalTaxBeforeCrAndOthTaxesAmt>
+            <TaxLessCreditsAmt>1088</TaxLessCreditsAmt>
+            <TotalTaxAmt>1088</TotalTaxAmt>
+            <OwedAmt>1088</OwedAmt>
+            <ThirdPartyDesigneeInd>false</ThirdPartyDesigneeInd>
+            <PrimaryOccupationTxt>Ornithologist</PrimaryOccupationTxt>
+            <RefundProductCd>NO FINANCIAL PRODUCT</RefundProductCd>
+        </IRS1040>
+        <IRS1099R documentId="IRS1099R0001">
+            <PayerNameControlTxt>FIDE</PayerNameControlTxt>
+            <PayerName>
+                <BusinessNameLine1Txt>Fidelity</BusinessNameLine1Txt>
+            </PayerName>
+            <PayerUSAddress>
+                <AddressLine1Txt>1 Retirement St</AddressLine1Txt>
+                <CityNm>Newark</CityNm>
+                <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                <ZIPCd>07121</ZIPCd>
+            </PayerUSAddress>
+            <PayerEIN>008278278</PayerEIN>
+            <PhoneNum>2015557676</PhoneNum>
+            <RecipientSSN>300003211</RecipientSSN>
+            <RecipientNm>Eastern Z Goldfinch</RecipientNm>
+            <RecipientUSAddress>
+                <AddressLine1Txt>1 Bird Street</AddressLine1Txt>
+                <CityNm>Newark</CityNm>
+                <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                <ZIPCd>07121</ZIPCd>
+            </RecipientUSAddress>
+            <GrossDistributionAmt>30000</GrossDistributionAmt>
+            <TaxableAmt>25000</TaxableAmt>
+            <F1099RDistributionCd>7</F1099RDistributionCd>
+            <OtherDistributionAmt>0</OtherDistributionAmt>
+            <IRRAllocatedAmt>0</IRRAllocatedAmt>
+            <F1099RStateLocalTaxGrp>
+                <F1099RStateTaxGrp>
+                    <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                    <PayerStateIdNum>1414141</PayerStateIdNum>
+                    <StateDistributionAmt>30000</StateDistributionAmt>
+                    <F1099RLocalTaxGrp/>
+                </F1099RStateTaxGrp>
+            </F1099RStateLocalTaxGrp>
+            <StandardOrNonStandardCd>S</StandardOrNonStandardCd>
+        </IRS1099R>
+        <IRSW2 documentId="W20001" documentName="IRSW2">
+            <EmployeeSSN>300003211</EmployeeSSN>
+            <EmployerEIN>001919191</EmployerEIN>
+            <EmployerNameControlTxt>BIRD</EmployerNameControlTxt>
+            <EmployerName>
+                <BusinessNameLine1Txt>Bird Center</BusinessNameLine1Txt>
+            </EmployerName>
+            <EmployerUSAddress>
+                <AddressLine1Txt>1 Main St</AddressLine1Txt>
+                <CityNm>Newark</CityNm>
+                <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                <ZIPCd>07101</ZIPCd>
+            </EmployerUSAddress>
+            <EmployeeNm>Eastern Z Goldfinch</EmployeeNm>
+            <EmployeeUSAddress>
+                <AddressLine1Txt>1 Bird Street</AddressLine1Txt>
+                <CityNm>Newark</CityNm>
+                <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                <ZIPCd>07121</ZIPCd>
+            </EmployeeUSAddress>
+            <WagesAmt>2000</WagesAmt>
+            <SocialSecurityWagesAmt>2000</SocialSecurityWagesAmt>
+            <MedicareWagesAndTipsAmt>2000</MedicareWagesAndTipsAmt>
+            <W2StateLocalTaxGrp>
+                <W2StateTaxGrp>
+                    <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                    <EmployerStateIdNum>8181818</EmployerStateIdNum>
+                    <StateWagesAmt>2000</StateWagesAmt>
+                    <W2LocalTaxGrp/>
+                </W2StateTaxGrp>
+            </W2StateLocalTaxGrp>
+            <StandardOrNonStandardCd>S</StandardOrNonStandardCd>
+        </IRSW2>
+    </ReturnData>
+</Return>