diff --git a/conftest.py b/conftest.py
index 08641ff36543dbfba7109f84616ead8d2b472891..abb0c0f52757e4b2228d7d48e3dc07e08b302841 100644
--- a/conftest.py
+++ b/conftest.py
@@ -58,10 +58,13 @@ def default_session_fixture(request):
     :type request: _pytest.python.SubRequest
     :return:
     """
-    patched = mock.patch("multiprocessing.cpu_count", return_value=1)
-    patched.__enter__()
+    # patched = mock.patch("multiprocessing.cpu_count", return_value=1)
+    # patched.__enter__()
 
-    def unpatch():
-        patched.__exit__()
+    # def unpatch():
+    #    patched.__exit__()
 
-    request.addfinalizer(unpatch)
+    # request.addfinalizer(unpatch)
+
+    with mock.patch("multiprocessing.cpu_count", return_value=1):
+        yield
diff --git a/test/test_model_modules/test_flatten_tail.py b/test/test_model_modules/test_flatten_tail.py
index 623d51c07f6b27c8d6238d8a5189dea33837115e..46d63e75f7784a0473685f70d0de8f050a095262 100644
--- a/test/test_model_modules/test_flatten_tail.py
+++ b/test/test_model_modules/test_flatten_tail.py
@@ -91,7 +91,7 @@ class TestFlattenTail:
         assert final_dropout.rate == 0.35
 
         inner_act = self.step_in(final_dropout)
-        assert inner_act.get_config() == {'name': 'activation_1', 'trainable': True, 'activation': 'tanh'}
+        assert inner_act.get_config() == {'name': 'activation_3', 'trainable': True, 'activation': 'tanh'}
 
         inner_dense = self.step_in(inner_act)
         assert inner_dense.units == 64
diff --git a/test/test_run_modules/test_model_setup.py b/test/test_run_modules/test_model_setup.py
index 7a4378531ca02733af1bbeeac0efbde56203be3a..8a7572148869537b505b2bd8e7f16cfdf7af1cdd 100644
--- a/test/test_run_modules/test_model_setup.py
+++ b/test/test_run_modules/test_model_setup.py
@@ -103,8 +103,7 @@ class TestModelSetup:
         assert setup_with_gen.model is None
         setup_with_gen.build_model()
         assert isinstance(setup_with_gen.model, AbstractModelClass)
-        expected = {"lr_decay", "model_name", "dropout_rate", "regularizer", "initial_lr", "optimizer", "activation",
-                    "input_shape", "output_shape"}
+        expected = {"lr_decay", "model_name", "optimizer", "activation", "input_shape", "output_shape"}
         assert expected <= self.current_scope_as_set(setup_with_gen)
 
     def test_set_shapes(self, setup_with_gen_tiny):