diff --git a/playwright-tests/tests/advanced/0002a_ReplaceOemEndorsement.ts b/playwright-tests/tests/advanced/0002a_ReplaceOemEndorsement.ts
index 2d6bf104..56d2f722 100644
--- a/playwright-tests/tests/advanced/0002a_ReplaceOemEndorsement.ts
+++ b/playwright-tests/tests/advanced/0002a_ReplaceOemEndorsement.ts
@@ -29,7 +29,7 @@ if ((process.env.ENABLE_MOCK_TESTING ?? 'false') === 'true') {
     customerDetails.lastName = 'Cormier';
     customerDetails.address.street = '69825 W Pine Street';
 } else {
-    policyNumber = `~AutomatedScenario0002a${faker.string.uuid().substring(0, 6)}`;
+    policyNumber = `~AutomatedScenario0002a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`;
 };
 const policySoap = MockPolicyData.getPolicySoapByScenario('0002a', customerDetails, policyNumber);
 
diff --git a/playwright-tests/tests/advanced/0004a_NoDeductibleAdas.ts b/playwright-tests/tests/advanced/0004a_NoDeductibleAdas.ts
index b64aaac5..21015d9d 100644
--- a/playwright-tests/tests/advanced/0004a_NoDeductibleAdas.ts
+++ b/playwright-tests/tests/advanced/0004a_NoDeductibleAdas.ts
@@ -23,7 +23,7 @@ const customerDetails: ICustomerDetails = {
     }
 }
 
-const policyNumber = `~AutomatedScenario0004a${faker.string.uuid().substring(0, 6)}`;
+const policyNumber = `~AutomatedScenario0004a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0004a', customerDetails, policyNumber);
 
 const advancedScenario0004aData: Partial<ITestData> = {
@@ -33,8 +33,7 @@ const advancedScenario0004aData: Partial<ITestData> = {
     isNoComp: false,
     hasStateLawPopup: false,
     endorsements: undefined,
-    vehiclePartQuestions: [
-    ],
+    partQuestions: [],
     isSafelite: true,
     servicePackage: faker.helpers.enumValue(ServicePackage),
     customerDetails: customerDetails,
diff --git a/playwright-tests/tests/advanced/0005a_CapabilityQuestions.ts b/playwright-tests/tests/advanced/0005a_CapabilityQuestions.ts
index 64a1d1c6..0d0bc31f 100644
--- a/playwright-tests/tests/advanced/0005a_CapabilityQuestions.ts
+++ b/playwright-tests/tests/advanced/0005a_CapabilityQuestions.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0005a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0005a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0005a', customerDetails, policyNumber);
 
 const advancedScenario0005Data: Partial<ITestData> = {
diff --git a/playwright-tests/tests/advanced/0006a_RepairNoDeductibleMobile.ts b/playwright-tests/tests/advanced/0006a_RepairNoDeductibleMobile.ts
index 7491c063..279f141c 100644
--- a/playwright-tests/tests/advanced/0006a_RepairNoDeductibleMobile.ts
+++ b/playwright-tests/tests/advanced/0006a_RepairNoDeductibleMobile.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0006a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0006a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0006a', customerDetails, policyNumber);
 
 const advancedScenario0006Data: Partial<ITestData> = {
diff --git a/playwright-tests/tests/advanced/0007a_RepairStateLanguage.ts b/playwright-tests/tests/advanced/0007a_RepairStateLanguage.ts
index 6abec815..cfec1614 100644
--- a/playwright-tests/tests/advanced/0007a_RepairStateLanguage.ts
+++ b/playwright-tests/tests/advanced/0007a_RepairStateLanguage.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0007a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0007a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0007a', customerDetails, policyNumber);
 
 const advancedScenario0007Data: Partial<ITestData> = {
diff --git a/playwright-tests/tests/advanced/0008a_RepairTpa.ts b/playwright-tests/tests/advanced/0008a_RepairTpa.ts
index c5b23efa..2404f831 100644
--- a/playwright-tests/tests/advanced/0008a_RepairTpa.ts
+++ b/playwright-tests/tests/advanced/0008a_RepairTpa.ts
@@ -12,7 +12,7 @@ const nextWeekday = getNextWeekday();
 const customerAddress: IAddress = {
     street: faker.location.streetAddress(),
     city: 'Hamden',
-    state: 'CT',
+    state: 'CONNECTICUT',
     postalCode: '06517',
     country: 'United States'
 }
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0008a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0008a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0008a', customerDetails, policyNumber);
 
 const advancedScenario0008Data: Partial<ITestData> = {
@@ -33,7 +33,7 @@ const advancedScenario0008Data: Partial<ITestData> = {
     isDuplicateClaim: false,
     isPolicyFound: true,
     isNoComp: false,
-    hasStateLawPopup: true,
+    hasStateLawPopup: false,
     endorsements: undefined,
     vehiclePartQuestions: [
         // {
diff --git a/playwright-tests/tests/advanced/0009a_NoDeductibleFlorida.ts b/playwright-tests/tests/advanced/0009a_NoDeductibleFlorida.ts
index 103f769c..7b0dae5b 100644
--- a/playwright-tests/tests/advanced/0009a_NoDeductibleFlorida.ts
+++ b/playwright-tests/tests/advanced/0009a_NoDeductibleFlorida.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0009a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0009a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0009a', customerDetails, policyNumber);
 
 const advancedScenario0009Data: Partial<ITestData> = {
@@ -38,7 +38,7 @@ const advancedScenario0009Data: Partial<ITestData> = {
         {
             endorsementType: EndorsementType.Educator,
             isOnPolicy: true,
-            isClickYes: false
+            isClickYes: true
         }
     ],
     vehiclePartQuestions: [
diff --git a/playwright-tests/tests/advanced/0010a_RearGlass.ts b/playwright-tests/tests/advanced/0010a_RearGlass.ts
index de2fc541..c793e224 100644
--- a/playwright-tests/tests/advanced/0010a_RearGlass.ts
+++ b/playwright-tests/tests/advanced/0010a_RearGlass.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0010a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0010a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0010a', customerDetails, policyNumber);
 
 const advancedScenario0010Data: Partial<ITestData> = {
@@ -92,7 +92,7 @@ for (const client of advancedClients) {
     const data = {...advancedScenario0010Data};
     data.clientTag = client.clientTag;
     const tc = new TestCase({
-        name: `0010a Advanced Repair No Deductible FL Rear Client: "${client.accountName}"`,
+        name: `0010a Advanced Replace No Deductible FL Rear Client: "${client.accountName}"`,
         tags: [`@${client.clientTag}`, `@${client.accountName}`, '@Advanced'],
         testData: data
     }, undefined, '0010a');
diff --git a/playwright-tests/tests/advanced/0011a_ItacNoAdas.ts b/playwright-tests/tests/advanced/0011a_ItacNoAdas.ts
index bf008707..8bffcbf0 100644
--- a/playwright-tests/tests/advanced/0011a_ItacNoAdas.ts
+++ b/playwright-tests/tests/advanced/0011a_ItacNoAdas.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0011a${faker.string.uuid().substring(0, 6)}`;
+const policyNumber = `~AutomatedScenario0011a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0011a', customerDetails, policyNumber);
 
 const advancedScenario0011Data: Partial<ITestData> = {
@@ -33,13 +33,13 @@ const advancedScenario0011Data: Partial<ITestData> = {
     isDuplicateClaim: false,
     isPolicyFound: true,
     isNoComp: false,
-    isItac: true,
+    isItac: false,
     hasStateLawPopup: false,
     endorsements: [
         {
             endorsementType: EndorsementType.Educator,
             isOnPolicy: true,
-            isClickYes: false
+            isClickYes: true
         }
     ],
     partQuestions: undefined,
@@ -48,7 +48,7 @@ const advancedScenario0011Data: Partial<ITestData> = {
     customerDetails: customerDetails,
     claimDetails: {
         policyNumber: policyNumber,
-        policyDeductible: 500,
+        policyDeductible: 0,
         damageDate: '2023-03-01',
         damageCause: faker.helpers.enumValue(DamageType)
     },
diff --git a/playwright-tests/tests/advanced/0012a_ItacDropOff.ts b/playwright-tests/tests/advanced/0012a_ItacDropOff.ts
index 3cfe4788..213ec490 100644
--- a/playwright-tests/tests/advanced/0012a_ItacDropOff.ts
+++ b/playwright-tests/tests/advanced/0012a_ItacDropOff.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0012a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0012a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0012a', customerDetails, policyNumber);
 
 const advancedScenario0012Data: Partial<ITestData> = {
@@ -48,7 +48,7 @@ const advancedScenario0012Data: Partial<ITestData> = {
     customerDetails: customerDetails,
     claimDetails: {
         policyNumber: policyNumber,
-        policyDeductible: 500,
+        policyDeductible: 9999,
         damageDate: '2023-09-01',
         damageCause: faker.helpers.enumValue(DamageType)
     },
diff --git a/playwright-tests/tests/advanced/0013a_ItacMobile.ts b/playwright-tests/tests/advanced/0013a_ItacMobile.ts
index 3e0cf9cc..288f631e 100644
--- a/playwright-tests/tests/advanced/0013a_ItacMobile.ts
+++ b/playwright-tests/tests/advanced/0013a_ItacMobile.ts
@@ -1,6 +1,6 @@
 import ClientData from "@business-logic/data/ClientData";
 import TestCase from "@business-logic/types/TestCase";
-import { DamageType, EndorsementType, ServiceLocation, ServicePackage, VehicleDamage } from "@business-logic/types/Enums";
+import { DamageType, EndorsementType, PaymentType, ServiceLocation, ServicePackage, VehicleDamage } from "@business-logic/types/Enums";
 import { ITestData } from "@business-logic/types/ITestData"
 import { faker } from "@faker-js/faker";
 import { getNextWeekday } from "@impl/utils/DateUtils";
@@ -11,9 +11,9 @@ import { IAddress } from "@business-logic/types/IAddress";
 const nextWeekday = getNextWeekday();
 const customerAddress: IAddress = {
     street: faker.location.streetAddress(),
-    city: 'Birmingham',
-    state: 'AL',
-    postalCode: '35118',
+    city: 'Worthington',
+    state: 'OH',
+    postalCode: '43085',
     country: 'United States'
 }
 const customerDetails: ICustomerDetails = {
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0013a${faker.string.uuid().substring(0, 6)}`;
+const policyNumber = `~AutomatedScenario0013a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0013a', customerDetails, policyNumber);
 
 const advancedScenario0013Data: Partial<ITestData> = {
@@ -33,13 +33,13 @@ const advancedScenario0013Data: Partial<ITestData> = {
     isDuplicateClaim: false,
     isPolicyFound: true,
     isNoComp: false,
-    isItac: true,
+    isItac: false,
     hasStateLawPopup: false,
     endorsements: [
         {
             endorsementType: EndorsementType.Educator,
             isOnPolicy: true,
-            isClickYes: false
+            isClickYes: true
         }
     ],
     vehiclePartQuestions: [
@@ -49,7 +49,7 @@ const advancedScenario0013Data: Partial<ITestData> = {
     customerDetails: customerDetails,
     claimDetails: {
         policyNumber: policyNumber,
-        policyDeductible: 9999,
+        policyDeductible: 0,
         damageDate: '2023-08-01',
         damageCause: faker.helpers.enumValue(DamageType)
     },
@@ -68,7 +68,9 @@ const advancedScenario0013Data: Partial<ITestData> = {
         serviceAddress: customerAddress,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultCreditCardDetails()
+    paymentDetails: {
+        paymentType: PaymentType.PayAtService
+    }
 
 }
 
@@ -80,7 +82,7 @@ for (const client of advancedClients) {
     const data = { ...advancedScenario0013Data };
     data.clientTag = client.clientTag;
     const tc = new TestCase({
-        name: `0013a Advanced ITAC Mobile Client: "${client.accountName}"`,
+        name: `0013a Advanced $0 Deductible with Vaps Mobile Client: "${client.accountName}"`,
         tags: [`@${client.clientTag}`, `@${client.accountName}`, '@Advanced'],
         testData: data
     }, undefined, '0013a');
diff --git a/playwright-tests/tests/advanced/0014a_NoCompAdas.ts b/playwright-tests/tests/advanced/0014a_NoCompAdas.ts
index c8a4c414..919833c0 100644
--- a/playwright-tests/tests/advanced/0014a_NoCompAdas.ts
+++ b/playwright-tests/tests/advanced/0014a_NoCompAdas.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0014a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0014a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0014a', customerDetails, policyNumber);
 
 const advancedScenario0014Data: Partial<ITestData> = {
@@ -33,13 +33,13 @@ const advancedScenario0014Data: Partial<ITestData> = {
     isDuplicateClaim: false,
     isPolicyFound: true,
     isNoComp: true,
-    isRecalWarning: true,
+    isRecalWarning: false,
     hasStateLawPopup: false,
     endorsements: [
         {
             endorsementType: EndorsementType.Educator,
             isOnPolicy: true,
-            isClickYes: true
+            isClickYes: false
         }
     ],
     partQuestions: undefined,
diff --git a/playwright-tests/tests/advanced/0017a_NoCompPremium.ts b/playwright-tests/tests/advanced/0017a_NoCompPremium.ts
index 6852eb76..5c70f919 100644
--- a/playwright-tests/tests/advanced/0017a_NoCompPremium.ts
+++ b/playwright-tests/tests/advanced/0017a_NoCompPremium.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0017a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0017a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0017a', customerDetails, policyNumber);
 
 const advancedScenario0017Data: Partial<ITestData> = {
diff --git a/playwright-tests/tests/advanced/0018a_NoCompGlassOnly.ts b/playwright-tests/tests/advanced/0018a_NoCompGlassOnly.ts
index 4208b0d9..94619a0b 100644
--- a/playwright-tests/tests/advanced/0018a_NoCompGlassOnly.ts
+++ b/playwright-tests/tests/advanced/0018a_NoCompGlassOnly.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0018a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0018a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0018a', customerDetails, policyNumber);
 
 const advancedScenario0018Data: Partial<ITestData> = {
diff --git a/playwright-tests/tests/advanced/0019a_NoCompEditVehicle.ts b/playwright-tests/tests/advanced/0019a_NoCompEditVehicle.ts
index 5be94a82..d9b4c818 100644
--- a/playwright-tests/tests/advanced/0019a_NoCompEditVehicle.ts
+++ b/playwright-tests/tests/advanced/0019a_NoCompEditVehicle.ts
@@ -31,7 +31,7 @@ const vehicleDetails: IVehicleDetails = {
     style: '4 door sedan'
 };
 
-const policyNumber = `~AutomatedScenario0019a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0019a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0019a', customerDetails, policyNumber);
 
 const advancedScenario0019Data: Partial<ITestData> = {
diff --git a/playwright-tests/tests/advanced/0020a_NoCompChangeLoc.ts b/playwright-tests/tests/advanced/0020a_NoCompChangeLoc.ts
index 1f9f86fb..a565be44 100644
--- a/playwright-tests/tests/advanced/0020a_NoCompChangeLoc.ts
+++ b/playwright-tests/tests/advanced/0020a_NoCompChangeLoc.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0020a${faker.string.uuid().substring(0,6)}`;
+const policyNumber = `~AutomatedScenario0020a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0020a', customerDetails, policyNumber);
 
 const advancedScenario0020Data: Partial<ITestData> = {
@@ -60,12 +60,14 @@ const advancedScenario0020Data: Partial<ITestData> = {
         serviceLocation: ServiceLocation.Mobile,
         serviceAddress: {
             street: faker.location.streetAddress(),
-            city: 'Goose Creek',
-            state: 'SC',
-            postalCode: '29445',
+            city: 'Worthington',
+            state: 'OH',
+            postalCode: '43085',
             country: 'US'
         },
-        alternateServiceZip: '29445',
+        alternateServiceZip: '43085',
+        alternateMobileCity: 'Worthington',
+        alternateMobileStreetAddress: '177 Franklin Ave',
         appointmentDate: nextWeekday
     },
     paymentDetails: {
diff --git a/playwright-tests/tests/advanced/0021a_VehicleByPlate.ts b/playwright-tests/tests/advanced/0021a_VehicleByPlate.ts
index 810e74bf..f5acaccf 100644
--- a/playwright-tests/tests/advanced/0021a_VehicleByPlate.ts
+++ b/playwright-tests/tests/advanced/0021a_VehicleByPlate.ts
@@ -23,13 +23,14 @@ const customerDetails: ICustomerDetails = {
     }
 }
 
-const policyNumber = `~AutomatedScenario0021a${faker.string.uuid().substring(0, 6)}`;
+const policyNumber = `~AutomatedScenario0021a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0021a', customerDetails, policyNumber);
 
 const advancedScenario0021Data: Partial<ITestData> = {
     clientTag: '',
     isDuplicateClaim: false,
     isPolicyFound: true,
+    isUnverifiedPolicyAfterVehicleLookup: true,
     isNoComp: false,
     hasStateLawPopup: true,
     endorsements: undefined,
@@ -54,8 +55,8 @@ const advancedScenario0021Data: Partial<ITestData> = {
         model: 'RX 300',
         style: undefined,
         vehicleLookupType: VehicleLookupType.LicensePlateNumber,
-        licensePlateNumber: ['NoPlate753', 'BQ40903','1111'],
-        licensePlateState: ['Illinois','Illinois','California'],
+        licensePlateNumber: ['NoPlate753', 'GAH2307','1111'],
+        licensePlateState: ['Illinois','Ohio','California'],
     },
     vehicleDamage: [
         VehicleDamage.WindshieldCrack,
diff --git a/playwright-tests/tests/advanced/0022a_VehicleByVIN.ts b/playwright-tests/tests/advanced/0022a_VehicleByVIN.ts
index 7866c3eb..dffddf16 100644
--- a/playwright-tests/tests/advanced/0022a_VehicleByVIN.ts
+++ b/playwright-tests/tests/advanced/0022a_VehicleByVIN.ts
@@ -23,13 +23,14 @@ const customerDetails: ICustomerDetails = {
     }
 }
 
-const policyNumber = `~AutomatedScenario0022a${faker.string.uuid().substring(0, 6)}`;
+const policyNumber = `~AutomatedScenario0022a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0022a', customerDetails, policyNumber);
 
 const advancedScenario0022Data: Partial<ITestData> = {
     clientTag: '',
     isDuplicateClaim: false,
     isPolicyFound: true,
+    isUnverifiedPolicyAfterVehicleLookup: true,
     isNoComp: false,
     hasStateLawPopup: true,
     endorsements: undefined,
diff --git a/playwright-tests/tests/advanced/0024a_VehicleByVINUnverifiedBailout.ts b/playwright-tests/tests/advanced/0024a_VehicleByVINUnverifiedBailout.ts
index 7df0a5a4..26f1daa8 100644
--- a/playwright-tests/tests/advanced/0024a_VehicleByVINUnverifiedBailout.ts
+++ b/playwright-tests/tests/advanced/0024a_VehicleByVINUnverifiedBailout.ts
@@ -23,7 +23,7 @@ const customerDetails: ICustomerDetails = {
     }
 }
 
-const policyNumber = `~AutomatedScenario0024a${faker.string.uuid().substring(0, 6)}`;
+const policyNumber = `~AutomatedScenario0024a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0024a', customerDetails, policyNumber);
 
 const advancedScenario0024Data: Partial<ITestData> = {
@@ -50,14 +50,14 @@ const advancedScenario0024Data: Partial<ITestData> = {
     policySoap: policySoap,
     vehicleDetails: {
         year: '2015',
-        make: 'Ford',
-        model: 'F Series F150',
-        style: '2 door super cab',
+        make: 'Audi',
+        model: 'A7',
+        style: '4 door hatchback',
         vehicleLookupType: VehicleLookupType.Address,
         address: [
             { street: '9 Test Street', city: 'Columbus', state: 'OH', postalCode: '43220', lastName: 'Test' },
             { street: '8621 GREENLEAF AVE', city: 'Whittier', state: 'California', postalCode: '90602', lastName: 'Johnson' },
-            { street: '10212 JEWEL CT', city: 'Conroe', state: 'Texas', postalCode: '77385', lastName: 'Reed' }
+            { street: '6531 CANYON RANCH', city: 'Frisco', state: 'Texas', postalCode: '75036', lastName: 'TRAINOR' }
         ],
     },
     vehicleDamage: [
diff --git a/playwright-tests/tests/advanced/0025a_VehicleByVINUnverifiedBailout.ts b/playwright-tests/tests/advanced/0025a_VehicleByVINUnverifiedBailout.ts
index f3e6c7a8..4851c4ab 100644
--- a/playwright-tests/tests/advanced/0025a_VehicleByVINUnverifiedBailout.ts
+++ b/playwright-tests/tests/advanced/0025a_VehicleByVINUnverifiedBailout.ts
@@ -23,7 +23,7 @@ const customerDetails: ICustomerDetails = {
     }
 }
 
-const policyNumber = `~AutomatedScenario0025a${faker.string.uuid().substring(0, 6)}`;
+const policyNumber = `~AutomatedScenario0025a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0025a', customerDetails, policyNumber);
 
 const advancedScenario0025Data: Partial<ITestData> = {
diff --git a/playwright-tests/tests/advanced/0028a_ItacCancelMyClaim.ts b/playwright-tests/tests/advanced/0028a_ItacCancelMyClaim.ts
index 8479feb4..1f805cc3 100644
--- a/playwright-tests/tests/advanced/0028a_ItacCancelMyClaim.ts
+++ b/playwright-tests/tests/advanced/0028a_ItacCancelMyClaim.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0028a${faker.string.uuid().substring(0, 6)}`;
+const policyNumber = `~AutomatedScenario0028a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0028a', customerDetails, policyNumber);
 
 const advancedScenario0028aData: Partial<ITestData> = {
diff --git a/playwright-tests/tests/advanced/0030a_PartsServiceBailout.ts b/playwright-tests/tests/advanced/0030a_PartsServiceBailout.ts
index 07752f51..fa565b37 100644
--- a/playwright-tests/tests/advanced/0030a_PartsServiceBailout.ts
+++ b/playwright-tests/tests/advanced/0030a_PartsServiceBailout.ts
@@ -25,7 +25,7 @@ const customerDetails: ICustomerDetails = {
     address: customerAddress
 }
 
-const policyNumber = `~AutomatedScenario0030a${faker.string.uuid().substring(0, 6)}`;
+const policyNumber = `~AutomatedScenario0030a${crypto.randomUUID().replace(/-/g, '').slice(0, 16).toUpperCase()}`; // Ensure unique policy number for each test run since same key in request can cause 500 error
 const policySoap = MockPolicyData.getPolicySoapByScenario('0030a', customerDetails, policyNumber);
 
 const advancedScenario0030aData: Partial<ITestData> = {