diff --git a/epc_data/attributes/MainheatAttributes.py b/epc_data/attributes/MainheatAttributes.py
index 88d4342d..5e8029c9 100644
--- a/epc_data/attributes/MainheatAttributes.py
+++ b/epc_data/attributes/MainheatAttributes.py
@@ -29,6 +29,7 @@ class MainHeatAttributes:
         result.update({f'has_{hs.replace(" ", "_")}': False for hs in self.HEAT_SYSTEMS})
         result.update({f'has_{ft.replace(" ", "_")}': False for ft in self.FUEL_TYPES})
         result.update({f'has_{ot.replace(" ", "_")}': False for ot in self.OTHERS})
+        result['has_underfloor_heating'] = False
 
         description = self.description.split(',')
 
diff --git a/epc_data/tests/test_data/test_mainheat_attributes_cases.py b/epc_data/tests/test_data/test_mainheat_attributes_cases.py
index 9003665e..d9912d73 100644
--- a/epc_data/tests/test_data/test_mainheat_attributes_cases.py
+++ b/epc_data/tests/test_data/test_mainheat_attributes_cases.py
@@ -8,7 +8,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': True, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Air source heat pump fan coil units, electric', 'has_radiators': False,
      'has_fan_coil_units': True, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -19,7 +19,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Air source heat pump, Fan coil units, electric', 'has_radiators': False,
      'has_fan_coil_units': True, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -30,7 +30,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Air source heat pump, Systems with radiators, electric', 'has_radiators': True,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -41,7 +41,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None}, {
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False}, {
         'original_description': 'Air source heat pump, Underfloor heating and radiators, pipes in insulated timber '
                                 'floor, electric',
         'has_radiators': True, 'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
@@ -109,7 +109,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Air source heat pump, radiators and underfloor, electric', 'has_radiators': True,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -131,7 +131,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Air source heat pump, underfloor, electric', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -164,7 +164,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Air source heat pump, warm air, electric, Electric storage heaters',
      'has_radiators': False, 'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -175,7 +175,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Air source heat pump, warm air, electric, Electric underfloor heating',
      'has_radiators': False, 'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -227,7 +227,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Boiler and radiators, LPG', 'has_radiators': True, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': True, 'has_air_source_heat_pump': False,
@@ -237,7 +237,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': True, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Boiler and radiators, electric', 'has_radiators': True, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': True, 'has_air_source_heat_pump': False,
@@ -247,7 +247,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': True, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Boiler and radiators, mains gas', 'has_radiators': True, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': True, 'has_air_source_heat_pump': False,
@@ -257,7 +257,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': True, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Boiler and radiators, mains gas, Air source heat pump, warm air, electric',
      'has_radiators': True, 'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': True,
@@ -268,7 +268,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Boiler and radiators, mains gas, Boiler and radiators, mains gas', 'has_radiators': True,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': True,
@@ -279,7 +279,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Boiler and radiators, mains gas, Boiler and radiators, wood pellets',
      'has_radiators': True, 'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': True,
@@ -290,7 +290,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': True, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Boiler and radiators, mains gas, Boiler and underfloor heating, electric',
      'has_radiators': True, 'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': True,
@@ -323,7 +323,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Boiler and radiators, mains gas, Electric underfloor heating', 'has_radiators': True,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': True,
@@ -356,7 +356,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Boiler and radiators, mains gas, Room heaters, mains gas', 'has_radiators': True,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': True,
@@ -367,7 +367,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Boiler and underfloor heating, electric', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': True,
@@ -454,7 +454,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': True, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Community scheme', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -464,7 +464,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Community scheme, Air source heat pump, underfloor, electric', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -485,7 +485,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Community scheme, Room heaters, electric', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -496,7 +496,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Electric ceiling heating', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -506,7 +506,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': True, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Electric ceiling heating, Electric underfloor heating', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -527,7 +527,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': True, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Electric ceiling heating, electric, Electric underfloor heating', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -548,7 +548,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': True, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Electric storage heaters, Electric storage heaters', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -559,7 +559,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Electric storage heaters, Room heaters, electric', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -570,7 +570,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Electric storage heaters, Room heaters, mains gas', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -581,7 +581,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Electric storage heaters, radiators', 'has_radiators': True, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -591,7 +591,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': True, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Electric underfloor heating', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -667,7 +667,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Ground source heat pump, radiators, mains gas', 'has_radiators': True,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -678,7 +678,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Ground source heat pump, underfloor, electric', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -711,7 +711,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'No system present: electric heaters assumed', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -722,7 +722,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': True, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Portable electric heaters assumed for most rooms', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -733,7 +733,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': True, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': True, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': True, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, anthracite', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -743,7 +743,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': True,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, coal', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -753,7 +753,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': True, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, coal, Room heaters, mains gas', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -764,7 +764,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': True, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, dual fuel (mineral and wood)', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -775,7 +775,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': True,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, electric', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -785,7 +785,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': True, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, electric, Electric underfloor heating', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -807,7 +807,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, electric, Room heaters, mains gas', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -818,7 +818,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, mains gas', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -828,7 +828,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': True, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, mains gas, Room heaters, mains gas', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -839,7 +839,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, oil', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -849,7 +849,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': True, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, smokeless fuel', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -859,7 +859,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': True, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Room heaters, wood logs', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -869,7 +869,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': True,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Warm air, Electricaire', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -879,7 +879,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': True, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': True, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Warm air, Electricaire, Room heaters, electric', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -890,7 +890,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': True,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Warm air, mains gas', 'has_radiators': False, 'has_fan_coil_units': False,
      'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
      'has_pipes_in_concrete_slab': False, 'has_boiler': False, 'has_air_source_heat_pump': False,
@@ -900,7 +900,7 @@ mainheat_cases = [
      'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': True, 'has_wood_logs': False,
      'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
      'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
-     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Warm air, mains gas, Boiler and radiators, mains gas', 'has_radiators': True,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': True,
@@ -911,7 +911,7 @@ mainheat_cases = [
      'has_mains_gas': True, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Water source heat pump, radiators, electric', 'has_radiators': True,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -922,7 +922,7 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None},
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False},
     {'original_description': 'Water source heat pump, underfloor, electric', 'has_radiators': False,
      'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
      'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
@@ -944,5 +944,5 @@ mainheat_cases = [
      'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
      'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
      'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False, 'has_electricaire': False,
-     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': None}
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False}
 ]
diff --git a/epc_data/tests/test_mainheat_attributes.py b/epc_data/tests/test_mainheat_attributes.py
index a5057fc7..e6039b00 100644
--- a/epc_data/tests/test_mainheat_attributes.py
+++ b/epc_data/tests/test_mainheat_attributes.py
@@ -19,14 +19,15 @@ class TestMainHeatAttributes:
         with pytest.raises(ValueError):
             MainHeatAttributes('description without keywords')
 
-    def test_process_mainheat(self):
-        for test_case in mainheat_cases:
-            result = MainHeatAttributes(test_case['original_description']).process()
-            # Ensure the output ordering is correct
-            expected_result = {key: test_case[key] for key in result.keys()}
-            expected_result["desc"] = test_case["original_description"]
-            result["desc"] = test_case["original_description"]
-            assert result == expected_result
+    @pytest.mark.parametrize(
+        "test_case",
+        mainheat_cases
+    )
+    def test_process_mainheat(self, test_case):
+        expected_result = test_case.copy()
+        del expected_result["original_description"]
+        result = MainHeatAttributes(test_case['original_description']).process()
+        assert sorted(result.items()) == sorted(expected_result.items())
 
     def test_invalid_description(self):
         # Test that invalid descriptions raise a ValueError