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 4fb5012d..12242237 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
@@ -347,18 +347,36 @@ LINE_73_M_TOTAL_INTERNAL_GAINS_W: tuple[float, ...] = (
 # ============================================================================
 # §6 Solar gains — cert-derived inputs + expected outputs
 # ============================================================================
-# 3 wall windows across 2 glazing types (Manufacturer-declared g⊥):
-#   "Double between 2002" g=0.72: E 1.28, W 6.76
-#   "Double with unknown" g=0.76: W 1.17
-# All PVC frame. No roof windows, no rooflights.
+# 7 wall windows mirroring the Summary §11 1:1, matching the Elmhurst
+# mapper's per-row extraction (mapper-vs-hand-built field-parity test).
+# Per-window curtain-transform U_eff sums to the same total as the prior
+# 3-window collapsed encoding (same total area per glazing-type group:
+# g=0.72/U=2.0 → 8.04 m² across 6 rows; g=0.76/U=2.8 → 1.17 m² in 1
+# row). Cascade output is unchanged at 1e-4.
+#
+# Single-bp dwelling → every window's `window_location` is "Main".
 SECTION_6_VERTICAL_WINDOWS: tuple[SapWindow, ...] = (
-    # 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),
+    # Windows 1 — W
+    make_window(orientation=7, width=1.8, height=1.0, solar_transmittance=0.72,
+                u_value=2.0, window_location="Main"),
+    # Windows 1 — W
+    make_window(orientation=7, width=1.7, height=1.0, solar_transmittance=0.72,
+                u_value=2.0, window_location="Main"),
+    # Windows 1 — E
+    make_window(orientation=3, width=1.28, height=1.0, solar_transmittance=0.72,
+                u_value=2.0, window_location="Main"),
+    # Windows 1 — W
+    make_window(orientation=7, width=1.36, height=1.0, solar_transmittance=0.72,
+                u_value=2.0, window_location="Main"),
+    # Windows 1 — W
+    make_window(orientation=7, width=1.36, height=1.0, solar_transmittance=0.72,
+                u_value=2.0, window_location="Main"),
+    # Windows 2 — W (raw U=2.8 pre-2002, g_⊥=0.76)
+    make_window(orientation=7, width=1.17, height=1.0, solar_transmittance=0.76,
+                u_value=2.8, window_location="Main"),
+    # Windows 1 — W
+    make_window(orientation=7, width=0.54, height=1.0, solar_transmittance=0.72,
+                u_value=2.0, window_location="Main"),
 )
 SECTION_6_ROOF_WINDOWS: tuple[RoofWindowInput, ...] = ()
 SECTION_6_ROOFLIGHTS: tuple[RooflightInput, ...] = ()