diff --git a/tests/end-2-end/conftest.py b/tests/end-2-end/conftest.py
index 1392e00f..635a9487 100644
--- a/tests/end-2-end/conftest.py
+++ b/tests/end-2-end/conftest.py
@@ -60,6 +60,19 @@ def connected_client_gui_obj(gui_id, bec_client_lib):
 #         bec.shutdown()
 
 
+@pytest.fixture(scope="session")
+def bec_client_lib_with_demo_config(bec_redis_fixture, bec_services_config_file_path, bec_servers):
+    config = ServiceConfig(bec_services_config_file_path)
+    bec = BECClient(config, RedisConnector, forced=True, wait_for_server=True)
+    bec.start()
+    bec.config.load_demo_config()
+    try:
+        yield bec
+    finally:
+        bec.shutdown()
+        bec._client._reset_singleton()
+
+
 # @pytest.fixture(scope="session")
 # def bec_client_lib_session(bec_client_lib_with_demo_config_session):
 #     """Session-scoped fixture to create a BECClient object with a demo configuration."""
@@ -70,22 +83,22 @@ def connected_client_gui_obj(gui_id, bec_client_lib):
 #     yield bec
 
 
-@pytest.fixture(scope="session")
-def connected_gui_and_bec_with_scope_session(bec_client_lib):
-    """
-    Fixture to create a new BECGuiClient object and start a server in the background.
+# @pytest.fixture(scope="session")
+# def connected_gui_and_bec_with_scope_session(bec_client_lib):
+#     """
+#     Fixture to create a new BECGuiClient object and start a server in the background.
 
-    This fixture is scoped to the session, meaning it remains alive for all tests in the session.
-    We can use this fixture to create a gui object that is used across multiple tests, and
-    simulate a real-world scenario where the gui is not restarted for each test.
+#     This fixture is scoped to the session, meaning it remains alive for all tests in the session.
+#     We can use this fixture to create a gui object that is used across multiple tests, and
+#     simulate a real-world scenario where the gui is not restarted for each test.
 
-    Returns:
-        The gui object as for the CLI and bec_client_lib object.
-    """
-    gui_id = "GUIMainWindow_TEST"
-    gui = BECGuiClient(gui_id=gui_id)
-    try:
-        gui.start(wait=True)
-        yield gui
-    finally:
-        gui.kill_server()
+#     Returns:
+#         The gui object as for the CLI and bec_client_lib object.
+#     """
+#     gui_id = "GUIMainWindow_TEST"
+#     gui = BECGuiClient(gui_id=gui_id)
+#     try:
+#         gui.start(wait=True)
+#         yield gui
+#     finally:
+#         gui.kill_server()