diff --git a/.github/workflows/tests.yml b/.github/workflows/fulltests.yml
similarity index 95%
rename from .github/workflows/tests.yml
rename to .github/workflows/fulltests.yml
index 5249f5b5..7cd8878c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/fulltests.yml
@@ -42,4 +42,4 @@ jobs:
     - name: Test with pytest
       run: |
         # Create a clean UEDGE instance for every test
-        pytest --isolate --tb=native pytests
+        pytest --isolate --tb=native pytests/fulltests
diff --git a/.github/workflows/unittest_D-and-C.yml b/.github/workflows/unittest_D-and-C.yml
new file mode 100644
index 00000000..2536c1d3
--- /dev/null
+++ b/.github/workflows/unittest_D-and-C.yml
@@ -0,0 +1,45 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.9]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install pip dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install forthon mppl numpy h5py
+        python -m pip install flake8
+        python -m pip install pytest-isolate pytest-xdist
+    - name: Checkout develop branch
+      uses: actions/checkout@v4
+      with:
+        ref: develop
+        repository: LLNL/UEDGE 
+    - name: Build UEDGE
+      run: |
+        python setup.py build
+        python setup.py install
+    - name: Return to pytests branch
+      uses: actions/checkout@v4
+      with:
+        ref: pytests
+        repository: LLNL/UEDGE 
+    - name: Test with pytest
+      run: |
+        # Create a clean UEDGE instance for every test
+        pytest --isolate --tb=native pytests/unittests/D+C
diff --git a/.github/workflows/unittest_D-mols.yml b/.github/workflows/unittest_D-mols.yml
new file mode 100644
index 00000000..509377ac
--- /dev/null
+++ b/.github/workflows/unittest_D-mols.yml
@@ -0,0 +1,45 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.9]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install pip dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install forthon mppl numpy h5py
+        python -m pip install flake8
+        python -m pip install pytest-isolate pytest-xdist
+    - name: Checkout develop branch
+      uses: actions/checkout@v4
+      with:
+        ref: develop
+        repository: LLNL/UEDGE 
+    - name: Build UEDGE
+      run: |
+        python setup.py build
+        python setup.py install
+    - name: Return to pytests branch
+      uses: actions/checkout@v4
+      with:
+        ref: pytests
+        repository: LLNL/UEDGE 
+    - name: Test with pytest
+      run: |
+        # Create a clean UEDGE instance for every test
+        pytest --isolate --tb=native pytests/unittests/D_mols
diff --git a/.github/workflows/unittest_D-only-slab.yml b/.github/workflows/unittest_D-only-slab.yml
new file mode 100644
index 00000000..26624ce7
--- /dev/null
+++ b/.github/workflows/unittest_D-only-slab.yml
@@ -0,0 +1,45 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.9]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install pip dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install forthon mppl numpy h5py
+        python -m pip install flake8
+        python -m pip install pytest-isolate pytest-xdist
+    - name: Checkout develop branch
+      uses: actions/checkout@v4
+      with:
+        ref: develop
+        repository: LLNL/UEDGE 
+    - name: Build UEDGE
+      run: |
+        python setup.py build
+        python setup.py install
+    - name: Return to pytests branch
+      uses: actions/checkout@v4
+      with:
+        ref: pytests
+        repository: LLNL/UEDGE 
+    - name: Test with pytest
+      run: |
+        # Create a clean UEDGE instance for every test
+        pytest --isolate --tb=native pytests/unittests/slab_D_only
diff --git a/.github/workflows/unittest_D-only.yml b/.github/workflows/unittest_D-only.yml
new file mode 100644
index 00000000..eb0dc0af
--- /dev/null
+++ b/.github/workflows/unittest_D-only.yml
@@ -0,0 +1,45 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.9]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install pip dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install forthon mppl numpy h5py
+        python -m pip install flake8
+        python -m pip install pytest-isolate pytest-xdist
+    - name: Checkout develop branch
+      uses: actions/checkout@v4
+      with:
+        ref: develop
+        repository: LLNL/UEDGE 
+    - name: Build UEDGE
+      run: |
+        python setup.py build
+        python setup.py install
+    - name: Return to pytests branch
+      uses: actions/checkout@v4
+      with:
+        ref: pytests
+        repository: LLNL/UEDGE 
+    - name: Test with pytest
+      run: |
+        # Create a clean UEDGE instance for every test
+        pytest --isolate --tb=native pytests/unittests/D_only