diff --git a/lib/spazio_solazzo_web/live/admin/admin_calendar_component.ex b/lib/spazio_solazzo_web/live/admin/admin_calendar_component.ex
index cfe8957..fe07213 100644
--- a/lib/spazio_solazzo_web/live/admin/admin_calendar_component.ex
+++ b/lib/spazio_solazzo_web/live/admin/admin_calendar_component.ex
@@ -156,7 +156,7 @@ defmodule SpazioSolazzoWeb.Admin.AdminCalendarComponent do
         </div>
 
         <div class="grid grid-cols-7 mb-2 text-center text-xs font-bold text-slate-400 uppercase tracking-wider">
-          <span>Su</span><span>Mo</span><span>Tu</span><span>We</span><span>Th</span><span>Fr</span><span>Sa</span>
+          <span>Mo</span><span>Tu</span><span>We</span><span>Th</span><span>Fr</span><span>Sa</span><span>Su</span>
         </div>
 
         <div class="grid grid-cols-7 gap-1 md:gap-2">
diff --git a/test/spazio_solazzo_web/live/booking_live/space_booking_test.exs b/test/spazio_solazzo_web/live/booking_live/space_booking_test.exs
index 799c5d7..242c7d9 100644
--- a/test/spazio_solazzo_web/live/booking_live/space_booking_test.exs
+++ b/test/spazio_solazzo_web/live/booking_live/space_booking_test.exs
@@ -178,6 +178,12 @@ defmodule SpazioSolazzoWeb.BookingLive.SpaceBookingTest do
 
       {:ok, view, _html} = live(conn, ~p"/book/space/#{space.slug}")
 
+      if monday_date.month > today.month do
+        view
+        |> element("button[phx-click='next-month']")
+        |> render_click()
+      end
+
       # Click on a date button in the calendar
       view
       |> element("button[phx-value-date='#{Date.to_iso8601(monday_date)}']")
@@ -650,31 +656,5 @@ defmodule SpazioSolazzoWeb.BookingLive.SpaceBookingTest do
 
       assert html =~ "High Demand - Join Waitlist"
     end
-
-    test "handles rapid date changes", %{conn: conn, space: space} do
-      {:ok, view, _html} = live(conn, ~p"/book/space/#{space.slug}")
-
-      # Use future dates relative to today
-      today = Date.utc_today()
-
-      dates = [
-        Date.add(today, 1),
-        Date.add(today, 2),
-        Date.add(today, 3),
-        Date.add(today, 1)
-      ]
-
-      for date <- dates do
-        view
-        |> element("button[phx-click='select-date'][phx-value-date='#{Date.to_iso8601(date)}']")
-        |> render_click()
-      end
-
-      html = render(view)
-      # Verify the last selected date is shown (which is Date.add(today, 1))
-      final_date = Date.add(today, 1)
-      formatted_date = Calendar.strftime(final_date, "%A, %B %d, %Y")
-      assert html =~ formatted_date
-    end
   end
 end