diff --git a/mlair/data_handler/data_handler_single_station.py b/mlair/data_handler/data_handler_single_station.py
index f0a29c3a27dbc21a88601f2a096df09ae6d1069e..e238deed0368101e4241b2f50de9b07f0903b992 100644
--- a/mlair/data_handler/data_handler_single_station.py
+++ b/mlair/data_handler/data_handler_single_station.py
@@ -300,7 +300,7 @@ class DataHandlerSingleStation(AbstractDataHandler):
         self._data, self.input_data, self.target_data = list(map(f_prep, [_data, _input_data, _target_data]))
 
     def make_input_target(self):
-        vars = [self.variables, self.target_var]
+        vars = [*self.variables, self.target_var]
         stats_per_var = helpers.select_from_dict(self.statistics_per_var, vars)
         data_origin = helpers.select_from_dict(self.data_origin, vars)
         data, self.meta = self.load_data(self.path, self.station, stats_per_var, self.sampling,
diff --git a/mlair/helpers/data_sources/toar_data_v2.py b/mlair/helpers/data_sources/toar_data_v2.py
index 3f2bc79d2bf3143452b30305692dd00f550ed930..70b6b2d7fae453fb28da27c5eb59dd8b06e18935 100644
--- a/mlair/helpers/data_sources/toar_data_v2.py
+++ b/mlair/helpers/data_sources/toar_data_v2.py
@@ -196,7 +196,6 @@ def extract_timeseries_data(result, result_format):
 
 
 def load_station_information(station_name: List[str], url_base: str, headers: Dict):
-    # opts = {"base": url_base, "service": f"stationmeta/{station_name[0]}"}
     opts = {"base": url_base, "service": f"stationmeta", "param_id": station_name[0]}
     return get_data(opts, headers)
 
diff --git a/test/test_run_modules/test_pre_processing.py b/test/test_run_modules/test_pre_processing.py
index 9debec9f04583b401698cea2f79f78b523fe7927..a0ffb1cb0d2d57471966ad1be83b5d8f53ebeec2 100644
--- a/test/test_run_modules/test_pre_processing.py
+++ b/test/test_run_modules/test_pre_processing.py
@@ -28,13 +28,14 @@ class TestPreProcessing:
 
     @pytest.fixture
     def obj_with_exp_setup(self):
-        ExperimentSetup(stations=['DEBW107', 'DEBW013', 'DEBW087', 'DEBW99X'],
-                        statistics_per_var={'o3': 'dma8eu', 'temp': 'maximum'}, station_type="background",
-                        data_origin={'o3': 'UBA', 'temp': 'UBA'}, data_handler=DefaultDataHandler)
-        pre = object.__new__(PreProcessing)
-        super(PreProcessing, pre).__init__()
-        yield pre
-        RunEnvironment().__del__()
+        with RunEnvironment():
+            ExperimentSetup(stations=['DEBW107', 'DEBW013', 'DEBW087', 'DEBW99X'],
+                            statistics_per_var={'o3': 'dma8eu', 'temp': 'maximum'}, station_type="background",
+                            data_origin={'o3': 'UBA', 'temp': 'UBA'}, data_handler=DefaultDataHandler)
+            pre = object.__new__(PreProcessing)
+            super(PreProcessing, pre).__init__()
+            yield pre
+        # RunEnvironment().__del__()
 
     def test_init(self, caplog):
         ExperimentSetup(stations=['DEBW107', 'DEBW013', 'DEBW087'],