diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 720d4db..0d71154 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -6,5 +6,5 @@ jobs:
   call_workflow:
     uses: ./.github/workflows/Testbase.yml
     with:
-      python: '3.10'
-      qt5: 'pyqt5'
\ No newline at end of file
+      python: '3.12'
+      qt5: 'pyqt6'
\ No newline at end of file
diff --git a/.github/workflows/Testbase.yml b/.github/workflows/Testbase.yml
index 12c0f17..0a6872f 100644
--- a/.github/workflows/Testbase.yml
+++ b/.github/workflows/Testbase.yml
@@ -17,18 +17,21 @@ jobs:
       DISPLAY: ':99.0'
       QT_DEBUG_PLUGINS: 1
     steps:
-      - name: Set up Python ${{ inputs.python }}
-        uses: actions/checkout@v3
-      - name: Install dependencies
-        uses: actions/setup-python@v4
+      - name: Check out repo
+        uses: actions/checkout@v5.0.0
+        with:
+          fetch-depth: 0
+
+      - name: Install python
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ inputs.python }}
       - name: Install package
         run: |
-          sudo apt install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils
+          sudo apt install -y  yaru-theme-icon libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-cursor0 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils libgl1 libegl1
           python -m pip install --upgrade pip
           export QT_DEBUG_PLUGINS=1
-          pip install flake8 pytest pytest-cov pytest-qt pytest-xdist pytest-xvfb setuptools wheel numpy h5py ${{ inputs.qt5 }} toml
+          pip install flake8 pytest pytest-cov pytest-qt pytest-xdist pytest-xvfb setuptools wheel numpy h5py ${{ inputs.qt5 }} toml hatch
           pip install -e . 
           pip install pymodaq
       - name: create local pymodaq folder and setting permissions
diff --git a/src/pymodaq_plugins_mock/daq_move_plugins/daq_move_TCPServer.py b/src/pymodaq_plugins_mock/daq_move_plugins/daq_move_TCPServer.py
deleted file mode 100644
index a343542..0000000
--- a/src/pymodaq_plugins_mock/daq_move_plugins/daq_move_TCPServer.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from pymodaq.control_modules.move_utility_classes import DAQ_Move_TCP_server as MoveTCPServer
-
-
-class DAQ_Move_TCPServer(MoveTCPServer):
-    """
-
-    """
-
-    def __init__(self, parent=None, params_state=None):
-        super().__init__(parent, params_state)
diff --git a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_0D/daq_0Dviewer_TCPServer.py b/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_0D/daq_0Dviewer_TCPServer.py
deleted file mode 100644
index 12bf1ba..0000000
--- a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_0D/daq_0Dviewer_TCPServer.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from qtpy.QtCore import Signal
-from easydict import EasyDict as edict
-from collections import OrderedDict
-from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_TCP_server
-from pymodaq_utils.utils import ThreadCommand, getLineInfo
-from pymodaq.utils.data import DataFromPlugins, DataToExport
-
-
-class DAQ_0DViewer_TCPServer(DAQ_Viewer_TCP_server):
-    """
-        ================= ==============================
-        **Attributes**      **Type**
-        *command_server*    instance of Signal
-        *x_axis*            1D numpy array
-        *y_axis*            1D numpy array
-        *data*              double precision float array
-        ================= ==============================
-
-        See Also
-        --------
-        utility_classes.DAQ_TCP_server
-    """
-    params_GRABBER = []
-    command_server = Signal(list)
-
-    def __init__(self, parent=None, params_state=None):
-        super().__init__(parent, params_state,
-                         grabber_type='0D')  # initialize base class with commom attributes and methods
-
-        self.x_axis = None
-        self.y_axis = None
-        self.data = None
diff --git a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_1D/daq_1Dviewer_TCPServer.py b/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_1D/daq_1Dviewer_TCPServer.py
deleted file mode 100644
index 8ef3ca8..0000000
--- a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_1D/daq_1Dviewer_TCPServer.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from qtpy.QtCore import Signal
-from easydict import EasyDict as edict
-from collections import OrderedDict
-from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_TCP_server
-from pymodaq_utils.utils import ThreadCommand, getLineInfo
-from pymodaq.utils.data import DataFromPlugins, Axis, DataToExport
-
-
-class DAQ_1DViewer_TCPServer(DAQ_Viewer_TCP_server):
-    """
-        ================= ==============================
-        **Attributes**      **Type**
-        *command_server*    instance of Signal
-        *x_axis*            1D numpy array
-        *y_axis*            1D numpy array
-        *data*              double precision float array
-        ================= ==============================
-
-        See Also
-        --------
-        utility_classes.DAQ_TCP_server
-    """
-    params_GRABBER = []
-
-    # params = DAQ_TCP_server.params
-
-    command_server = Signal(list)
-
-    # params=DAQ_TCP_server.params
-    def __init__(self, parent=None, params_state=None):
-        super().__init__(parent, params_state,
-                         grabber_type='1D')  # initialize base class with commom attributes and methods
-
-        self.x_axis = None
-        self.y_axis = None
-        self.data = None
-
-
diff --git a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_2D/daq_2Dviewer_TCPServer.py b/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_2D/daq_2Dviewer_TCPServer.py
deleted file mode 100644
index 85076e9..0000000
--- a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_2D/daq_2Dviewer_TCPServer.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from qtpy.QtCore import Signal, Slot
-from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_TCP_server
-from pymodaq.utils.data import DataFromPlugins, Axis, DataToExport
-
-
-class DAQ_2DViewer_TCPServer(DAQ_Viewer_TCP_server):
-    """
-        ================= ==============================
-        **Attributes**      **Type**
-        *command_server*    instance of Signal
-        *x_axis*            1D numpy array
-        *y_axis*            1D numpy array
-        *data*              double precision float array
-        ================= ==============================
-
-        See Also
-        --------
-        utility_classes.DAQ_TCP_server
-    """
-    params_GRABBER = []
-
-    # params = DAQ_TCP_server.params
-
-    command_server = Signal(list)
-
-    # params=DAQ_TCP_server.params
-    def __init__(self, parent=None, params_state=None):
-        super().__init__(parent, params_state,
-                         grabber_type='2D')  # initialize base class with commom attributes and methods
-
-        self.x_axis = None
-        self.y_axis = None
-        self.data = None
-