diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java
index db39a836..9ea45469 100644
--- a/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java
+++ b/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java
@@ -72,6 +72,10 @@ public Map<String, Bundle> getTestCaseExportBundle(Measure measure, List<TestCas
         fhirContext
             .newJsonParser()
             .setParserErrorHandler(new StrictErrorHandler())
+            // Disable HAPI IParser default override of Resource IDs with FullUrl.
+            // When enabled, the Parser will replace a Resource's ID with its FullUrl
+            // when the FullUrl is present and its IdPart == the Resource ID.
+            .setOverrideResourceIdWithBundleEntryFullUrl(false)
             .setPrettyPrint(true);
 
     Map<String, Bundle> testCaseBundle = new HashMap<>();
diff --git a/src/test/resources/measures/SimpleFhirMeasureLib/madie_measure.json b/src/test/resources/measures/SimpleFhirMeasureLib/madie_measure.json
index 26937517..4cf8724b 100644
--- a/src/test/resources/measures/SimpleFhirMeasureLib/madie_measure.json
+++ b/src/test/resources/measures/SimpleFhirMeasureLib/madie_measure.json
@@ -26,7 +26,7 @@
          "createdBy":"cecilia.liu@semanticbits.com",
          "lastModifiedAt":1660832513.936000000,
          "lastModifiedBy":"cecilia.liu@semanticbits.com",
-         "json":"{\r\n  \"resourceType\": \"Bundle\",\r\n  \"id\": \"DENEXPass-NarcolepsyOnsetsEndOfMP\",\r\n  \"type\": \"collection\",\r\n  \"entry\": [\r\n    {\r\n      \"fullUrl\": \"633c9d020968f8012250fc60\",\r\n      \"resource\": {\r\n        \"resourceType\": \"Patient\",\r\n        \"id\": \"Patient-1\",\r\n        \"meta\": {\r\n          \"profile\": [\r\n            \"http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient\"\r\n          ]\r\n        },\r\n        \"extension\": [\r\n          {\r\n            \"url\": \"http://hl7.org/fhir/us/core/StructureDefinition/us-core-race\",\r\n            \"extension\": [\r\n              {\r\n                \"url\": \"ombCategory\",\r\n                \"valueCoding\": {\r\n                  \"code\": \"2028-9\",\r\n                  \"system\": \"urn:oid:2.16.840.1.113883.6.238\",\r\n                  \"display\": \"Asian\"\r\n                }\r\n              },\r\n              {\r\n                \"url\": \"text\",\r\n                \"valueString\": \"Asian\"\r\n              }\r\n            ]\r\n          },\r\n          {\r\n            \"url\": \"http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity\",\r\n            \"extension\": [\r\n              {\r\n                \"url\": \"ombCategory\",\r\n                \"valueCoding\": {\r\n                  \"code\": \"2135-2\",\r\n                  \"system\": \"urn:oid:2.16.840.1.113883.6.238\",\r\n                  \"display\": \"Hispanic or Latino\"\r\n                }\r\n              },\r\n              {\r\n                \"url\": \"text\",\r\n                \"valueString\": \"Hispanic or Latino\"\r\n              }\r\n            ]\r\n          }\r\n        ],\r\n        \"identifier\": [\r\n          {\r\n            \"system\": \"http://hospital.smarthealthit.org\",\r\n            \"value\": \"999999995\"\r\n          }\r\n        ],\r\n        \"name\": [\r\n          {\r\n            \"family\": \"Bertha\",\r\n            \"given\": [\r\n              \"Betty\"\r\n            ]\r\n          }\r\n        ],\r\n        \"birthDate\": \"2016-12-31\",\r\n        \"gender\": \"female\"\r\n      }\r\n    },\r\n    {\r\n      \"fullUrl\": \"633c9d020968f8012250fc61\",\r\n      \"resource\": {\r\n        \"resourceType\": \"Encounter\",\r\n        \"id\": \"Encounter-1\",\r\n        \"meta\": {\r\n          \"profile\": [\r\n            \"http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter\"\r\n          ]\r\n        },\r\n        \"subject\": {\r\n          \"reference\": \"Patient/Patient-1\"\r\n        },\r\n        \"status\": \"finished\",\r\n        \"class\": {\r\n          \"code\": \"AMB\",\r\n          \"system\": \"http://terminology.hl7.org/CodeSystem/v3-ActCode\",\r\n          \"display\": \"ambulatory\"\r\n        },\r\n        \"type\": [\r\n          {\r\n            \"coding\": [\r\n              {\r\n                \"code\": \"185464004\",\r\n                \"system\": \"http://snomed.info/sct\",\r\n                \"display\": \"Out of hours visit - not night visit (procedure)\"\r\n              }\r\n            ]\r\n          }\r\n        ],\r\n        \"period\": {\r\n          \"start\": \"2024-01-01T00:00:00.000Z\",\r\n          \"end\": \"2024-01-01T01:00:00.000Z\"\r\n        }\r\n      }\r\n    },\r\n    {\r\n      \"fullUrl\": \"633c9d020968f8012250fc62\",\r\n      \"resource\": {\r\n        \"resourceType\": \"MedicationRequest\",\r\n        \"id\": \"MedicationRequest-1\",\r\n        \"meta\": {\r\n          \"profile\": [\r\n            \"http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest\"\r\n          ]\r\n        },\r\n        \"requester\": {\r\n          \"reference\": \"Practitioner/example\"\r\n        },\r\n        \"subject\": {\r\n          \"reference\": \"Patient/Patient-1\"\r\n        },\r\n        \"status\": \"completed\",\r\n        \"intent\": \"order\",\r\n        \"medicationCodeableConcept\": {\r\n          \"coding\": [\r\n            {\r\n              \"code\": \"884173\",\r\n              \"system\": \"http://www.nlm.nih.gov/research/umls/rxnorm\",\r\n              \"display\": \"clonidine hydrochloride 0.1 MG Oral Tablet\"\r\n            }\r\n          ]\r\n        },\r\n        \"authoredOn\": \"2024-01-01T00:00:00.000Z\",\r\n        \"dispenseRequest\": {\r\n          \"expectedSupplyDuration\": {\r\n            \"value\": 90,\r\n            \"code\": \"d\",\r\n            \"system\": \"http://unitsofmeasure.org\"\r\n          }\r\n        },\r\n        \"dosageInstruction\": [\r\n          {\r\n            \"timing\": {\r\n              \"repeat\": {\r\n                \"boundsPeriod\": {\r\n                  \"start\": \"2024-01-01T00:00:00.000Z\",\r\n                  \"end\": \"2024-03-31T23:59:59.000Z\"\r\n                }\r\n              }\r\n            }\r\n          }\r\n        ]\r\n      }\r\n    },\r\n    {\r\n      \"fullUrl\": \"633c9d020968f8012250fc64\",\r\n      \"resource\": {\r\n        \"resourceType\": \"Condition\",\r\n        \"id\": \"Condition-1\",\r\n        \"meta\": {\r\n          \"profile\": [\r\n            \"http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition\"\r\n          ]\r\n        },\r\n        \"category\": [\r\n          {\r\n            \"coding\": [\r\n              {\r\n                \"code\": \"problem-list-item\",\r\n                \"system\": \"http://terminology.hl7.org/CodeSystem/condition-category\",\r\n                \"display\": \"Problem List Item\"\r\n              }\r\n            ]\r\n          }\r\n        ],\r\n        \"subject\": {\r\n          \"reference\": \"Patient/Patient-1\"\r\n        },\r\n        \"code\": {\r\n          \"coding\": [\r\n            {\r\n              \"code\": \"735676003\",\r\n              \"system\": \"http://snomed.info/sct\",\r\n              \"display\": \"Narcolepsy type 1 (disorder)\"\r\n            }\r\n          ]\r\n        },\r\n        \"onsetDateTime\": \"2024-12-31T23:59:01.000Z\",\r\n        \"clinicalStatus\": {\r\n          \"coding\": [\r\n            {\r\n              \"code\": \"active\",\r\n              \"system\": \"http://terminology.hl7.org/CodeSystem/condition-clinical\"\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    }\r\n  ]\r\n}\r\n",
+         "json":"{\r\n  \"resourceType\": \"Bundle\",\r\n  \"id\": \"DENEXPass-NarcolepsyOnsetsEndOfMP\",\r\n  \"type\": \"collection\",\r\n  \"entry\": [\r\n    {\r\n      \"fullUrl\": \"633c9d020968f8012250fc60\",\r\n      \"resource\": {\r\n        \"resourceType\": \"Patient\",\r\n        \"id\": \"Patient-1\",\r\n        \"meta\": {\r\n          \"profile\": [\r\n            \"http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient\"\r\n          ]\r\n        },\r\n        \"extension\": [\r\n          {\r\n            \"url\": \"http://hl7.org/fhir/us/core/StructureDefinition/us-core-race\",\r\n            \"extension\": [\r\n              {\r\n                \"url\": \"ombCategory\",\r\n                \"valueCoding\": {\r\n                  \"code\": \"2028-9\",\r\n                  \"system\": \"urn:oid:2.16.840.1.113883.6.238\",\r\n                  \"display\": \"Asian\"\r\n                }\r\n              },\r\n              {\r\n                \"url\": \"text\",\r\n                \"valueString\": \"Asian\"\r\n              }\r\n            ]\r\n          },\r\n          {\r\n            \"url\": \"http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity\",\r\n            \"extension\": [\r\n              {\r\n                \"url\": \"ombCategory\",\r\n                \"valueCoding\": {\r\n                  \"code\": \"2135-2\",\r\n                  \"system\": \"urn:oid:2.16.840.1.113883.6.238\",\r\n                  \"display\": \"Hispanic or Latino\"\r\n                }\r\n              },\r\n              {\r\n                \"url\": \"text\",\r\n                \"valueString\": \"Hispanic or Latino\"\r\n              }\r\n            ]\r\n          }\r\n        ],\r\n        \"identifier\": [\r\n          {\r\n            \"system\": \"http://hospital.smarthealthit.org\",\r\n            \"value\": \"999999995\"\r\n          }\r\n        ],\r\n        \"name\": [\r\n          {\r\n            \"family\": \"Bertha\",\r\n            \"given\": [\r\n              \"Betty\"\r\n            ]\r\n          }\r\n        ],\r\n        \"birthDate\": \"2016-12-31\",\r\n        \"gender\": \"female\"\r\n      }\r\n    },\r\n    {\r\n      \"fullUrl\": \"https://madie.cms.gov/Encounter/Encounter-1\",\r\n      \"resource\": {\r\n        \"resourceType\": \"Encounter\",\r\n        \"id\": \"Encounter-1\",\r\n        \"meta\": {\r\n          \"profile\": [\r\n            \"http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter\"\r\n          ]\r\n        },\r\n        \"subject\": {\r\n          \"reference\": \"Patient/Patient-1\"\r\n        },\r\n        \"status\": \"finished\",\r\n        \"class\": {\r\n          \"code\": \"AMB\",\r\n          \"system\": \"http://terminology.hl7.org/CodeSystem/v3-ActCode\",\r\n          \"display\": \"ambulatory\"\r\n        },\r\n        \"type\": [\r\n          {\r\n            \"coding\": [\r\n              {\r\n                \"code\": \"185464004\",\r\n                \"system\": \"http://snomed.info/sct\",\r\n                \"display\": \"Out of hours visit - not night visit (procedure)\"\r\n              }\r\n            ]\r\n          }\r\n        ],\r\n        \"period\": {\r\n          \"start\": \"2024-01-01T00:00:00.000Z\",\r\n          \"end\": \"2024-01-01T01:00:00.000Z\"\r\n        }\r\n      }\r\n    },\r\n    {\r\n      \"fullUrl\": \"633c9d020968f8012250fc62\",\r\n      \"resource\": {\r\n        \"resourceType\": \"MedicationRequest\",\r\n        \"id\": \"MedicationRequest-1\",\r\n        \"meta\": {\r\n          \"profile\": [\r\n            \"http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest\"\r\n          ]\r\n        },\r\n        \"requester\": {\r\n          \"reference\": \"Practitioner/example\"\r\n        },\r\n        \"subject\": {\r\n          \"reference\": \"Patient/Patient-1\"\r\n        },\r\n        \"status\": \"completed\",\r\n        \"intent\": \"order\",\r\n        \"medicationCodeableConcept\": {\r\n          \"coding\": [\r\n            {\r\n              \"code\": \"884173\",\r\n              \"system\": \"http://www.nlm.nih.gov/research/umls/rxnorm\",\r\n              \"display\": \"clonidine hydrochloride 0.1 MG Oral Tablet\"\r\n            }\r\n          ]\r\n        },\r\n        \"authoredOn\": \"2024-01-01T00:00:00.000Z\",\r\n        \"dispenseRequest\": {\r\n          \"expectedSupplyDuration\": {\r\n            \"value\": 90,\r\n            \"code\": \"d\",\r\n            \"system\": \"http://unitsofmeasure.org\"\r\n          }\r\n        },\r\n        \"dosageInstruction\": [\r\n          {\r\n            \"timing\": {\r\n              \"repeat\": {\r\n                \"boundsPeriod\": {\r\n                  \"start\": \"2024-01-01T00:00:00.000Z\",\r\n                  \"end\": \"2024-03-31T23:59:59.000Z\"\r\n                }\r\n              }\r\n            }\r\n          }\r\n        ]\r\n      }\r\n    },\r\n    {\r\n      \"fullUrl\": \"633c9d020968f8012250fc64\",\r\n      \"resource\": {\r\n        \"resourceType\": \"Condition\",\r\n        \"id\": \"Condition-1\",\r\n        \"meta\": {\r\n          \"profile\": [\r\n            \"http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition\"\r\n          ]\r\n        },\r\n        \"category\": [\r\n          {\r\n            \"coding\": [\r\n              {\r\n                \"code\": \"problem-list-item\",\r\n                \"system\": \"http://terminology.hl7.org/CodeSystem/condition-category\",\r\n                \"display\": \"Problem List Item\"\r\n              }\r\n            ]\r\n          }\r\n        ],\r\n        \"subject\": {\r\n          \"reference\": \"Patient/Patient-1\"\r\n        },\r\n        \"code\": {\r\n          \"coding\": [\r\n            {\r\n              \"code\": \"735676003\",\r\n              \"system\": \"http://snomed.info/sct\",\r\n              \"display\": \"Narcolepsy type 1 (disorder)\"\r\n            }\r\n          ]\r\n        },\r\n        \"onsetDateTime\": \"2024-12-31T23:59:01.000Z\",\r\n        \"clinicalStatus\": {\r\n          \"coding\": [\r\n            {\r\n              \"code\": \"active\",\r\n              \"system\": \"http://terminology.hl7.org/CodeSystem/condition-clinical\"\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    }\r\n  ]\r\n}\r\n",
          "hapiOperationOutcome":null,
          "patientId":"285d114d-9c36-4d66-b0a0-06f395bbf23d",
          "groupPopulations":[