diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f0a8cb51..8b837d6a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -97,10 +97,12 @@ jobs:
         run: cmake --build build --parallel 4
 
       - name: Build Tests
-        run: cmake --build build --parallel 4 -t build-tests
+        run: |
+          cmake --build build --parallel 4 --target build-tests
+          cmake --build build --parallel 4 --target tests
 
-      - name: Run Tests
-        run: ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4 --schedule-random
+      - name: Run Ctest
+        run: ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4
 
       - name: Archive log files on failure
         uses: actions/upload-artifact@v4
@@ -111,7 +113,7 @@ jobs:
             build/**/*.log
 
   Intel:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     env:
       FC: ifx
@@ -164,10 +166,12 @@ jobs:
         run: cmake --build build --parallel
 
       - name: Build Tests
-        run: cmake --build build --parallel -t build-tests
+        run: |
+          cmake --build build --parallel 4 --target build-tests
+          cmake --build build --parallel 4 --target tests
 
-      - name: Run Tests
-        run: ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4 --schedule-random
+      - name: Run Ctest
+        run: ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4
 
       - name: Archive log files on failure
         uses: actions/upload-artifact@v4
@@ -211,10 +215,12 @@ jobs:
         run: cmake --build build --parallel
 
       - name: Build Tests
-        run: cmake --build build --parallel -t build-tests
+        run: |
+          cmake --build build --parallel 4 --target build-tests
+          cmake --build build --parallel 4 --target tests
 
-      - name: Run Tests
-        run: ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4 --schedule-random
+      - name: Run Ctest
+        run: ctest --test-dir build --parallel 1 --output-on-failure --repeat until-pass:4
 
       - name: Archive log files on failure
         uses: actions/upload-artifact@v4
diff --git a/ChangeLog.md b/ChangeLog.md
index 6d82b389..23e4fd50 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - LLVMFlang compiler support
 
+### Fixed
+
+- Fixes some ctest failures
+
 ## [4.9.0] - 2024-02-06
 
 ### Added
diff --git a/bin/tests/inputs/MpiParameterizedTestCaseC.pf b/bin/tests/inputs/MpiParameterizedTestCaseC.pf
index a22180b5..3e046fd5 100644
--- a/bin/tests/inputs/MpiParameterizedTestCaseC.pf
+++ b/bin/tests/inputs/MpiParameterizedTestCaseC.pf
@@ -1,4 +1,4 @@
-module TestCaseC_mod
+module MpiParameterizedTestCaseC
    use pfunit_mod
    implicit none
 
@@ -117,6 +117,6 @@ contains
 
    end function toString
 
-end module TestCaseC_mod
+end module MpiParameterizedTestCaseC
 
 
diff --git a/bin/tests/inputs/MpiTestCaseB.pf b/bin/tests/inputs/MpiTestCaseB.pf
index daf82893..907937a1 100644
--- a/bin/tests/inputs/MpiTestCaseB.pf
+++ b/bin/tests/inputs/MpiTestCaseB.pf
@@ -1,4 +1,4 @@
-module MpiTestCaseB_mod
+module MpiTestCaseB
    use pfunit_mod
    implicit none
 
@@ -35,6 +35,6 @@ contains
       class (MpiTestCaseB), intent(inout) :: this
    end subroutine testB
 
-end module MpiTestCaseB_mod
+end module MpiTestCaseB
 
 
diff --git a/bin/tests/inputs/ParameterizedTestCaseB.pf b/bin/tests/inputs/ParameterizedTestCaseB.pf
index ddd64585..8c894cc0 100644
--- a/bin/tests/inputs/ParameterizedTestCaseB.pf
+++ b/bin/tests/inputs/ParameterizedTestCaseB.pf
@@ -1,4 +1,4 @@
-module TestCaseB_mod
+module ParameterizedTestCaseB
    use pfunit_mod
    implicit none
 
@@ -64,6 +64,6 @@ contains
 
    end function toString
 
-end module TestCaseB_mod
+end module ParameterizedTestCaseB
 
 
diff --git a/bin/tests/inputs/TestA.pf b/bin/tests/inputs/TestA.pf
index ee0ce16d..eece1473 100644
--- a/bin/tests/inputs/TestA.pf
+++ b/bin/tests/inputs/TestA.pf
@@ -1,4 +1,4 @@
-module TestA_mod
+module TestA
    use pfunit_mod
    implicit none
 
@@ -19,6 +19,6 @@ contains
       class (MpiTestMethod), intent(inout) :: this
    end subroutine testMethodC
 
-end module TestA_mod
+end module TestA
 
 
diff --git a/bin/tests/inputs/TestCaseA.pf b/bin/tests/inputs/TestCaseA.pf
index fa9bb5da..7205c978 100644
--- a/bin/tests/inputs/TestCaseA.pf
+++ b/bin/tests/inputs/TestCaseA.pf
@@ -1,4 +1,4 @@
-module TestCaseA_mod
+module TestCaseA
    use pfunit_mod
    implicit none
 
@@ -35,4 +35,4 @@ contains
       class (TestCaseA), intent(inout) :: this
    end subroutine testB
 
-end module TestCaseA_mod
+end module TestCaseA