diff --git a/playwright-tests/tests/advanced/0001a_ReplaceInShopCredit.ts b/playwright-tests/tests/advanced/0001a_ReplaceInShopCredit.ts
index 0a7c5d4d..1c6d70dd 100644
--- a/playwright-tests/tests/advanced/0001a_ReplaceInShopCredit.ts
+++ b/playwright-tests/tests/advanced/0001a_ReplaceInShopCredit.ts
@@ -59,7 +59,7 @@ const advancedScenario0001Data: Partial<ITestData> = {
         shopAddress: undefined,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultCreditCardDetails()
+    paymentDetailsAdyen: ClientData.getDefaultCreditCardDetailsAdyen()
 }
 
 // TODO: Add validation for deductible/covered amount
diff --git a/playwright-tests/tests/advanced/0002a_ReplaceOemEndorsement.ts b/playwright-tests/tests/advanced/0002a_ReplaceOemEndorsement.ts
index 07adbdf3..c124598f 100644
--- a/playwright-tests/tests/advanced/0002a_ReplaceOemEndorsement.ts
+++ b/playwright-tests/tests/advanced/0002a_ReplaceOemEndorsement.ts
@@ -106,7 +106,7 @@ const advancedScenario0002Data: Partial<ITestData> = {
         shopAddress: undefined,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultPaypalDetails()
+    paymentDetailsAdyen: ClientData.getPaypalDetailsAdyen()
 
 }
 
diff --git a/playwright-tests/tests/advanced/0003a_MobileAfterpay.ts b/playwright-tests/tests/advanced/0003a_MobileAfterpay.ts
index 6243fa2e..9ea2e07b 100644
--- a/playwright-tests/tests/advanced/0003a_MobileAfterpay.ts
+++ b/playwright-tests/tests/advanced/0003a_MobileAfterpay.ts
@@ -74,7 +74,7 @@ const advancedScenario0003Data: Partial<ITestData> = {
         serviceAddress: customerAddress,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultAfterpayDetails()
+    paymentDetailsAdyen: ClientData.getAfterpayDetailsAdyen()
 
 }
 
diff --git a/playwright-tests/tests/advanced/0010a_RearGlass.ts b/playwright-tests/tests/advanced/0010a_RearGlass.ts
index c793e224..bc4e0c8f 100644
--- a/playwright-tests/tests/advanced/0010a_RearGlass.ts
+++ b/playwright-tests/tests/advanced/0010a_RearGlass.ts
@@ -54,7 +54,7 @@ const advancedScenario0010Data: Partial<ITestData> = {
         // },
     ],
     isSafelite: true,
-    servicePackage: faker.helpers.enumValue(ServicePackage),
+    servicePackage: ServicePackage.Premium,
     customerDetails: customerDetails,
     claimDetails: {
         policyNumber: policyNumber,
diff --git a/playwright-tests/tests/advanced/0011a_ItacNoAdas.ts b/playwright-tests/tests/advanced/0011a_ItacNoAdas.ts
index 8bffcbf0..7d3a1b04 100644
--- a/playwright-tests/tests/advanced/0011a_ItacNoAdas.ts
+++ b/playwright-tests/tests/advanced/0011a_ItacNoAdas.ts
@@ -94,7 +94,7 @@ const advancedScenario0011Data: Partial<ITestData> = {
         shopAddress: undefined,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultPaypalDetails()
+    paymentDetailsAdyen: ClientData.getPaypalDetailsAdyen()
 
 }
 
diff --git a/playwright-tests/tests/advanced/0012a_ItacDropOff.ts b/playwright-tests/tests/advanced/0012a_ItacDropOff.ts
index 213ec490..9f393b66 100644
--- a/playwright-tests/tests/advanced/0012a_ItacDropOff.ts
+++ b/playwright-tests/tests/advanced/0012a_ItacDropOff.ts
@@ -44,7 +44,7 @@ const advancedScenario0012Data: Partial<ITestData> = {
     ],
     partQuestions: undefined,
     isSafelite: true,
-    servicePackage: faker.helpers.enumValue(ServicePackage),
+    servicePackage: ServicePackage.GlassOnly,
     customerDetails: customerDetails,
     claimDetails: {
         policyNumber: policyNumber,
@@ -68,7 +68,7 @@ const advancedScenario0012Data: Partial<ITestData> = {
         shopAddress: undefined,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultAfterpayDetails()
+    paymentDetailsAdyen: ClientData.getAfterpayDetailsAdyen()
 
 }
 
diff --git a/playwright-tests/tests/advanced/0014a_NoCompAdas.ts b/playwright-tests/tests/advanced/0014a_NoCompAdas.ts
index 919833c0..a88d2ba9 100644
--- a/playwright-tests/tests/advanced/0014a_NoCompAdas.ts
+++ b/playwright-tests/tests/advanced/0014a_NoCompAdas.ts
@@ -68,7 +68,7 @@ const advancedScenario0014Data: Partial<ITestData> = {
         alternateServiceZip: '43016',
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultAfterpayDetails()
+    paymentDetailsAdyen: ClientData.getAfterpayDetailsAdyen()
 
 }
 
diff --git a/playwright-tests/tests/advanced/0016a_NoCompAllGlass.ts b/playwright-tests/tests/advanced/0016a_NoCompAllGlass.ts
index e336e3ea..23796265 100644
--- a/playwright-tests/tests/advanced/0016a_NoCompAllGlass.ts
+++ b/playwright-tests/tests/advanced/0016a_NoCompAllGlass.ts
@@ -103,7 +103,7 @@ const advancedScenario0016Data: Partial<ITestData> = {
         serviceAddress: undefined,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultPaypalDetails()
+    paymentDetailsAdyen: ClientData.getPaypalDetailsAdyen()
 
 }
 
diff --git a/playwright-tests/tests/advanced/0018a_NoCompGlassOnly.ts b/playwright-tests/tests/advanced/0018a_NoCompGlassOnly.ts
index 94619a0b..9cb32f2a 100644
--- a/playwright-tests/tests/advanced/0018a_NoCompGlassOnly.ts
+++ b/playwright-tests/tests/advanced/0018a_NoCompGlassOnly.ts
@@ -71,7 +71,7 @@ const advancedScenario0018Data: Partial<ITestData> = {
         shopAddress: undefined,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultAfterpayDetails()
+    paymentDetailsAdyen: ClientData.getAfterpayDetailsAdyen()
 
 }
 
diff --git a/playwright-tests/tests/advanced/0019a_NoCompEditVehicle.ts b/playwright-tests/tests/advanced/0019a_NoCompEditVehicle.ts
index d9b4c818..48ce03b8 100644
--- a/playwright-tests/tests/advanced/0019a_NoCompEditVehicle.ts
+++ b/playwright-tests/tests/advanced/0019a_NoCompEditVehicle.ts
@@ -73,7 +73,7 @@ const advancedScenario0019Data: Partial<ITestData> = {
         serviceAddress: customerAddress,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultPaypalDetails()
+    paymentDetailsAdyen: ClientData.getPaypalDetailsAdyen()
 
 }
 
diff --git a/playwright-tests/tests/advanced/0028a_ItacCancelMyClaim.ts b/playwright-tests/tests/advanced/0028a_ItacCancelMyClaim.ts
index 358dfbd5..9e3eb79e 100644
--- a/playwright-tests/tests/advanced/0028a_ItacCancelMyClaim.ts
+++ b/playwright-tests/tests/advanced/0028a_ItacCancelMyClaim.ts
@@ -72,7 +72,7 @@ const advancedScenario0028aData: Partial<ITestData> = {
         serviceAddress: customerAddress,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultCreditCardDetails()
+    paymentDetailsAdyen: ClientData.getDefaultCreditCardDetailsAdyen()
 
 }
 
diff --git a/playwright-tests/tests/advanced/0030a_APIErrorBailout.ts b/playwright-tests/tests/advanced/0030a_APIErrorBailout.ts
index e392adc2..d7712082 100644
--- a/playwright-tests/tests/advanced/0030a_APIErrorBailout.ts
+++ b/playwright-tests/tests/advanced/0030a_APIErrorBailout.ts
@@ -67,7 +67,7 @@ const advancedScenario0030aData: Partial<ITestData> = {
         serviceAddress: customerAddress,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultCreditCardDetails()
+    paymentDetailsAdyen: ClientData.getDefaultCreditCardDetailsAdyen()
 
 }
 
diff --git a/playwright-tests/tests/advanced/0031a_ReplaceServiceableBigTruck.ts b/playwright-tests/tests/advanced/0031a_ReplaceServiceableBigTruck.ts
index aa28bae3..bf4218e5 100644
--- a/playwright-tests/tests/advanced/0031a_ReplaceServiceableBigTruck.ts
+++ b/playwright-tests/tests/advanced/0031a_ReplaceServiceableBigTruck.ts
@@ -66,7 +66,7 @@ const advancedScenario0031Data: Partial<ITestData> = {
         shopAddress: undefined,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultPaypalDetails()//ClientData.getDefaultCreditCardDetails()
+    paymentDetailsAdyen: ClientData.getPaypalDetailsAdyen()
 }
 
 // TODO: Add validation for deductible/covered amount
diff --git a/playwright-tests/tests/advanced/0032a_DeclineNonServiceableBigTruck.ts b/playwright-tests/tests/advanced/0032a_DeclineNonServiceableBigTruck.ts
index b2433ced..20185f72 100644
--- a/playwright-tests/tests/advanced/0032a_DeclineNonServiceableBigTruck.ts
+++ b/playwright-tests/tests/advanced/0032a_DeclineNonServiceableBigTruck.ts
@@ -63,7 +63,7 @@ const advancedScenario0032Data: Partial<ITestData> = {
         shopAddress: undefined,
         appointmentDate: nextWeekday
     },
-    paymentDetails: ClientData.getDefaultPaypalDetails(),//ClientData.getDefaultCreditCardDetails()
+    paymentDetailsAdyen: ClientData.getPaypalDetailsAdyen(),
     isNonServiceable: true,
 }