diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
new file mode 100644
index 0000000..fb96aac
--- /dev/null
+++ b/.github/workflows/CI.yml
@@ -0,0 +1,69 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+concurrency:
+  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{github.event_name == 'pull_request'}}
+
+jobs:
+  CI:
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      matrix:
+        distro: ['ubuntu:latest']
+        cxx: ['g++']
+        cmake_build_type: ['Debug', 'Release']
+    runs-on: ubuntu-20.04
+    container: ghcr.io/ecp-copa/ci-containers/${{ matrix.distro }}
+    steps:
+      - name: Install bzip2
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y bzip2
+          sudo apt-get clean
+      - name: Cache boost
+        uses: actions/cache@v2
+        id: boost-cache
+        with:
+          path: ~/boost
+          key: boost-${{ matrix.distro }}-1.75.0
+          restore-keys: boost-${{ matrix.distro }}
+      - name: Get Boost
+        if: steps.boost-cache.outputs.cache-hit != 'true'
+        run: |
+             wget --quiet https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2 \
+                  --output-document=boost.tar.bz2
+             mkdir boost
+             tar -xf boost.tar.bz2 -C boost --strip-components=1
+      - name: Build Boost
+        if: steps.boost-cache.outputs.cache-hit != 'true'
+        working-directory: boost
+        run: |
+             ./bootstrap.sh --prefix=$HOME/boost
+             ./b2 \
+             hardcode-dll-paths=true dll-path=$HOME/boost/lib \
+             link=shared variant=release cxxflags=-w \
+             install
+      - name: Checkout
+        uses: actions/checkout@v2.2.0
+      - name: Build
+        run: |
+          cmake -B build \
+            -DCMAKE_INSTALL_PREFIX=$HOME/thermo4pfm \
+            -DCMAKE_PREFIX_PATH="$HOME/boost" \
+            -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} \
+            -DCMAKE_CXX_FLAGS="-Wall -Wextra -pedantic" \
+            -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }}
+          cmake --build build --parallel 2
+          cmake --install build
+      - name: Test
+        run: |
+          CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test
diff --git a/.github/workflows/Weekly.yml b/.github/workflows/Weekly.yml
new file mode 100644
index 0000000..b0ff42c
--- /dev/null
+++ b/.github/workflows/Weekly.yml
@@ -0,0 +1,62 @@
+name: Nightly
+on:
+  push:
+    branches:
+      - nightly_testing
+  schedule:
+    - cron:  '0 9 * * 1'
+
+jobs:
+  CI:
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      matrix:
+        distro: ['ubuntu:latest']
+        cmake_build_type: ['Debug']
+    runs-on: ubuntu-20.04
+    container: ghcr.io/ecp-copa/ci-containers/${{ matrix.distro }}
+    steps:
+      - name: Install bzip2
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y bzip2
+          sudo apt-get clean
+      - name: Cache boost
+        uses: actions/cache@v2
+        id: boost-cache
+        with:
+          path: ~/boost
+          key: boost-${{ matrix.distro }}-1.75.0
+          restore-keys: boost-${{ matrix.distro }}
+      - name: Get Boost
+        if: steps.boost-cache.outputs.cache-hit != 'true'
+        run: |
+             wget --quiet https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2 \
+                  --output-document=boost.tar.bz2
+             mkdir boost
+             tar -xf boost.tar.bz2 -C boost --strip-components=1
+      - name: Build Boost
+        if: steps.boost-cache.outputs.cache-hit != 'true'
+        working-directory: boost
+        run: |
+             ./bootstrap.sh --prefix=$HOME/boost
+             ./b2 \
+             hardcode-dll-paths=true dll-path=$HOME/boost/lib \
+             link=shared variant=release cxxflags=-w \
+             install
+      - name: Checkout
+        uses: actions/checkout@v2.2.0
+      - name: Build
+        run: |
+          cmake -B build \
+            -DCMAKE_INSTALL_PREFIX=$HOME/thermo4pfm \
+            -DCMAKE_PREFIX_PATH="$HOME/boost" \
+            -DCMAKE_CXX_FLAGS="-Wall -Wextra -pedantic" \
+            -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }}
+          cmake --build build --parallel 2
+          cmake --install build
+      - name: Test
+        run: |
+          CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
new file mode 100644
index 0000000..27ec3d1
--- /dev/null
+++ b/.github/workflows/format.yml
@@ -0,0 +1,13 @@
+name: Clang-Format Check
+on: [pull_request]
+jobs:
+  formatting-check:
+    name: Formatting Check
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Run clang-format style check
+      uses: jidicula/clang-format-action@v4.11.0
+      with:
+        clang-format-version: '6'
+        exclude-regex: tests/catch.hpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4b87919..506ae99 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -128,178 +128,178 @@ if (${OPENMP_CXX_FOUND})
 endif()
 
 add_test(NAME testPropertyTree
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testPropertyTree
          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests/property_tree)
 
 add_test(NAME testAlCuDatabases
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testAlCuDatabases
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testInterpolationFunctions
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testInterpolationFunctions)
 add_test(NAME testCALPHADFunctions
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADFunctions)
 add_test(NAME testCALPHADSpeciesPhaseGibbsEnergyExpansion
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADSpeciesPhaseGibbsEnergyExpansion
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADGibbsEnergy
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADGibbsEnergy
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADFreeEnergyFunctionsBinary
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADFreeEnergyFunctionsBinary
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADbinaryKKS
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADbinaryKKS
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADbinaryKKSThreePhase
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADbinaryKKSThreePhase
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADbinaryKKS3Ph2Sl
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADbinaryKKS3Ph2Sl
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADbinaryKKS2Ph1Sl
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADbinaryKKS2Ph1Sl
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADbinaryEquilibrium
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADbinaryEquilibrium
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADConcSolverBinaryThreePhase
-          COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+          COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADConcSolverBinaryThreePhase
           WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADConcSolverBinary3Ph2Sl
-        COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+        COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADConcSolverBinary3Ph2Sl
         WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testKKSdiluteBinaryKKS
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testKKSdiluteBinaryKKS
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testKKSdiluteBinaryEquilibrium
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testKKSdiluteBinaryEquilibrium
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADJacobianBinary
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADJacobianBinary
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADJacobianBinaryThreePhases
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADJacobianBinaryThreePhases
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADJacobianBinary3Ph2Sl
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADJacobianBinary3Ph2Sl
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADJacobianTernary
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADJacobianTernary
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADJacobianBinary2Ph1Sl
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADJacobianBinary2Ph1Sl
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADternaryKKS
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADternaryKKS
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADConcSolverTernary
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADConcSolverTernary
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testCALPHADternaryTieLine
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testCALPHADternaryTieLine
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testQuadraticBinary
-          COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+          COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testQuadraticBinary
           WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testQuadraticConcSolverBinaryThreePhase
-          COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+          COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testQuadraticConcSolverBinaryThreePhase
           WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testQuadraticFreeEnergyBinaryThreePhase
-          COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+          COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testQuadraticFreeEnergyBinaryThreePhase
           WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testQuadraticFreeEnergyTernaryThreePhase
-          COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+          COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testQuadraticFreeEnergyTernaryThreePhase
           WORKING_DIRECTORY ${TEST_DIR})
 
 if(${WITH_OPENMP_OFFLOAD})
   add_test(NAME testOpenMPoffload
-           COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-           ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+           COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+           ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
            ${CMAKE_CURRENT_BINARY_DIR}/testOpenMPoffload)
 endif()
 add_test(NAME testLoopCALPHADSpeciesPhaseGibbsEnergy
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testLoopCALPHADSpeciesPhaseGibbsEnergy
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testLoopCALPHADbinaryEquilibrium
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testLoopCALPHADbinaryEquilibrium
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testLoopCALPHADbinaryKKS
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testLoopCALPHADbinaryKKS
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testLoopCALPHADternaryKKS
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testLoopCALPHADternaryKKS
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testLoopCALPHADternaryTieLine
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testLoopCALPHADternaryTieLine
          WORKING_DIRECTORY ${TEST_DIR})
 add_test(NAME testLoopKKSdiluteBinaryKKS
-         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROCS_FLAG}
-         ${MPIEXEC_NUMPROCS} ${MPIEXEC_PREFLAGS}
+         COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG}
+         ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS}
          ${CMAKE_CURRENT_BINARY_DIR}/testLoopKKSdiluteBinaryKKS
          WORKING_DIRECTORY ${TEST_DIR})