diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d9b64f0f08f80b6809fe6860e17b7c24444351b..02c2d48ced6eb3f1e1c106f5d00e010b258fee3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
 stages:
-  - build
   - test
   - coverage
 
@@ -9,7 +8,6 @@ variables:
 include:
   - local: '/.gitlab-ci/clang10-mpi-debug.yml'
   - local: '/.gitlab-ci/clang10-mpi-release.yml'
-  - local: '/.gitlab-ci/gcc10-mpi-debug.yml'
   - local: '/.gitlab-ci/gcc10-mpi-coverage.yml'
   - local: '/.gitlab-ci/gcc10-mpi-release.yml'
   - local: '/.gitlab-ci/gcc10-seq-coverage.yml'
diff --git a/.gitlab-ci/clang10-mpi-debug.yml b/.gitlab-ci/clang10-mpi-debug.yml
index c9152e7ed8d39b4ed782771966e5a3f472472e66..ceafce232dcaf5935f1c6be403c796364a3b8c16 100644
--- a/.gitlab-ci/clang10-mpi-debug.yml
+++ b/.gitlab-ci/clang10-mpi-debug.yml
@@ -1,27 +1,13 @@
-build:clang10-mpi-debug:
-  image: localhost:5000/ubuntu_clang10_mpi
-  stage: build
-  needs: []
-  script:
-    - mkdir -p build/clang10-debug-mpi
-    - cd build/clang10-debug-mpi
-    - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
-    - make pugs
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-clang10-debug-mpi"
-    paths:
-      - build/clang10-debug-mpi
-    untracked: true
-
 test:clang10-mpi-debug:
   image: localhost:5000/ubuntu_clang10_mpi
   stage: test
-  needs: ["build:clang10-mpi-debug"]
+  needs: []
   script:
     - mkdir -p build/clang10-debug-mpi
     - cd build/clang10-debug-mpi
     - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
-    - make test
+    - make
+    - make check
   cache:
     key: "${CI_COMMIT_REF_SLUG}-clang10-debug-mpi"
     paths:
diff --git a/.gitlab-ci/clang10-mpi-release.yml b/.gitlab-ci/clang10-mpi-release.yml
index ebe76ce67fad1eb0325c15dea41108bdb088e5ca..58a2d2d2e3878ffd8672eb71e15b34a5d58062a6 100644
--- a/.gitlab-ci/clang10-mpi-release.yml
+++ b/.gitlab-ci/clang10-mpi-release.yml
@@ -1,27 +1,13 @@
-build:clang10-mpi-release:
-  image: localhost:5000/ubuntu_clang10_mpi
-  stage: build
-  needs: []
-  script:
-    - mkdir -p build/clang10-release-mpi
-    - cd build/clang10-release-mpi
-    - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-10
-    - make pugs
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-clang10-release-mpi"
-    paths:
-      - build/clang10-release-mpi
-    untracked: true
-
 test:clang10-mpi-release:
   image: localhost:5000/ubuntu_clang10_mpi
   stage: test
-  needs: ["build:clang10-mpi-release"]
+  needs: []
   script:
     - mkdir -p build/clang10-release-mpi
     - cd build/clang10-release-mpi
     - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-10
-    - make test
+    - make
+    - make check
   cache:
     key: "${CI_COMMIT_REF_SLUG}-clang10-release-mpi"
     paths:
diff --git a/.gitlab-ci/gcc10-mpi-coverage.yml b/.gitlab-ci/gcc10-mpi-coverage.yml
index 156592e9f4c080b545915a5e9a7aecef96ce3d2e..f09cb1b305c9e38b5012fd42d52d6aafffcfb907 100644
--- a/.gitlab-ci/gcc10-mpi-coverage.yml
+++ b/.gitlab-ci/gcc10-mpi-coverage.yml
@@ -1,11 +1,12 @@
 coverage:gcc10-mpi-coverage:
   image: localhost:5000/ubuntu_gcc10_mpi
   stage: coverage
+  needs: []
   script:
     - mkdir -p build/gcc10-cov-mpi
     - cd build/gcc10-cov-mpi
     - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
-    - make pugs
+    - make
     - make coverage
   cache:
     key: "${CI_COMMIT_REF_SLUG}-gcc10-cov-mpi"
diff --git a/.gitlab-ci/gcc10-mpi-debug.yml b/.gitlab-ci/gcc10-mpi-debug.yml
deleted file mode 100644
index c29467b2aa5478d67ddbb49794205bcdf08da07b..0000000000000000000000000000000000000000
--- a/.gitlab-ci/gcc10-mpi-debug.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-build:gcc10-mpi-debug:
-  image: localhost:5000/ubuntu_gcc10_mpi
-  stage: build
-  needs: []
-  script:
-    - mkdir -p build/gcc10-debug-mpi
-    - cd build/gcc10-debug-mpi
-    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
-    - make pugs
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc10-debug-mpi"
-    paths:
-      - build/gcc10-debug-mpi
-    untracked: true
-
-test:gcc10-mpi-debug:
-  image: localhost:5000/ubuntu_gcc10_mpi
-  stage: test
-  needs: ["build:gcc10-mpi-debug"]
-  script:
-    - mkdir -p build/gcc10-debug-mpi
-    - cd build/gcc10-debug-mpi
-    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
-    - make test
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc10-debug-mpi"
-    paths:
-      - build/gcc10-debug-mpi
-    untracked: true
diff --git a/.gitlab-ci/gcc10-mpi-release.yml b/.gitlab-ci/gcc10-mpi-release.yml
index 027d5e115f2419f858d7fe5cfbceee4bd1c09cc8..5e8277ad61a089d8baa72e5cc7e8d2b7219ad775 100644
--- a/.gitlab-ci/gcc10-mpi-release.yml
+++ b/.gitlab-ci/gcc10-mpi-release.yml
@@ -1,26 +1,12 @@
-build:gcc10-mpi-release:
-  image: localhost:5000/ubuntu_gcc10_mpi
-  stage: build
-  needs: []
-  script:
-    - mkdir -p build/gcc10-release-mpi
-    - cd build/gcc10-release-mpi
-    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release
-    - make pugs
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc10-release-mpi"
-    paths:
-      - build/gcc10-release-mpi
-    untracked: true
-
 test:gcc10-mpi-release:
   image: localhost:5000/ubuntu_gcc10_mpi
   stage: test
-  needs: ["build:gcc10-mpi-release"]
+  needs: []
   script:
     - mkdir -p build/gcc10-release-mpi
     - cd build/gcc10-release-mpi
     - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release
+    - make
     - make test
   cache:
     key: "${CI_COMMIT_REF_SLUG}-gcc10-release-mpi"
diff --git a/.gitlab-ci/gcc10-seq-coverage.yml b/.gitlab-ci/gcc10-seq-coverage.yml
index 663798274b0c465892c78084dde56022b151b1ba..ba80263a3366599ee1f6553596eab98f124be90a 100644
--- a/.gitlab-ci/gcc10-seq-coverage.yml
+++ b/.gitlab-ci/gcc10-seq-coverage.yml
@@ -1,11 +1,12 @@
 coverage:gcc10-seq-coverage:
   image: localhost:5000/ubuntu_gcc10
   stage: coverage
+  needs: []
   script:
     - mkdir -p build/gcc10-cov
     - cd build/gcc10-cov
     - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
-    - make pugs
+    - make
     - make coverage
   cache:
     key: "${CI_COMMIT_REF_SLUG}-gcc10-cov"
diff --git a/.gitlab-ci/gcc10-seq-release.yml b/.gitlab-ci/gcc10-seq-release.yml
index 8370c4684d79b9fac3b5389e62cecac8d15d00df..b4423bbd31f947698a5fa4dc13171e0582fc5d32 100644
--- a/.gitlab-ci/gcc10-seq-release.yml
+++ b/.gitlab-ci/gcc10-seq-release.yml
@@ -1,27 +1,13 @@
-build:gcc10-seq-release:
-  image: localhost:5000/ubuntu_gcc10
-  stage: build
-  needs: []
-  script:
-    - mkdir -p build/gcc10-release-seq
-    - cd build/gcc10-release-seq
-    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release
-    - make pugs
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc10-release-seq"
-    paths:
-      - build/gcc10-release-seq
-    untracked: true
-
 test:gcc10-seq-release:
   image: localhost:5000/ubuntu_gcc10
   stage: test
-  needs: ["build:gcc10-seq-release"]
+  needs: []
   script:
     - mkdir -p build/gcc10-release-seq
     - cd build/gcc10-release-seq
     - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release
-    - make test
+    - make
+    - make check
   cache:
     key: "${CI_COMMIT_REF_SLUG}-gcc10-release-seq"
     paths: