diff --git a/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000480.py b/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000480.py
index acc5fb90..f2f99d15 100644
--- a/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000480.py
+++ b/packages/domain/src/domain/sap/worksheet/tests/_elmhurst_worksheet_000480.py
@@ -28,7 +28,12 @@ from datatypes.epc.domain.epc_property_data import (
     SapVentilation,
     SapWindow,
 )
-from domain.ml.tests._fixtures import make_minimal_sap10_epc, make_window
+from domain.ml.tests._fixtures import (
+    make_main_heating_detail,
+    make_minimal_sap10_epc,
+    make_sap_heating,
+    make_window,
+)
 from domain.sap.worksheet.solar_gains import RoofWindowInput, RooflightInput
 from domain.sap.worksheet.ventilation import MechanicalVentilationKind
 from domain.sap.worksheet.water_heating import TABLE_J1_TCOLD_FROM_MAINS_C
@@ -154,6 +159,22 @@ def build_epc() -> EpcPropertyData:
             has_suspended_timber_floor=False,
             has_draught_lobby=False,
         ),
+        sap_heating=make_sap_heating(
+            # 000480 line 89: PCDF Index 16839 — Vaillant ecoTEC pro 28
+            # VUW GB 286/5-3 (88.70% winter, 87.00% summer eff). Same
+            # boiler as 000474.
+            main_heating_details=[
+                make_main_heating_detail(
+                    main_heating_index_number=16839,
+                    main_heating_data_source=1,
+                ),
+            ],
+            # 000480 line 115: "Electricity Electric Panel, convector or
+            # radiant heaters" → SAP code 691. Table 11 row "All gas...
+            # systems + all secondary systems" → fraction 0.10.
+            secondary_heating_type=691,
+            number_baths=0,  # 000480 line 124: Total number of baths = 0
+        ),
     )
 
 
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 7220ebbb..602bbd13 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
@@ -25,7 +25,12 @@ from datatypes.epc.domain.epc_property_data import (
     SapVentilation,
     SapWindow,
 )
-from domain.ml.tests._fixtures import make_minimal_sap10_epc, make_window
+from domain.ml.tests._fixtures import (
+    make_main_heating_detail,
+    make_minimal_sap10_epc,
+    make_sap_heating,
+    make_window,
+)
 from domain.sap.worksheet.solar_gains import RoofWindowInput, RooflightInput
 from domain.sap.worksheet.water_heating import TABLE_J1_TCOLD_FROM_MAINS_C
 
@@ -113,6 +118,20 @@ def build_epc() -> EpcPropertyData:
             suspended_timber_floor_sealed=False,
             has_draught_lobby=False,
         ),
+        sap_heating=make_sap_heating(
+            # 000487 line 88: PCDF Index 18119 — Vaillant ecoTEC sustain 28
+            # VUW 286/7-2 (H-GB).
+            main_heating_details=[
+                make_main_heating_detail(
+                    main_heating_index_number=18119,
+                    main_heating_data_source=1,
+                ),
+            ],
+            # 000487 line 114: "Electricity Electric Panel, convector or
+            # radiant heaters" → SAP code 691. Table 11 fraction 0.10.
+            secondary_heating_type=691,
+            number_baths=1,  # 000487 line 123: Total number of baths = 1
+        ),
     )
 
 
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 98123668..dabc4f70 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
@@ -32,7 +32,12 @@ from datatypes.epc.domain.epc_property_data import (
     SapVentilation,
     SapWindow,
 )
-from domain.ml.tests._fixtures import make_minimal_sap10_epc, make_window
+from domain.ml.tests._fixtures import (
+    make_main_heating_detail,
+    make_minimal_sap10_epc,
+    make_sap_heating,
+    make_window,
+)
 from domain.sap.worksheet.solar_gains import Orientation, RoofWindowInput, RooflightInput
 from domain.sap.worksheet.ventilation import MechanicalVentilationKind
 from domain.sap.worksheet.water_heating import TABLE_J1_TCOLD_FROM_MAINS_C
@@ -91,6 +96,20 @@ def build_epc() -> EpcPropertyData:
             has_suspended_timber_floor=False,
             has_draught_lobby=False,
         ),
+        sap_heating=make_sap_heating(
+            # 000516 line 82: PCDF Index 18118 — Vaillant ecoTEC sustain 24
+            # VUW 246/7-2 (H-GB). Same boiler as 000477.
+            main_heating_details=[
+                make_main_heating_detail(
+                    main_heating_index_number=18118,
+                    main_heating_data_source=1,
+                ),
+            ],
+            # 000516 line 108: "Electricity Electric Panel, convector or
+            # radiant heaters" → SAP code 691. Table 11 fraction 0.10.
+            secondary_heating_type=691,
+            number_baths=1,  # 000516 line 117: Total number of baths = 1
+        ),
     )