diff --git a/test/test_data_handler/test_data_handler_mixed_sampling.py b/test/test_data_handler/test_data_handler_mixed_sampling.py
index 77b5d280f37520cee66f686b81886a77a216ab17..04ce8dc17fe18b1fddd38e42b8d6a464ea831e63 100644
--- a/test/test_data_handler/test_data_handler_mixed_sampling.py
+++ b/test/test_data_handler/test_data_handler_mixed_sampling.py
@@ -2,14 +2,16 @@ __author__ = 'Lukas Leufen'
 __date__ = '2020-12-10'
 
 from mlair.data_handler.data_handler_mixed_sampling import DataHandlerMixedSampling, \
-    DataHandlerMixedSamplingSingleStation, DataHandlerMixedSamplingWithKzFilter, \
-    DataHandlerMixedSamplingWithKzFilterSingleStation, DataHandlerSeparationOfScales, \
-    DataHandlerSeparationOfScalesSingleStation, DataHandlerMixedSamplingWithFilterSingleStation, \
+    DataHandlerMixedSamplingSingleStation, DataHandlerMixedSamplingWithFilterSingleStation, \
     DataHandlerMixedSamplingWithFirFilterSingleStation, DataHandlerMixedSamplingWithFirFilter, \
     DataHandlerFirFilterSingleStation, DataHandlerMixedSamplingWithClimateFirFilterSingleStation, \
     DataHandlerMixedSamplingWithClimateFirFilter
-from mlair.data_handler.data_handler_with_filter import DataHandlerKzFilter, DataHandlerFilter, \
-    DataHandlerKzFilterSingleStation, DataHandlerFilterSingleStation, DataHandlerClimateFirFilterSingleStation
+# from mlair.data_handler.data_handler_mixed_sampling import DataHandlerMixedSamplingWithKzFilter, \
+#     DataHandlerMixedSamplingWithKzFilterSingleStation, DataHandlerSeparationOfScales, \
+#     DataHandlerSeparationOfScalesSingleStation
+from mlair.data_handler.data_handler_with_filter import DataHandlerFilter, DataHandlerFilterSingleStation, \
+    DataHandlerClimateFirFilterSingleStation
+# from mlair.data_handler.data_handler_with_filter import DataHandlerKzFilter, DataHandlerKzFilterSingleStation
 from mlair.data_handler.data_handler_single_station import DataHandlerSingleStation
 from mlair.data_handler.default_data_handler import DefaultDataHandler
 from mlair.helpers import remove_items
@@ -99,53 +101,53 @@ class TestDataHandlerMixedSamplingSingleStation:
     def test_setup_data_path(self):
         pass
 
-
-class TestDataHandlerMixedSamplingWithKzFilter:
-
-    def test_data_handler(self):
-        obj = object.__new__(DataHandlerMixedSamplingWithKzFilter)
-        assert obj.data_handler.__qualname__ == DataHandlerMixedSamplingWithKzFilterSingleStation.__qualname__
-
-    def test_data_handler_transformation(self):
-        obj = object.__new__(DataHandlerMixedSamplingWithKzFilter)
-        assert obj.data_handler_transformation.__qualname__ == DataHandlerMixedSamplingWithKzFilterSingleStation.__qualname__
-
-    def test_requirements(self):
-
-        reqs = get_all_args(DataHandlerFilter)
-        obj = object.__new__(DataHandlerMixedSamplingWithKzFilter)
-        assert sorted(obj.own_args()) == reqs
-        reqs = get_all_args(DataHandlerFilter, DefaultDataHandler, DataHandlerKzFilterSingleStation,
-                            DataHandlerFilterSingleStation, DataHandlerSingleStation, remove=["self", "id_class"])
-        assert sorted(obj._requirements) == reqs
-        assert sorted(obj.requirements()) == reqs
-
-
-class TestDataHandlerMixedSamplingWithKzFilterSingleStation:
-
-    def test_requirements(self):
-
-        reqs = get_all_args(DataHandlerMixedSamplingWithKzFilterSingleStation)
-        obj = object.__new__(DataHandlerMixedSamplingWithKzFilterSingleStation)
-        assert reqs == ["self"]
-        assert sorted(obj.own_args()) == reqs
-        reqs = get_all_args(DataHandlerKzFilterSingleStation, DataHandlerFilterSingleStation, DataHandlerSingleStation,
-                            remove="self")
-        assert sorted(obj._requirements) == reqs
-        assert sorted(obj.requirements()) == reqs
-
-
-class TestDataHandlerMixedSamplingWithFilterSingleStation:
-
-    def test_requirements(self):
-
-        reqs = get_all_args(DataHandlerMixedSamplingWithKzFilterSingleStation)
-        obj = object.__new__(DataHandlerMixedSamplingWithFilterSingleStation)
-        assert reqs == ["self"]
-        assert sorted(obj.own_args()) == reqs
-        reqs = get_all_args(DataHandlerFilterSingleStation, DataHandlerSingleStation, remove="self")
-        assert sorted(obj._requirements) == reqs
-        assert sorted(obj.requirements()) == reqs
+#
+# class TestDataHandlerMixedSamplingWithKzFilter:
+#
+#     def test_data_handler(self):
+#         obj = object.__new__(DataHandlerMixedSamplingWithKzFilter)
+#         assert obj.data_handler.__qualname__ == DataHandlerMixedSamplingWithKzFilterSingleStation.__qualname__
+#
+#     def test_data_handler_transformation(self):
+#         obj = object.__new__(DataHandlerMixedSamplingWithKzFilter)
+#         assert obj.data_handler_transformation.__qualname__ == DataHandlerMixedSamplingWithKzFilterSingleStation.__qualname__
+#
+#     def test_requirements(self):
+#
+#         reqs = get_all_args(DataHandlerFilter)
+#         obj = object.__new__(DataHandlerMixedSamplingWithKzFilter)
+#         assert sorted(obj.own_args()) == reqs
+#         reqs = get_all_args(DataHandlerFilter, DefaultDataHandler, DataHandlerKzFilterSingleStation,
+#                             DataHandlerFilterSingleStation, DataHandlerSingleStation, remove=["self", "id_class"])
+#         assert sorted(obj._requirements) == reqs
+#         assert sorted(obj.requirements()) == reqs
+#
+#
+# class TestDataHandlerMixedSamplingWithKzFilterSingleStation:
+#
+#     def test_requirements(self):
+#
+#         reqs = get_all_args(DataHandlerMixedSamplingWithKzFilterSingleStation)
+#         obj = object.__new__(DataHandlerMixedSamplingWithKzFilterSingleStation)
+#         assert reqs == ["self"]
+#         assert sorted(obj.own_args()) == reqs
+#         reqs = get_all_args(DataHandlerKzFilterSingleStation, DataHandlerFilterSingleStation, DataHandlerSingleStation,
+#                             remove="self")
+#         assert sorted(obj._requirements) == reqs
+#         assert sorted(obj.requirements()) == reqs
+#
+#
+# class TestDataHandlerMixedSamplingWithFilterSingleStation:
+#
+#     def test_requirements(self):
+#
+#         reqs = get_all_args(DataHandlerMixedSamplingWithKzFilterSingleStation)
+#         obj = object.__new__(DataHandlerMixedSamplingWithFilterSingleStation)
+#         assert reqs == ["self"]
+#         assert sorted(obj.own_args()) == reqs
+#         reqs = get_all_args(DataHandlerFilterSingleStation, DataHandlerSingleStation, remove="self")
+#         assert sorted(obj._requirements) == reqs
+#         assert sorted(obj.requirements()) == reqs
 
 
 class TestDataHandlerMixedSamplingWithFirFilter:
@@ -202,31 +204,31 @@ class TestDataHandlerMixedSamplingWithClimateFirFilterSingleStation:
         assert sorted(obj.requirements()) == reqs
 
 
-class TestDataHandlerSeparationOfScales:
-
-    def test_data_handler(self):
-        obj = object.__new__(DataHandlerSeparationOfScales)
-        assert obj.data_handler.__qualname__ == DataHandlerSeparationOfScalesSingleStation.__qualname__
-
-    def test_data_handler_transformation(self):
-        obj = object.__new__(DataHandlerSeparationOfScales)
-        assert obj.data_handler_transformation.__qualname__ == DataHandlerSeparationOfScalesSingleStation.__qualname__
-
-    def test_requirements(self):
-        reqs = get_all_args(DefaultDataHandler)
-        obj = object.__new__(DataHandlerSeparationOfScales)
-        assert sorted(obj.own_args()) == reqs
-
-        reqs = get_all_args(DataHandlerSeparationOfScalesSingleStation, DataHandlerKzFilterSingleStation,
-                            DataHandlerMixedSamplingWithKzFilterSingleStation,DataHandlerFilterSingleStation,
-                            DataHandlerSingleStation, remove=["self", "id_class"])
-        assert sorted(obj._requirements) == reqs
-        reqs = get_all_args(DataHandlerSeparationOfScalesSingleStation, DataHandlerKzFilterSingleStation,
-                            DataHandlerMixedSamplingWithKzFilterSingleStation,DataHandlerFilterSingleStation,
-                            DataHandlerSingleStation, DefaultDataHandler, remove=["self", "id_class"])
-        assert sorted(obj.requirements()) == reqs
-
-
-class TestDataHandlerSeparationOfScalesSingleStation:
-    pass
+# class TestDataHandlerSeparationOfScales:
+#
+#     def test_data_handler(self):
+#         obj = object.__new__(DataHandlerSeparationOfScales)
+#         assert obj.data_handler.__qualname__ == DataHandlerSeparationOfScalesSingleStation.__qualname__
+#
+#     def test_data_handler_transformation(self):
+#         obj = object.__new__(DataHandlerSeparationOfScales)
+#         assert obj.data_handler_transformation.__qualname__ == DataHandlerSeparationOfScalesSingleStation.__qualname__
+#
+#     def test_requirements(self):
+#         reqs = get_all_args(DefaultDataHandler)
+#         obj = object.__new__(DataHandlerSeparationOfScales)
+#         assert sorted(obj.own_args()) == reqs
+#
+#         reqs = get_all_args(DataHandlerSeparationOfScalesSingleStation, DataHandlerKzFilterSingleStation,
+#                             DataHandlerMixedSamplingWithKzFilterSingleStation,DataHandlerFilterSingleStation,
+#                             DataHandlerSingleStation, remove=["self", "id_class"])
+#         assert sorted(obj._requirements) == reqs
+#         reqs = get_all_args(DataHandlerSeparationOfScalesSingleStation, DataHandlerKzFilterSingleStation,
+#                             DataHandlerMixedSamplingWithKzFilterSingleStation,DataHandlerFilterSingleStation,
+#                             DataHandlerSingleStation, DefaultDataHandler, remove=["self", "id_class"])
+#         assert sorted(obj.requirements()) == reqs
+
+#
+# class TestDataHandlerSeparationOfScalesSingleStation:
+#     pass