diff --git a/playwright-tests/tests/0012_EssentialUniqueGlass.ts b/playwright-tests/tests/0012_EssentialUniqueGlass.ts
index bff695b5..0ad3253f 100644
--- a/playwright-tests/tests/0012_EssentialUniqueGlass.ts
+++ b/playwright-tests/tests/0012_EssentialUniqueGlass.ts
@@ -14,7 +14,7 @@ const essentialUnqiqueGlassData: Partial<ITestData> = {
     endorsements: [],
     isReplace: false,
     isSafelite: true,
-    servicePackage: faker.helpers.enumValue(ServicePackage),
+    servicePackage: ServicePackage.GlassOnly,
     customerDetails: {
         firstName: faker.person.firstName(),
         lastName: faker.person.lastName(),
@@ -51,12 +51,12 @@ const essentialUnqiqueGlassData: Partial<ITestData> = {
         {
             partQuestionType: PartQuestionType.WindshieldColor,
             isOnPage: true,
-            optionToSelect: 'Third Visor Frit'
+            optionToSelect: '3rd Visor Frit'
         },
         {
             partQuestionType: PartQuestionType.DriverSideColor,
             isOnPage: true,
-            optionToSelect: 'Solar, Driver side, Rear, Movable, Exc. 118" Wb, Aftermarket'
+            optionToSelect: 'Solar~left~rear~movable~exc. 118" Wb~aftermarket'
         },
     ],
     appointmentDetails: {
diff --git a/playwright-tests/tests/0016_EssentialRepairInShop.ts b/playwright-tests/tests/0016_EssentialRepairInShop.ts
index 27022ac5..b6d5f403 100644
--- a/playwright-tests/tests/0016_EssentialRepairInShop.ts
+++ b/playwright-tests/tests/0016_EssentialRepairInShop.ts
@@ -15,7 +15,7 @@ const essentialHappyPathData: Partial<ITestData> = {
     isReplace: false,
     partQuestions: undefined,
     isSafelite: true,
-    servicePackage: faker.helpers.enumValue(ServicePackage),
+    servicePackage: ServicePackage.GlassOnly,
     customerDetails: {
         firstName: faker.person.firstName(),
         lastName: faker.person.lastName(),
diff --git a/playwright-tests/tests/advanced/0007a_RepairStateLanguage.ts b/playwright-tests/tests/advanced/0007a_RepairStateLanguage.ts
index cfec1614..0ece73cd 100644
--- a/playwright-tests/tests/advanced/0007a_RepairStateLanguage.ts
+++ b/playwright-tests/tests/advanced/0007a_RepairStateLanguage.ts
@@ -33,7 +33,7 @@ const advancedScenario0007Data: Partial<ITestData> = {
     isDuplicateClaim: false,
     isPolicyFound: true,
     isNoComp: false,
-    hasStateLawPopup: true,
+    hasStateLawPopup: false,
     endorsements: undefined,
     vehiclePartQuestions: [
         // {
diff --git a/playwright-tests/tests/advanced/0015a_NoCompPartQuestions.ts b/playwright-tests/tests/advanced/0015a_NoCompPartQuestions.ts
index 063059f9..e4aca6e3 100644
--- a/playwright-tests/tests/advanced/0015a_NoCompPartQuestions.ts
+++ b/playwright-tests/tests/advanced/0015a_NoCompPartQuestions.ts
@@ -46,7 +46,7 @@ const advancedScenario0015Data: Partial<ITestData> = {
         {
             partQuestionType: PartQuestionType.WindshieldColor,
             isOnPage: true,
-            optionToSelect: 'Heated glass, Heated glass Wiper Park'
+            optionToSelect: 'Heated glass, Hwp'
         },
         {
             partQuestionType: PartQuestionType.DriverFrontColor,