diff --git a/.github/workflows/unittest-flux.yml b/.github/workflows/unittest-flux.yml
index c5c3273b..da695cca 100644
--- a/.github/workflows/unittest-flux.yml
+++ b/.github/workflows/unittest-flux.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 5
-      run: cd tests; coverage run --omit pympipool/_version.py -m unittest discover .
+      run: coverage run --omit pympipool/_version.py -m unittest discover tests
       env:
         OMPI_MCA_plm: 'isolated'
         OMPI_MCA_rmaps_base_oversubscribe: 'yes'
diff --git a/.github/workflows/unittest-mpich.yml b/.github/workflows/unittest-mpich.yml
index 2a5b988b..0189ead1 100644
--- a/.github/workflows/unittest-mpich.yml
+++ b/.github/workflows/unittest-mpich.yml
@@ -57,4 +57,4 @@ jobs:
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 5
-      run: cd tests; python -m unittest discover .
+      run: python -m unittest discover tests
diff --git a/.github/workflows/unittest-openmpi.yml b/.github/workflows/unittest-openmpi.yml
index 3d81e857..d5597caf 100644
--- a/.github/workflows/unittest-openmpi.yml
+++ b/.github/workflows/unittest-openmpi.yml
@@ -57,7 +57,7 @@ jobs:
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 5
-      run: cd tests; python -m unittest discover .
+      run: python -m unittest discover tests
       env:
         OMPI_MCA_plm: 'isolated'
         OMPI_MCA_rmaps_base_oversubscribe: 'yes'
diff --git a/.github/workflows/unittest-win.yml b/.github/workflows/unittest-win.yml
index 809d4f53..5467292f 100644
--- a/.github/workflows/unittest-win.yml
+++ b/.github/workflows/unittest-win.yml
@@ -34,4 +34,4 @@ jobs:
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 5
-      run: cd tests; python -m unittest discover .
+      run: python -m unittest discover tests
diff --git a/pympipool/shared/executorbase.py b/pympipool/shared/executorbase.py
index f56a349e..567e0caf 100644
--- a/pympipool/shared/executorbase.py
+++ b/pympipool/shared/executorbase.py
@@ -93,7 +93,7 @@ def cancel_items_in_queue(que):
             break
 
 
-def cloudpickle_register(ind=2):
+def cloudpickle_register(ind=1):
     """
     Cloudpickle can either pickle by value or pickle by reference. The functions which are communicated have to
     be pickled by value rather than by reference, so the module which calls the map function is pickled by value.