diff --git a/non_functional_tests/test_C40.py b/non_functional_tests/test_C40.py
index 9e026298..317f83a1 100644
--- a/non_functional_tests/test_C40.py
+++ b/non_functional_tests/test_C40.py
@@ -32,6 +32,8 @@ class MyTestCase(TestCase):
 
   def test_c40_enrichment(self):
     file = 'C40_Final.gml'
+    base_path = (Path(__file__).parent.parent / 'data' / 'weather').resolve()
+    weather_file_name = 'CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw'
     city = self._get_citygml(file)
     for building in city.buildings:
       for tz in building.thermal_zones:
@@ -41,11 +43,11 @@ class MyTestCase(TestCase):
           for opening in tb.thermal_openings:
             opening.hi = 10
             opening.he = 25
+      building.function = 'residential'
     ConstructionFactory('nrel', city).enrich()
     for building in city.buildings:
       print(building.name, building.function, len(building.surfaces))
-      for thermal_zone in building.thermal_zones:
-        print(thermal_zone.volume)
+      print(building.volume)
 
-    # WeatherFactory('epw', city).enrich()
-    # ExportsFactory('idf', city, 'c:\Documents\idf').export()
\ No newline at end of file
+    WeatherFactory('epw', city, base_path=base_path, file_name=weather_file_name).enrich()
+    #ExportsFactory('idf', city, 'c:\Documents\idf').export()
\ No newline at end of file