diff --git a/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000516.py b/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000516.py
index 28a2247b..3848264d 100644
--- a/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000516.py
+++ b/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000516.py
@@ -373,12 +373,25 @@ LINE_73_M_TOTAL_INTERNAL_GAINS_W: tuple[float, ...] = (
 # ============================================================================
 # §6 Solar gains — cert-derived inputs + expected outputs
 # ============================================================================
-# 2 wall windows (Manufacturer g⊥=0.76 / PVC): NE 3.88, SW 4.43.
-# 1 roof window (NE 1.18, Manufacturer g⊥=0.76, pitch 45° per RdSAP10
-# Table 24 default, Wood frame FF=0.70). No rooflights.
+# 5 wall windows mirroring the Summary §11 1:1, matching the Elmhurst
+# mapper's per-row extraction. Single glazing-type group (PVC double /
+# g⊥=0.76 / U=2.8); per-orientation totals preserved (cascade-equivalent):
+#   NE (orient=2): 3.88 m² split 2.15 + 1.73 (2 rows)
+#   SW (orient=6): 4.43 m² split 1.94 + 1.67 + 0.82 (3 rows)
+# Plus 1 roof window (NE 1.18, Manufacturer g⊥=0.76, pitch 45° per
+# RdSAP10 Table 24 default, Wood frame FF=0.70). Single-bp dwelling so
+# every window's window_location is "Main". No rooflights.
 SECTION_6_VERTICAL_WINDOWS: tuple[SapWindow, ...] = (
-    make_window(orientation=2, width=3.88, height=1.0, solar_transmittance=0.76),
-    make_window(orientation=6, width=4.43, height=1.0, solar_transmittance=0.76),
+    make_window(orientation=2, width=2.15, height=1.0, solar_transmittance=0.76,
+                u_value=2.8, window_location="Main"),
+    make_window(orientation=6, width=1.94, height=1.0, solar_transmittance=0.76,
+                u_value=2.8, window_location="Main"),
+    make_window(orientation=2, width=1.73, height=1.0, solar_transmittance=0.76,
+                u_value=2.8, window_location="Main"),
+    make_window(orientation=6, width=1.67, height=1.0, solar_transmittance=0.76,
+                u_value=2.8, window_location="Main"),
+    make_window(orientation=6, width=0.82, height=1.0, solar_transmittance=0.76,
+                u_value=2.8, window_location="Main"),
 )
 SECTION_6_ROOF_WINDOWS: tuple[RoofWindowInput, ...] = (
     RoofWindowInput(