diff --git a/playwright-tests/pages/SchedulePage.ts b/playwright-tests/pages/SchedulePage.ts
index 1b2cc35de..d4d00b6f0 100644
--- a/playwright-tests/pages/SchedulePage.ts
+++ b/playwright-tests/pages/SchedulePage.ts
@@ -123,6 +123,7 @@ export class SchedulePage extends BasePage {
         const { appointmentDetails, customerDetails } = testData;
         // await this.page.waitForTimeout(1000);
         await this.page.waitForSelector('.date-picker', { state: 'visible' });
+        await this.page.locator('#date-picker-fieldset .loader').filter({visible: true}).waitFor({ state: 'hidden' });
         while (!(await this.firstAvailableDate.isVisible())) {
 
             if (appointmentDetails?.appointmentTimeSlot === AppointmentTimeslot.EarlyBird) {
diff --git a/playwright-tests/tests/CashReplaceSwitchToInsuranceProgressiveNoComp.ts b/playwright-tests/tests/CashReplaceSwitchToInsuranceProgressiveNoComp.ts
index a6494792a..91e997986 100644
--- a/playwright-tests/tests/CashReplaceSwitchToInsuranceProgressiveNoComp.ts
+++ b/playwright-tests/tests/CashReplaceSwitchToInsuranceProgressiveNoComp.ts
@@ -1,9 +1,10 @@
 //Imports here
 import { ITestData } from 'framework/TestData'
-import { ServiceLocation } from "safelite-playwright-core";
+import { Flow, ServiceLocation } from "safelite-playwright-core";
 import { DamageType, PartQuestionType, PaymentType } from 'safelite-playwright-core'
 import { ITestCase } from '../framework/Typedefs'
 import { getDefaultTestData, setFakerSeedFromTestName } from 'safelite-playwright-core';
+import { PaymentMethod } from 'framework/localTypes/Enums';
 
 // Set the seed for consistent data generation
 setFakerSeedFromTestName("CashReplaceSwitchToInsuranceProgressiveNoComp");
@@ -13,6 +14,10 @@ const cashReplaceSwitchToInsuranceProgressiveNoCompData: Partial<ITestData> = {
     ...getDefaultTestData(),
 
     isCashInsuranceFlow: true,
+    flow: Flow.Managed,
+
+    // CASH Client
+    paymentMethod: PaymentMethod.SelfPay,
 
     // Override customer details based on provided ZIP code
     customerDetails: {