diff --git a/test/test_data_handling/test_data_preparation.py b/test/test_data_handling/test_data_preparation.py
index 1fe6fa20e7ec7fc52a74901fb8a4e932f2a5b34d..a73ff76146c48c03e6b76328d723773da925c83b 100644
--- a/test/test_data_handling/test_data_preparation.py
+++ b/test/test_data_handling/test_data_preparation.py
@@ -427,6 +427,9 @@ class TestDataPrep:
         assert f(upsampled, lt, -1) == sum([f(orig, lt, -1), f(orig, lt, -1.5), f(orig, lt, -2) * 2, f(orig, lt, -3) * 4])
 
     def test_multiply_extremes_wrong_extremes(self, data):
+        data.transform("datetime")
+        data.make_history_window("variables", 3, "datetime")
+        data.make_labels("variables", "o3", "datetime", 2)
         with pytest.raises(TypeError) as e:
             data.multiply_extremes([1, "1.5", 2])
         assert "Elements of list extreme_values have to be (<class 'float'>, <class 'int'>), but at least element 1.5" \
@@ -448,15 +451,13 @@ class TestDataPrep:
     def test_multiply_extremes_none_label(self, data):
         data.transform("datetime")
         data.make_history_window("variables", 3, "datetime")
-        # data.make_labels("variables", "o3", "datetime", 2)
         data.label = None
         assert data.multiply_extremes([1], extremes_on_right_tail_only=False) is None
 
     def test_multiply_extremes_none_history(self,data ):
         data.transform("datetime")
-        data.make_history_window("variables", 3, "datetime")
-        # data.make_labels("variables", "o3", "datetime", 2)
-        data.label = None
+        data.history = None
+        data.make_labels("variables", "o3", "datetime", 2)
         assert data.multiply_extremes([1], extremes_on_right_tail_only=False) is None
 
     def test_get_extremes_history(self, data):