diff --git a/tests/test_systems_factory.py b/tests/test_systems_factory.py
index 9044ad18..8f4b9715 100644
--- a/tests/test_systems_factory.py
+++ b/tests/test_systems_factory.py
@@ -24,7 +24,7 @@ from hub.city_model_structure.energy_systems.energy_system import EnergySystem
 from hub.city_model_structure.energy_systems.generation_system import GenerationSystem
 from hub.city_model_structure.energy_systems.distribution_system import DistributionSystem
 from hub.city_model_structure.energy_systems.emission_system import EmissionSystem
-
+from hub.city_model_structure.energy_systems.thermal_storage_system import ThermalStorageSystem
 
 class TestSystemsFactory(TestCase):
   """
@@ -116,3 +116,13 @@ class TestSystemsFactory(TestCase):
       self.assertLess(0, building.cooling_consumption[cte.YEAR][0])
       self.assertLess(0, building.domestic_hot_water_consumption[cte.YEAR][0])
       self.assertLess(0, building.onsite_electrical_production[cte.YEAR][0])
+
+  def test_north_america_custom_system_factory(self):
+    """
+    Enrich the city with the construction information and verify it
+    """
+    for building in self._city.buildings:
+      building.energy_systems_archetype_name = 'PV+ASHP+GasBoiler+TES'
+
+    EnergySystemsFactory('north_america', self._city).enrich()
+    self.assertEqual(17, len(self._city.energy_systems_connection_table))
\ No newline at end of file