diff --git a/src/atoms/ProviderSelection/ProviderSelection.spec.ts b/src/atoms/ProviderSelection/ProviderSelection.spec.ts
index d4da296..e84f8db 100644
--- a/src/atoms/ProviderSelection/ProviderSelection.spec.ts
+++ b/src/atoms/ProviderSelection/ProviderSelection.spec.ts
@@ -32,7 +32,7 @@ export const ProviderSelectionSpec = async ({
     autoClose?: boolean;
   }) => {
     const buttonText = button.innerText;
-    await expect(button).toHaveClass('bg-slate-300');
+    await expect(button).toHaveClass('border-slate-200');
     await userEvent.click(button);
     const closeButton = await canvas.findByLabelText('Close filter');
     await expect(closeButton).toBeVisible();
@@ -42,16 +42,17 @@ export const ProviderSelectionSpec = async ({
     await expect(filterButton).toHaveTextContent(filterName);
     await userEvent.click(filterButton);
     if (!autoClose) {
-      await expect(filterButton).toHaveClass('bg-primary');
+      await expect(filterButton).toHaveClass('ring-secondary');
       await userEvent.click(closeButton);
     }
     await expect(filterButton).not.toBeVisible();
-    await expect(button).toHaveClass('bg-secondary');
+    await expect(button).toHaveClass('ring-secondary');
+    await expect(button).toHaveClass('text-primary');
     const clearFilter = await canvas.findByLabelText(
       `Clear ${buttonText} filter`
     );
     await userEvent.click(clearFilter);
-    await expect(button).toHaveClass('bg-slate-300');
+    await expect(button).toHaveClass('border-slate-200');
   };
   await testApplyFilter({
     button: ethnicityButton,
@@ -75,7 +76,7 @@ export const ProviderSelectionSpec = async ({
   });
   await testApplyFilter({
     button: locationButton,
-    filterName: 'NY - Union Square',
+    filterName: 'Union Square',
     autoClose: true
   });
 };
diff --git a/src/molecules/Scheduler/Scheduler.spec.ts b/src/molecules/Scheduler/Scheduler.spec.ts
index 0736185..767521f 100644
--- a/src/molecules/Scheduler/Scheduler.spec.ts
+++ b/src/molecules/Scheduler/Scheduler.spec.ts
@@ -15,13 +15,13 @@ export const SchedulerSpec = async ({
 
   /** Get all elements of interests */
   const cherryCreekButton = await canvas.findByRole('button', {
-    name: 'CO - Cherry Creek'
+    name: 'Cherry Creek'
   });
   const unionSquareButton = await canvas.findByRole('button', {
-    name: 'NY - Union Square'
+    name: 'Union Square'
   });
   const virtualButton = await canvas.findByRole('button', {
-    name: 'Virtual'
+    name: 'Telehealth'
   });
   const prevWeekButton = await canvas.findByLabelText('Go to previous week');
   const nextWeekButton = await canvas.findByLabelText('Go to next week');