diff --git a/tests/test_FullChain_w_DelayedElectrons.py b/tests/test_FullChain_w_DelayedElectrons.py
index e9469f7c..0a6dbc47 100644
--- a/tests/test_FullChain_w_DelayedElectrons.py
+++ b/tests/test_FullChain_w_DelayedElectrons.py
@@ -1,90 +1,123 @@
+import os
+import shutil
 import unittest
-import fuse
 import tempfile
+import timeout_decorator
+import fuse
+import straxen
+from _utils import test_root_file_name
 
-from straxen import URLConfig
+TIMEOUT = 240
 
 class TestFullChainwDelayedElectrons(unittest.TestCase):
 
     @classmethod
-    def setUpClass(self):
-
-        self.temp_dir = tempfile.TemporaryDirectory()
-
-        url_string = 'simple_load://resource://format://fax_config_nt_sr0_v4.json?&fmt=json'
-        config = URLConfig.evaluate_dry(url_string) 
+    def setUpClass(cls):
 
-        self.test_context = fuse.context.full_chain_w_photo_ionization_context(
-            self.temp_dir.name,
-            config = config,
-            )
+        cls.temp_dir = tempfile.TemporaryDirectory()
 
-        self.test_context.set_config({"path": "/project2/lgrandi/xenonnt/simulations/testing",
-                                      "file_name": "pmt_neutrons_100.root",
-                                      "entry_stop": 3,
+        cls.test_context = fuse.context.full_chain_context(output_folder = cls.temp_dir.name)
+        
+        cls.test_context.set_config({"path": cls.temp_dir.name,
+                                      "file_name": test_root_file_name,
+                                      "entry_stop": 5,
+                                      "enable_delayed_electrons": True,
+                                      "photoionization_modifier": 0.001,
                                       })
         
-        self.run_number = "TestRun_00000"
+        cls.run_number = "TestRun_00000"
 
     @classmethod
-    def tearDownClass(self):
+    def tearDownClass(cls):
+
+        cls.temp_dir.cleanup()
+
+    def setUp(self):
+        downloader = straxen.MongoDownloader(store_files_at=(self.temp_dir.name,))
+        downloader.download_single(test_root_file_name, human_readable_file_name=True)
 
-        self.temp_dir.cleanup()
+        assert os.path.exists(os.path.join(self.temp_dir.name, test_root_file_name))
+
+    def tearDown(self):
+
+        # self.temp_dir.cleanup()
+        shutil.rmtree(self.temp_dir.name)
+        os.makedirs(self.temp_dir.name)
     
+    @timeout_decorator.timeout(TIMEOUT, exception_message='S1PhotonHits timed out')
     def test_S1PhotonHits(self):
 
         self.test_context.make(self.run_number, "s1_photons")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='S1PhotonPropagation timed out')
     def test_S1PhotonPropagation(self):
 
         self.test_context.make(self.run_number, "propagated_s1_photons")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='ElectronDrift timed out')
     def test_ElectronDrift(self):
 
         self.test_context.make(self.run_number, "drifted_electrons")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='ElectronExtraction timed out')
     def test_ElectronExtraction(self):
 
         self.test_context.make(self.run_number, "extracted_electrons")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='ElectronTiming timed out')
     def test_ElectronTiming(self):
 
         self.test_context.make(self.run_number, "electron_time")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='SecondaryScintillation timed out')
     def test_SecondaryScintillation(self):
 
         self.test_context.make(self.run_number, "s2_photons")
-        self.test_context.make(self.run_number, "s2_photons_sum")
-    
+        #self.test_context.make(self.run_number, "s2_photons_sum")
+
+    @timeout_decorator.timeout(TIMEOUT, exception_message='PhotoIonizationElectrons timed out')
     def test_PhotoIonizationElectrons(self):
 
         self.test_context.make(self.run_number, "photo_ionization_electrons")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='DelayedElectronsDrift timed out')
     def test_DelayedElectronsDrift(self):
 
         self.test_context.make(self.run_number, "drifted_delayed_electrons")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='DelayedElectronsExtraction timed out')
     def test_DelayedElectronsExtraction(self):
 
         self.test_context.make(self.run_number, "extracted_delayed_electrons")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='DelayedElectronsTiming timed out')
     def test_DelayedElectronsTiming(self):
 
         self.test_context.make(self.run_number, "delayed_electrons_time")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='DelayedElectronsSecondaryScintillation timed out')
     def test_DelayedElectronsSecondaryScintillation(self):
 
         self.test_context.make(self.run_number, "delayed_electrons_s2_photons")
-        self.test_context.make(self.run_number, "delayed_electrons_s2_photons_sum")
+        #self.test_context.make(self.run_number, "delayed_electrons_s2_photons_sum")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='S2PhotonPropagation timed out')
     def test_S2PhotonPropagation(self):
 
         self.test_context.make(self.run_number, "propagated_s2_photons")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='PMTAfterPulses timed out')
     def test_PMTAfterPulses(self):
 
         self.test_context.make(self.run_number, "pmt_afterpulses")
 
+    @timeout_decorator.timeout(TIMEOUT, exception_message='PulseWindow timed out')
+    def test_PulseWindow(self):
+
+        self.test_context.make(self.run_number, "pulse_windows")
+        #self.test_context.make(self.run_number, "pulse_ids")
+
+    @timeout_decorator.timeout(TIMEOUT, exception_message='PMTResponseAndDAQ timed out')
     def test_PMTResponseAndDAQ(self):
 
         self.test_context.make(self.run_number, "raw_records")