diff --git a/.github/workflows/test-macosx-m1.yml b/.github/workflows/test-macosx-m1.yml
new file mode 100644
index 000000000..4ff893745
--- /dev/null
+++ b/.github/workflows/test-macosx-m1.yml
@@ -0,0 +1,35 @@
+name: Tests MacOSX
+
+on:
+  push:
+  pull_request:
+    
+jobs:
+  build_virus_macrophage:
+
+    runs-on: macos-14
+    strategy:
+      matrix:
+        repo: [
+          {project: "virus-macrophage-sample", name: "Virus Macrophage", binary: "virus-sample"},
+          {project: "physiboss-cell-lines-sample", name: "PhysiBoSS Cell Lines", binary: "PhysiBoSS_Cell_Lines"},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: ""},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: "config/Fibre_Initialisation/mymodel_initialisation.xml"},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: "config/Cell_Fibre_Mechanics/mymodel_rotating.xml"}
+        ]
+        
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run : brew install gcc@11
+
+    - name: Build ${{ matrix.repo.name }} project
+      run: |
+        make ${{ matrix.repo.project }}
+        make PHYSICELL_CPP=g++-11
+        
+    - name: Run ${{ matrix.repo.name }} project
+      run: |
+        ./${{ matrix.repo.binary }} ${{ matrix.repo.config }}
+        
\ No newline at end of file
diff --git a/.github/workflows/test-macosx.yml b/.github/workflows/test-macosx.yml
index f1e7581c1..3ec67c340 100644
--- a/.github/workflows/test-macosx.yml
+++ b/.github/workflows/test-macosx.yml
@@ -7,63 +7,29 @@ on:
 jobs:
   build_virus_macrophage:
 
-    runs-on: macos-11
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Install dependencies
-      run : brew install gcc@10
-
-    - name: Build Virus Macrophage project
-      run: |
-        make virus-macrophage-sample
-        make PHYSICELL_CPP=g++-10
+    runs-on: macos-12
+    strategy:
+      matrix:
+        repo: [
+          {project: "virus-macrophage-sample", name: "Virus Macrophage", binary: "virus-sample"},
+          {project: "physiboss-cell-lines-sample", name: "PhysiBoSS Cell Lines", binary: "PhysiBoSS_Cell_Lines"},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: ""},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: "config/Fibre_Initialisation/mymodel_initialisation.xml"},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: "config/Cell_Fibre_Mechanics/mymodel_rotating.xml"}
+        ]
         
-    - name: Run Virus Macrophage cell lines project
-      run: |
-        ./virus-sample
-
-
-  build_physiboss_cell_lines:
-
-    runs-on: macos-11
-
     steps:
     - uses: actions/checkout@v2
 
     - name: Install dependencies
       run : brew install gcc@11
-      
-    - name: Build PhysiBoSS cell lines project
-      run: |
-        make physiboss-cell-lines-sample
-        make clean
-        make PHYSICELL_CPP=g++-11
-        
-    - name: Run PhysiBoSS cell lines project
-      run: |
-        ./PhysiBoSS_Cell_Lines
-  
-  build_physimess:
-
-    runs-on: macos-11
 
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Install dependencies
-      run : brew install gcc@11
-      
-    - name: Build PhysiMeSS project
+    - name: Build ${{ matrix.repo.name }} project
       run: |
-        make physimess-sample
-        make clean
+        make ${{ matrix.repo.project }}
         make PHYSICELL_CPP=g++-11
         
-    - name: Run PhysiMeSS project
+    - name: Run ${{ matrix.repo.name }} project
       run: |
-        ./project
-        ./project config/Fibre_Initialisation/mymodel_initialisation.xml
-        ./project config/Cell_Fibre_Mechanics/mymodel_rotating.xml
+        ./${{ matrix.repo.binary }} ${{ matrix.repo.config }}
         
\ No newline at end of file
diff --git a/.github/workflows/test-ubuntu.yml b/.github/workflows/test-ubuntu.yml
index a15764a15..b080120a7 100644
--- a/.github/workflows/test-ubuntu.yml
+++ b/.github/workflows/test-ubuntu.yml
@@ -3,48 +3,29 @@ name: Tests Ubuntu
 on:
   push:
   pull_request:
-
+  workflow_dispatch:
 jobs:
   build:
 
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        repo: [
+          {project: "virus-macrophage-sample", name: "Virus Macrophage", binary: "virus-sample"},
+          {project: "physiboss-cell-lines-sample", name: "PhysiBoSS Cell Lines", binary: "PhysiBoSS_Cell_Lines"},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: ""},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: "config/Fibre_Initialisation/mymodel_initialisation.xml"},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: "config/Cell_Fibre_Mechanics/mymodel_rotating.xml"}
+        ]
+        
     steps:
     - uses: actions/checkout@v2
     
-    - name: Install dependencies
-      run: sudo apt-get install flex bison
-      
-    - name: Build Virus Macrophage project
-      run: |
-        make virus-macrophage-sample
-        make
-        
-    - name: Run Virus Macrophage cell lines project
-      run: |
-        ./virus-sample
-        
-    - name: Build PhysiBoSS cell lines project
-      run: |
-        make reset
-        make physiboss-cell-lines-sample
-        make clean
-        make
-        
-    - name: Run PhysiBoSS cell lines project
-      run: |
-        ./PhysiBoSS_Cell_Lines
-        
-    - name: Build PhysiMeSS project
+    - name: Build ${{ matrix.repo.name }} project 
       run: |
-        make reset
-        make physimess-sample
-        make clean
+        make ${{ matrix.repo.project }}
         make
         
-    - name: Run PhysiMeSS project
+    - name: Run ${{ matrix.repo.name }} project
       run: |
-        ./project
-        ./project config/Fibre_Initialisation/mymodel_initialisation.xml
-        ./project config/Cell_Fibre_Mechanics/mymodel_rotating.xml
-        
\ No newline at end of file
+        ./${{ matrix.repo.binary }} ${{ matrix.repo.config }}
\ No newline at end of file
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 366542847..470951306 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -8,7 +8,16 @@ jobs:
   build:
 
     runs-on: windows-latest
-    
+    strategy:
+      matrix:
+        repo: [
+          {project: "virus-macrophage-sample", name: "Virus Macrophage", binary: "virus-sample"},
+          {project: "physiboss-cell-lines-sample", name: "PhysiBoSS Cell Lines", binary: "PhysiBoSS_Cell_Lines"},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: ""},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: "config/Fibre_Initialisation/mymodel_initialisation.xml"},
+          {project: "physimess-sample", name: "PhysiMeSS Sample", binary: "project", config: "config/Cell_Fibre_Mechanics/mymodel_rotating.xml"}
+        ]
+        
     defaults:
       run:
         shell: msys2 {0}
@@ -21,36 +30,12 @@ jobs:
         update: true
         install: base-devel flex bison gcc make diffutils mingw-w64-x86_64-toolchain mingw-w64-x86_64-ca-certificates
     
-    - name: Build Virus Macrophage project
-      run: |
-        make virus-macrophage-sample
-        make
-        
-    - name: Run Virus Macrophage cell lines project
-      run: |
-        .\\virus-sample.exe
-        
-    - name: Build PhysiBoSS cell lines project
-      run: |
-        make reset
-        make physiboss-cell-lines-sample
-        make clean
-        make 
-      
-    - name: Run PhysiBoSS cell lines project
-      run: |
-        .\\PhysiBoSS_Cell_Lines.exe
-        
-    - name: Build PhysiMeSS project
+    - name: Build ${{ matrix.repo.name }} project
       run: |
-        make reset
-        make physimess-sample
-        make clean
+        make ${{ matrix.repo.project }}
         make
         
-    - name: Run PhysiMeSS project
+    - name: Run ${{ matrix.repo.name }} project
       run: |
-        .\\project
-        .\\project config\\Fibre_Initialisation\\mymodel_initialisation.xml
-        .\\project config\\Cell_Fibre_Mechanics\\mymodel_rotating.xml
-        
\ No newline at end of file
+        .\\${{ matrix.repo.binary }}.exe ${{ matrix.repo.config }}
+      
\ No newline at end of file