diff --git a/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000474.py b/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000474.py
index 0f28ebce..710b059a 100644
--- a/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000474.py
+++ b/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000474.py
@@ -323,9 +323,13 @@ LINE_73_M_TOTAL_INTERNAL_GAINS_W: tuple[float, ...] = (
 #   "Double with unknown" g=0.76: E 3.74, NW 1.76
 # All PVC frame. No roof windows, no rooflights.
 SECTION_6_VERTICAL_WINDOWS: tuple[SapWindow, ...] = (
-    make_window(orientation=3, width=3.74, height=1.0, solar_transmittance=0.72),
-    make_window(orientation=4, width=0.50, height=1.0, solar_transmittance=0.72),
-    make_window(orientation=8, width=1.98, height=1.0, solar_transmittance=0.72),
+    # Windows 1 (PDF (27) U_eff=1.8519, raw U=2.0 post-2002 default; g_⊥=0.72):
+    # 3 entries, total area 6.22 m².
+    make_window(orientation=3, width=3.74, height=1.0, solar_transmittance=0.72, u_value=2.0),
+    make_window(orientation=4, width=0.50, height=1.0, solar_transmittance=0.72, u_value=2.0),
+    make_window(orientation=8, width=1.98, height=1.0, solar_transmittance=0.72, u_value=2.0),
+    # Windows 2 (PDF (27) U_eff=2.5180, raw U=2.8 pre-2002 default; g_⊥=0.76):
+    # 2 entries, total area 5.50 m². make_window default u_value=2.8 matches.
     make_window(orientation=3, width=3.74, height=1.0, solar_transmittance=0.76),
     make_window(orientation=8, width=1.76, height=1.0, solar_transmittance=0.76),
 )
diff --git a/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000477.py b/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000477.py
index 7666ebd3..8cbd35de 100644
--- a/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000477.py
+++ b/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000477.py
@@ -291,8 +291,12 @@ LINE_73_M_TOTAL_INTERNAL_GAINS_W: tuple[float, ...] = (
 #   "Double with unknown" g=0.76: W 1.17
 # All PVC frame. No roof windows, no rooflights.
 SECTION_6_VERTICAL_WINDOWS: tuple[SapWindow, ...] = (
-    make_window(orientation=3, width=1.28, height=1.0, solar_transmittance=0.72),
-    make_window(orientation=7, width=6.76, height=1.0, solar_transmittance=0.72),
+    # Windows 1 (PDF (27) U_eff=1.8519, raw U=2.0 post-2002; g_⊥=0.72):
+    # area 1.28 + 6.76 = 8.04 m².
+    make_window(orientation=3, width=1.28, height=1.0, solar_transmittance=0.72, u_value=2.0),
+    make_window(orientation=7, width=6.76, height=1.0, solar_transmittance=0.72, u_value=2.0),
+    # Windows 2 (PDF (27) U_eff=2.5180, raw U=2.8 pre-2002; g_⊥=0.76):
+    # area 1.17 m². make_window default u_value=2.8 matches.
     make_window(orientation=7, width=1.17, height=1.0, solar_transmittance=0.76),
 )
 SECTION_6_ROOF_WINDOWS: tuple[RoofWindowInput, ...] = ()
diff --git a/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000487.py b/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000487.py
index 602bbd13..b242aca6 100644
--- a/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000487.py
+++ b/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000487.py
@@ -310,8 +310,12 @@ LINE_73_M_TOTAL_INTERNAL_GAINS_W: tuple[float, ...] = (
 #   "Double between 2002" g=0.72: S 6.69
 # All PVC frame. No roof windows, no rooflights.
 SECTION_6_VERTICAL_WINDOWS: tuple[SapWindow, ...] = (
+    # Windows 1 (PDF (27) U_eff=2.5180, raw U=2.8 pre-2002; g_⊥=0.76):
+    # area 0.77 m². make_window default u_value=2.8 matches.
     make_window(orientation=5, width=0.77, height=1.0, solar_transmittance=0.76),
-    make_window(orientation=5, width=6.69, height=1.0, solar_transmittance=0.72),
+    # Windows 2 (PDF (27) U_eff=1.3258, raw U=1.4 post-2022; g_⊥=0.72):
+    # area 6.69 m² (1.65 + 5.04). Replaced post-2022 → tighter U.
+    make_window(orientation=5, width=6.69, height=1.0, solar_transmittance=0.72, u_value=1.4),
 )
 SECTION_6_ROOF_WINDOWS: tuple[RoofWindowInput, ...] = ()
 SECTION_6_ROOFLIGHTS: tuple[RooflightInput, ...] = ()