diff --git a/hub/catalog_factories/data_models/energy_systems/pv_generation_system.py b/hub/catalog_factories/data_models/energy_systems/pv_generation_system.py
index ecadcdb8..e1ee8226 100644
--- a/hub/catalog_factories/data_models/energy_systems/pv_generation_system.py
+++ b/hub/catalog_factories/data_models/energy_systems/pv_generation_system.py
@@ -33,7 +33,7 @@ class PvGenerationSystem(GenerationSystem):
                                              minimum_cooling_supply_temperature=None, heat_output_curve=None,
                                              heat_fuel_consumption_curve=None, heat_efficiency_curve=None,
                                              cooling_output_curve=None, cooling_fuel_consumption_curve=None,
-                                             cooling_efficiency_curve=None, storage=None, auxiliary_equipment=None)
+                                             cooling_efficiency_curve=None)
     self._nominal_ambient_temperature = nominal_ambient_temperature
     self._nominal_cell_temperature = nominal_cell_temperature
     self._nominal_radiation = nominal_radiation
diff --git a/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py b/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
index a1e4798e..206fd4a8 100644
--- a/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
+++ b/hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
@@ -86,8 +86,6 @@ class NorthAmericaEnergySystemCatalog(Catalog):
                                           None,
                                           None,
                                           None,
-                                          None,
-                                          None,
                                           None)
       generation_components.append(boiler_component)
     for heat_pump in heat_pumps:
@@ -142,8 +140,6 @@ class NorthAmericaEnergySystemCatalog(Catalog):
                                              cop_curve,
                                              None,
                                              None,
-                                             None,
-                                             None,
                                              None)
       generation_components.append(heat_pump_component)
     for pv in photovoltaics:
@@ -215,8 +211,6 @@ class NorthAmericaEnergySystemCatalog(Catalog):
                                            None,
                                            None,
                                            None,
-                                           None,
-                                           None,
                                            None)
         generation_components.append(boiler_template)
       elif "Heat Pump" in system_name:
@@ -254,8 +248,6 @@ class NorthAmericaEnergySystemCatalog(Catalog):
                                               None,
                                               None,
                                               None,
-                                              None,
-                                              None,
                                               None)
         generation_components.append(heat_pump_template)
       else:
@@ -309,6 +301,8 @@ class NorthAmericaEnergySystemCatalog(Catalog):
                                                model_name,
                                                manufacturer,
                                                storage_type,
+                                               None,
+                                               None,
                                                volume,
                                                height,
                                                layers,
@@ -338,6 +332,8 @@ class NorthAmericaEnergySystemCatalog(Catalog):
                                                None,
                                                storage_type,
                                                None,
+                                               None,
+                                               None,
                                                height,
                                                layers,
                                                maximum_temperature)
diff --git a/tests/test_systems_catalog.py b/tests/test_systems_catalog.py
index a0720708..862ea874 100644
--- a/tests/test_systems_catalog.py
+++ b/tests/test_systems_catalog.py
@@ -13,6 +13,7 @@ class TestSystemsCatalog(TestCase):
 
   def test_montreal_custom_catalog(self):
     catalog = EnergySystemsCatalogFactory('montreal_custom').catalog
+
     catalog_categories = catalog.names()
     archetypes = catalog.names('archetypes')
     self.assertEqual(23, len(archetypes['archetypes']))
@@ -32,13 +33,13 @@ class TestSystemsCatalog(TestCase):
       for value in catalog_categories[category]:
         catalog.get_entry(value)
 
+    print(catalog.entries())
+
     with self.assertRaises(IndexError):
       catalog.get_entry('unknown')
 
   def test_north_america_systems_catalog(self):
     catalog = EnergySystemsCatalogFactory('north_america').catalog
+    print(catalog.entries())
 
 
-
-  # def test_montreal_catalog(self):
-  #   catalog = EnergySystemsCatalogFactory('montreal_custom').catalog