diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 03e1e6f279..209e3e1fc1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -252,52 +252,13 @@ jobs:
         cd BUILD && . buildenv.sh
         make standalones
 
+    - name: Build test dependencies
+      run: |
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
+        git clone --recursive https://github.com/GambitBSM/gambit-test
+        python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml
 
-    # - name: Validation dependencies
-    #   run: |
-    #     . BUILD/buildenv.sh
-    #     pip install cowsay
-    #     # Fetch my tests
-    #     git clone https://github.com/andrewfowlie/gambit_bats
-    #     cd gambit_bats
-    #     cowsay "$(git log -n 5)"
-    #     # Install BATS
-    #     git clone https://github.com/bats-core/bats-core.git
-    #     echo 'export PATH=$PATH:$GITHUB_WORKSPACE/gambit_bats/bats-core/bin' >> ../BUILD/buildenv.sh
-    #     # Install numdiff
-    #     git clone https://github.com/tjhei/numdiff
-    #     (cd numdiff && ./configure && make)
-    #     echo 'export PATH=$PATH:$GITHUB_WORKSPACE/gambit_bats/numdiff' >> ../BUILD/buildenv.sh
-    # - name: Validate with BATS
-    #   run: |
-    #     #cat BUILD/buildenv.sh
-    #     . BUILD/buildenv.sh
-    #     cowsay "Testing GAMBIT on $(date)"
-    #     cowsay "$(git log -n 5)"
-    #     cd gambit_bats
-    #     ls
-    #     #echo "Testing BATS"
-    #     #bats -h
-    #     #echo "Testing numdiff"
-    #     #numdiff || true
-    #     echo "Running BATS"
-    #     export GAMBIT="$GITHUB_WORKSPACE"
-    #     #(python2 `which bats` *.bats | tee $GAMBIT/bats.txt) || true
-    #     (bats *.bats | tee $GAMBIT/bats.txt) || true
-    #     cd ..
-    #     # Note email addresses for failed tests
-    #     source gambit_bats/email.bash
-    #     export BATS_FAIL_EMAIL=$(bats_fail_email ./bats.tap)
-    #     export GIT_FAIL_EMAIL="$(git_fail_email ./gambit_bats) $(git_fail_email ./)"
-    #     cowsay "For BATS yaml failures, contact $BATS_FAIL_EMAIL"
-    #     cowsay "For GAMBIT and test changes, contact $GIT_FAIL_EMAIL"
-    #     echo
-    #     # Run again, now with TAP output (may fail, causing the job to report correctly)
-    #     echo "Running BATS with TAP output (to bats.tap)"
-    #     cd gambit_bats
-    #     bats --tap *.bats > $GAMBIT/bats.tap
-    # - name: Upload BATS output
-    #   uses: actions/upload-artifact@v2
-    #   with:
-    #     name: bats_tests
-    #     path: bats.t*
+    - name: Run tests
+      run: |
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
+        ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats
diff --git a/.github/workflows/ci_Mac_arm64.yml b/.github/workflows/ci_Mac_arm64.yml
index 69eeb959e3..01818653e2 100644
--- a/.github/workflows/ci_Mac_arm64.yml
+++ b/.github/workflows/ci_Mac_arm64.yml
@@ -24,6 +24,7 @@ jobs:
     - name: Set up build environment
       run: |
         echo "Set up the build environment"
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
         mkdir -p BUILD
         cd BUILD
     - name: Configure with cmake
@@ -73,6 +74,7 @@ jobs:
     - name: Set up build environment
       run: |
         echo "Set up the build environment"
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
         mkdir -p BUILD
         cd BUILD
     - name: Configure with cmake
@@ -108,6 +110,7 @@ jobs:
     - name: Set up build environment
       run: |
         echo "Set up the build environment"
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
         mkdir -p BUILD
         cd BUILD
     - name: Configure with cmake
@@ -172,6 +175,7 @@ jobs:
     - name: Set up build environment
       run: |
         echo "Set up the build environment"
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
         mkdir -p BUILD
         cd BUILD
     - name: Configure with cmake
@@ -186,3 +190,22 @@ jobs:
         echo "Test the building of the standalones"
         cd BUILD
         make standalones
+
+    - name: Build test dependencies
+      run: |
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
+        git clone --recursive https://github.com/GambitBSM/gambit-test
+        python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml
+
+    - name: Run tests
+      run: |
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
+        export GAMBIT=.
+        ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats | tee results.tap
+        exit ${PIPESTATUS[0]}
+
+    - name: Summarize tests
+      if: always()
+      uses: pcolby/tap-summary@v1.2.0
+      with:
+          path: results.tap
diff --git a/.github/workflows/ci_Mac_x64.yml b/.github/workflows/ci_Mac_x64.yml
index a06cc7d19e..f83964be5b 100644
--- a/.github/workflows/ci_Mac_x64.yml
+++ b/.github/workflows/ci_Mac_x64.yml
@@ -182,3 +182,14 @@ jobs:
         echo "Test the building of the standalones"
         cd BUILD
         make standalones
+
+    - name: Build test dependencies
+      run: |
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
+        git clone --recursive https://github.com/GambitBSM/gambit-test
+        python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml
+
+    - name: Run tests
+      run: |
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
+        ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats
diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml
index 184ecae895..a6197576ba 100644
--- a/.github/workflows/ci_linux.yml
+++ b/.github/workflows/ci_linux.yml
@@ -189,3 +189,14 @@ jobs:
         export PATH=$PATH:/scratch2/shared/patch
         cd BUILD
         make standalones
+
+    - name: Build test dependencies
+      run: |
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
+        git clone --recursive https://github.com/GambitBSM/gambit-test
+        python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml
+
+    - name: Run tests
+      run: |
+        source /Users/gambitci/Packages/GBTest_Venv/bin/activate
+        ./gambit-test/test/bats/bin/bats ./gambit-test/test/*.bats
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 0000000000..e1e0a0ba02
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,32 @@
+name: Documentation CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  test_docs:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Build test dependencies
+      run: |
+        git clone --recursive https://github.com/GambitBSM/gambit-test
+        python3 -m pip install git+https://github.com/GambitBSM/gambit-yaml
+
+    - name: Run tests
+      run: |
+        export GAMBIT=.
+        ./gambit-test/test/bats/bin/bats --tap ./gambit-test/test/docs.bats | tee docs.tap
+        exit ${PIPESTATUS[0]}
+
+    - name: Summarize tests
+      if: always()
+      uses: pcolby/tap-summary@v1.2.0
+      with:
+          path: docs.tap