diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a8e3506bda394cd236822c46ee6e5a8deaa1d49..9d18ca201acf7bacffc4b35fcf7e9e333820fc5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,98 +95,6 @@ stages:
 ###############################################################################
 
 
-
-icc_2022_serial:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:32
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-      WARNING_ERROR: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda11
-      - docker
-
-icc_2022_mpionly:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:32
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WARNING_ERROR: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda11
-      - docker
-
-icc_2022_hybrid:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:32
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      WARNING_ERROR: "OFF"
-   tags:
-      - cuda11
-      - docker
-
-icc_2022_serial_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:32
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WARNING_ERROR: "OFF"
-   tags:
-      - cuda11
-      - docker
-
-icc_2022_mpionly_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:32
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WARNING_ERROR: "OFF"
-   tags:
-      - cuda11
-      - docker
-
-icc_2022_hybrid_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:32
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WARNING_ERROR: "OFF"
-   tags:
-      - cuda11
-      - docker
-
-icc_2022_hybrid_dbg_sp:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:32
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_DOUBLE_ACCURACY: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WARNING_ERROR: "OFF"
-   tags:
-      - cuda11
-      - docker
-
 icx_2024_serial:
    extends: .build_template
    image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2024:32
@@ -2035,10 +1943,12 @@ doc:
 ###############################################################################
 
 clang-tidy:
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-18
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-18:33
    stage: "Code Quality"
    needs: []
    before_script:
+      - python3 -m venv ci-venv
+      - source ci-venv/bin/activate
       - pip install pyyaml
    script:
       - $CXX --version
diff --git a/tests/lbm/CMakeLists.txt b/tests/lbm/CMakeLists.txt
index d3111aa32ce6587662a37b4283f5ac36168b7a34..79c031a96b5ab1ee9a4ba1ce4ca018d54e5c0a68 100644
--- a/tests/lbm/CMakeLists.txt
+++ b/tests/lbm/CMakeLists.txt
@@ -196,8 +196,6 @@ waLBerla_compile_test( FILES     free_surface/bubble_model/MovingSpheresTest.cpp
                                  free_surface/bubble_model/BubbleBodyMover.impl.h
                                  free_surface/bubble_model/BubbleModelTester.impl.h
       DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop )
-waLBerla_execute_test( NAME      MovingSpheresTest
-                       PROCESSES 2 )
 
 waLBerla_compile_test( FILES    free_surface/bubble_model/RegionalFloodFillTest.cpp
       DEPENDS walberla::field walberla::lbm )
@@ -255,21 +253,18 @@ waLBerla_compile_test( FILES    free_surface/dynamics/PdfRefillingTest.cpp
       DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
 waLBerla_execute_test( NAME     PdfRefillingTest )
 
-waLBerla_compile_test( FILES    free_surface/dynamics/WettingConversionTest.cpp
-      DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop )
-waLBerla_execute_test( NAME     WettingConversionTest )
-
 waLBerla_compile_test( FILES    free_surface/surface_geometry/CellFluidVolumeTest.cpp
       DEPENDS walberla::lbm )
 waLBerla_execute_test( NAME     CellFluidVolumeTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/CurvatureOfSineTest.cpp
       DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
-waLBerla_execute_test( NAME     CurvatureOfSineTest )
+
+waLBerla_compile_test( FILES    free_surface/dynamics/WettingConversionTest.cpp
+      DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/CurvatureOfSphereTest.cpp
       DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop )
-waLBerla_execute_test( NAME     CurvatureOfSphereTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/DetectWettingTest.cpp
       DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
@@ -281,11 +276,9 @@ waLBerla_execute_test( NAME     GetInterfacePointTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/NormalsOfSineTest.cpp
       DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
-waLBerla_execute_test( NAME     NormalsOfSineTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/NormalsOfSphereTest.cpp
       DEPENDS walberla::blockforest walberla::field walberla::geometry walberla::lbm walberla::timeloop )
-waLBerla_execute_test( NAME     NormalsOfSphereTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/NormalsEquivalenceTest.cpp
       DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
@@ -305,4 +298,15 @@ waLBerla_execute_test( NAME     ObstacleNormalsTest )
 
 waLBerla_compile_test( FILES    free_surface/surface_geometry/WettingCurvatureTest.cpp
       DEPENDS walberla::blockforest walberla::field walberla::lbm walberla::timeloop )
-waLBerla_execute_test( NAME     WettingCurvatureTest )
\ No newline at end of file
+waLBerla_execute_test( NAME     WettingCurvatureTest )
+
+#     Slow-running tests that should only be active in Release mode
+
+if( ${CMAKE_BUILD_TYPE} STREQUAL "Release" )
+      waLBerla_execute_test( NAME     MovingSpheresTest PROCESSES 2 )
+      waLBerla_execute_test( NAME     WettingConversionTest )
+      waLBerla_execute_test( NAME     CurvatureOfSineTest )
+      waLBerla_execute_test( NAME     CurvatureOfSphereTest )
+      waLBerla_execute_test( NAME     NormalsOfSineTest )
+      waLBerla_execute_test( NAME     NormalsOfSphereTest )
+endif()
diff --git a/tests/pe/CMakeLists.txt b/tests/pe/CMakeLists.txt
index 0b337411a5bcfb130678f6e39a5f2820bb65d3e7..57d323d2ba2aeceea677bc16f69396230932e6fb 100644
--- a/tests/pe/CMakeLists.txt
+++ b/tests/pe/CMakeLists.txt
@@ -8,115 +8,142 @@ waLBerla_link_files_to_builddir( *.cfg )
 waLBerla_link_files_to_builddir( *.sbf )
 
 waLBerla_compile_test( NAME PE_BODYFLAGS FILES BodyFlags.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_BODYFLAGS PROCESSES 8)
 
 waLBerla_compile_test( NAME PE_BODYITERATORS FILES BodyIterators.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_BODYITERATORS PROCESSES 2 )
 
 waLBerla_compile_test( NAME PE_BODYSTORAGE FILES BodyStorage.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_BODYSTORAGE )
 
 waLBerla_compile_test( NAME PE_CALLBACK FILES Callback.cpp DEPENDS walberla::blockforest walberla::core walberla::domain_decomposition )
-waLBerla_execute_test( NAME   PE_CALLBACK PROCESSES 2 )
 
 waLBerla_compile_test( NAME PE_CHECKVITALPARAMETERS FILES CheckVitalParameters.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_CHECKVITALPARAMETERS )
 
 waLBerla_compile_test( NAME PE_COLLISION FILES Collision.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_COLLISION )
 
 waLBerla_compile_test( NAME PE_COLLISIONTOBIASGJK FILES CollisionTobiasGJK.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_COLLISIONTOBIASGJK )
 
 waLBerla_compile_test( NAME PE_CREATEWORLD FILES CreateWorld.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_CREATEWORLD )
 
 waLBerla_compile_test( NAME PE_DELETEBODY FILES DeleteBody.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_DELETEBODY_NN COMMAND $<TARGET_FILE:PE_DELETEBODY> )
-waLBerla_execute_test( NAME   PE_DELETEBODY_SO COMMAND $<TARGET_FILE:PE_DELETEBODY> --syncShadowOwners )
 
 waLBerla_compile_test( NAME PE_DESTROYBODY FILES DestroyBody.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_DESTROYBODY )
 
 waLBerla_compile_test( NAME PE_DOCUMENTATIONSNIPPETS FILES PeDocumentationSnippets.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_DOCUMENTATIONSNIPPETS )
 
 waLBerla_compile_test( NAME PE_DYNAMICREFINEMENT FILES DynamicRefinement.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_DYNAMICREFINEMENT )
 
 waLBerla_compile_test( NAME PE_FORCESYNC FILES ForceSync.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_FORCESYNC )
 
 waLBerla_compile_test( NAME PE_HASHGRIDS FILES HashGrids.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_HASHGRIDS_REL COMMAND $<TARGET_FILE:PE_HASHGRIDS> 10000 CONFIGURATIONS Release RelWithDbgInfo)
-waLBerla_execute_test( NAME   PE_HASHGRIDS_DBG COMMAND $<TARGET_FILE:PE_HASHGRIDS> 1000)
 
 waLBerla_compile_test( NAME PE_HCSITS FILES HCSITS.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_HCSITS )
 
 waLBerla_compile_test( NAME PE_LOADFROMCONFIG FILES LoadFromConfig.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_LOADFROMCONFIG COMMAND $<TARGET_FILE:PE_LOADFROMCONFIG> ${CMAKE_CURRENT_SOURCE_DIR}/LoadFromConfig.cfg )
 
 waLBerla_compile_test( NAME PE_MARSHALLING FILES Marshalling.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_MARSHALLING )
 
 waLBerla_compile_test( NAME PE_MATERIAL FILES Material.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_MATERIAL )
 
 waLBerla_compile_test( NAME PE_MINMAXREFINEMENT FILES MinMaxRefinement.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_MINMAXREFINEMENT PROCESSES 8 )
 
 waLBerla_compile_test( NAME PE_OVERLAP FILES Overlap.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_OVERLAP )
 
 waLBerla_compile_test( NAME PE_PARALLELEQUIVALENCE FILES ParallelEquivalence.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_PARALLELEQUIVALENCE PROCESSES 4 )
 
 if( WALBERLA_BUILD_WITH_PARMETIS )
    waLBerla_compile_test( NAME PE_PARMETIS FILES ParMetis.cpp DEPENDS walberla::core walberla::blockforest )
-   waLBerla_execute_test( NAME   PE_PARMETIS PROCESSES 64 )
 endif()
 
 waLBerla_compile_test( NAME PE_PARSEMESSAGE FILES ParseMessage.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_PARSEMESSAGE )
 
 waLBerla_compile_test( NAME PE_REFINEMENT FILES Refinement.cpp DEPENDS walberla::core walberla::blockforest walberla::timeloop )
-waLBerla_execute_test( NAME   PE_REFINEMENT )
 
 waLBerla_compile_test( NAME PE_REFINEMENTWITHSPAREPROCESSES FILES RefinementWithSpareProcesses.cpp DEPENDS walberla::core walberla::blockforest )
-waLBerla_execute_test( NAME   PE_REFINEMENTWITHSPAREPROCESSES PROCESSES 27 )
 
 waLBerla_compile_test( NAME PE_RIGIDBODY FILES RigidBody.cpp DEPENDS walberla::core )
-waLBerla_execute_test( NAME   PE_RIGIDBODY )
 
 waLBerla_compile_test( NAME PE_SERIALIZEDESERIALIZE FILES SerializeDeserialize.cpp DEPENDS walberla::core walberla::blockforest )
+
+waLBerla_compile_test( NAME PE_SHADOWCOPY FILES ShadowCopy.cpp DEPENDS walberla::core walberla::blockforest walberla::domain_decomposition )
+
+waLBerla_compile_test( NAME PE_SIMPLECCD FILES SimpleCCD.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_SYNCEQUIVALENCE FILES SyncEquivalence.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_SYNCHRONIZATION FILES Synchronization.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_SYNCHRONIZATIONDELETE FILES SynchronizationDelete.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_SYNCHRONIZATIONLARGEBODY FILES SynchronizationLargeBody.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_STATICTYPEIDS FILES SetBodyTypeIDs.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_UNION FILES Union.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_UNIONBEHAVIOR FILES UnionBehavior.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_RAYTRACING FILES Raytracing.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_RAYTRACING_INTERSECTION FILES RaytracingIntersection.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_RAYTRACING_SPHERE FILES RaytracingSphere.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_RAYTRACING_HASHGRIDS FILES RaytracingHashGrids.cpp DEPENDS walberla::core )
+
+waLBerla_compile_test( NAME PE_VOLUMEINERTIA FILES VolumeInertia.cpp DEPENDS walberla::core )
+
+if( ${CMAKE_BUILD_TYPE} STREQUAL "Release" )
+
+waLBerla_execute_test( NAME   PE_BODYFLAGS PROCESSES 8)
+waLBerla_execute_test( NAME   PE_BODYITERATORS PROCESSES 2 )
+waLBerla_execute_test( NAME   PE_BODYSTORAGE )
+waLBerla_execute_test( NAME   PE_CALLBACK PROCESSES 2 )
+waLBerla_execute_test( NAME   PE_CHECKVITALPARAMETERS )
+waLBerla_execute_test( NAME   PE_COLLISION )
+waLBerla_execute_test( NAME   PE_COLLISIONTOBIASGJK )
+waLBerla_execute_test( NAME   PE_CREATEWORLD )
+waLBerla_execute_test( NAME   PE_DELETEBODY_NN COMMAND $<TARGET_FILE:PE_DELETEBODY> )
+waLBerla_execute_test( NAME   PE_DELETEBODY_SO COMMAND $<TARGET_FILE:PE_DELETEBODY> --syncShadowOwners )
+waLBerla_execute_test( NAME   PE_DESTROYBODY )
+waLBerla_execute_test( NAME   PE_DOCUMENTATIONSNIPPETS )
+waLBerla_execute_test( NAME   PE_DYNAMICREFINEMENT )
+waLBerla_execute_test( NAME   PE_FORCESYNC )
+waLBerla_execute_test( NAME   PE_HASHGRIDS_REL COMMAND $<TARGET_FILE:PE_HASHGRIDS> 10000 CONFIGURATIONS Release RelWithDbgInfo)
+waLBerla_execute_test( NAME   PE_HASHGRIDS_DBG COMMAND $<TARGET_FILE:PE_HASHGRIDS> 1000)
+waLBerla_execute_test( NAME   PE_HCSITS )
+waLBerla_execute_test( NAME   PE_LOADFROMCONFIG COMMAND $<TARGET_FILE:PE_LOADFROMCONFIG> ${CMAKE_CURRENT_SOURCE_DIR}/LoadFromConfig.cfg )
+waLBerla_execute_test( NAME   PE_MARSHALLING )
+waLBerla_execute_test( NAME   PE_MATERIAL )
+waLBerla_execute_test( NAME   PE_MINMAXREFINEMENT PROCESSES 8 )
+waLBerla_execute_test( NAME   PE_OVERLAP )
+waLBerla_execute_test( NAME   PE_PARALLELEQUIVALENCE PROCESSES 4 )
+
+if( WALBERLA_BUILD_WITH_PARMETIS )
+   waLBerla_execute_test( NAME   PE_PARMETIS PROCESSES 64 )
+endif()
+
+waLBerla_execute_test( NAME   PE_PARSEMESSAGE )
+waLBerla_execute_test( NAME   PE_REFINEMENT )
+waLBerla_execute_test( NAME   PE_REFINEMENTWITHSPAREPROCESSES PROCESSES 27 )
+waLBerla_execute_test( NAME   PE_RIGIDBODY )
 waLBerla_execute_test( NAME   PE_SERIALIZEDESERIALIZE01 COMMAND $<TARGET_FILE:PE_SERIALIZEDESERIALIZE> PROCESSES 1 )
 waLBerla_execute_test( NAME   PE_SERIALIZEDESERIALIZE02 COMMAND $<TARGET_FILE:PE_SERIALIZEDESERIALIZE> PROCESSES 2 )
 waLBerla_execute_test( NAME   PE_SERIALIZEDESERIALIZE04 COMMAND $<TARGET_FILE:PE_SERIALIZEDESERIALIZE> PROCESSES 4 )
 waLBerla_execute_test( NAME   PE_SERIALIZEDESERIALIZE08 COMMAND $<TARGET_FILE:PE_SERIALIZEDESERIALIZE> PROCESSES 8 )
+
 if( WALBERLA_BUILD_WITH_MPI )
-set_property( TEST PE_SERIALIZEDESERIALIZE02 PROPERTY DEPENDS PE_SERIALIZEDESERIALIZE01 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
-set_property( TEST PE_SERIALIZEDESERIALIZE04 PROPERTY DEPENDS PE_SERIALIZEDESERIALIZE02 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
-set_property( TEST PE_SERIALIZEDESERIALIZE08 PROPERTY DEPENDS PE_SERIALIZEDESERIALIZE04 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
+   set_property( TEST PE_SERIALIZEDESERIALIZE02 PROPERTY DEPENDS PE_SERIALIZEDESERIALIZE01 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
+   set_property( TEST PE_SERIALIZEDESERIALIZE04 PROPERTY DEPENDS PE_SERIALIZEDESERIALIZE02 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
+   set_property( TEST PE_SERIALIZEDESERIALIZE08 PROPERTY DEPENDS PE_SERIALIZEDESERIALIZE04 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
 endif()
 
-waLBerla_compile_test( NAME PE_SHADOWCOPY FILES ShadowCopy.cpp DEPENDS walberla::core walberla::blockforest walberla::domain_decomposition )
 waLBerla_execute_test( NAME   PE_SHADOWCOPY_NN COMMAND $<TARGET_FILE:PE_SHADOWCOPY> )
 waLBerla_execute_test( NAME   PE_SHADOWCOPY_SO COMMAND $<TARGET_FILE:PE_SHADOWCOPY> --syncShadowOwners )
-
-waLBerla_compile_test( NAME PE_SIMPLECCD FILES SimpleCCD.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_SIMPLECCD )
-
-waLBerla_compile_test( NAME PE_SYNCEQUIVALENCE FILES SyncEquivalence.cpp DEPENDS walberla::core )
-#waLBerla_execute_test( NAME   PE_SYNCEQUIVALENCE COMMAND $<TARGET_FILE:PE_SYNCEQUIVALENCE> PROCESSES  8 )
-
-waLBerla_compile_test( NAME PE_SYNCHRONIZATION FILES Synchronization.cpp DEPENDS walberla::core )
+# waLBerla_execute_test( NAME   PE_SYNCEQUIVALENCE COMMAND $<TARGET_FILE:PE_SYNCEQUIVALENCE> PROCESSES  8 )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATION01 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATION03 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> PROCESSES  3 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATION09 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> PROCESSES  9 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATION27 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> PROCESSES 27)
-
-waLBerla_compile_test( NAME PE_SYNCHRONIZATIONDELETE FILES SynchronizationDelete.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE01_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE03_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES  3 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE09_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES  9 LABELS longrun)
@@ -125,35 +152,21 @@ waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE01_SO COMMAND $<TARGET_FIL
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE03_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners PROCESSES  3 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE09_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners PROCESSES  9 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONDELETE27_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners PROCESSES 27)
-
-waLBerla_compile_test( NAME PE_SYNCHRONIZATIONLARGEBODY FILES SynchronizationLargeBody.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONLARGEBODY01 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> )
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONLARGEBODY03 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> PROCESSES  3 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONLARGEBODY09 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> PROCESSES  9 LABELS longrun)
 waLBerla_execute_test( NAME   PE_SYNCHRONIZATIONLARGEBODY27 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> PROCESSES 27)
-
-waLBerla_compile_test( NAME PE_STATICTYPEIDS FILES SetBodyTypeIDs.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_STATICTYPEIDS )
-
-waLBerla_compile_test( NAME PE_UNION FILES Union.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_UNION )
 
-waLBerla_compile_test( NAME PE_UNIONBEHAVIOR FILES UnionBehavior.cpp DEPENDS walberla::core )
 if( WALBERLA_DOUBLE_ACCURACY )
-waLBerla_execute_test( NAME   PE_UNIONBEHAVIOR )
+   waLBerla_execute_test( NAME   PE_UNIONBEHAVIOR )
 endif()
 
-waLBerla_compile_test( NAME PE_RAYTRACING FILES Raytracing.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_RAYTRACING )
-
-waLBerla_compile_test( NAME PE_RAYTRACING_INTERSECTION FILES RaytracingIntersection.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_RAYTRACING_INTERSECTION )
-
-waLBerla_compile_test( NAME PE_RAYTRACING_SPHERE FILES RaytracingSphere.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_RAYTRACING_SPHERE )
-
-waLBerla_compile_test( NAME PE_RAYTRACING_HASHGRIDS FILES RaytracingHashGrids.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_RAYTRACING_HASHGRIDS )
-
-waLBerla_compile_test( NAME PE_VOLUMEINERTIA FILES VolumeInertia.cpp DEPENDS walberla::core )
 waLBerla_execute_test( NAME   PE_VOLUMEINERTIA CONFIGURATIONS Release RelWithDbgInfo)
+
+endif()
diff --git a/tests/pe_coupling/CMakeLists.txt b/tests/pe_coupling/CMakeLists.txt
index 7adf21fa35fff8474d9f331835d1cd2f7201cbd4..ff3cf764849f1209fa9974c4d8c7e60f8083aea5 100644
--- a/tests/pe_coupling/CMakeLists.txt
+++ b/tests/pe_coupling/CMakeLists.txt
@@ -10,6 +10,69 @@
 ###################################################################################################
 
 waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES partially_saturated_cells_method/SegreSilberbergPSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES partially_saturated_cells_method/TorqueSpherePSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+###################################################################################################
+# Momentum exchange method tests
+###################################################################################################
+
+waLBerla_compile_test( FILES momentum_exchange_method/BodyAtBlockBoarderCheck.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/BodyMappingTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEMRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/LubricationCorrectionMEM.cpp DEPENDS walberla::blockforest walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/PeriodicParticleChannelMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/TaylorCouetteFlowMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/SegreSilberbergMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEM.cpp DEPENDS walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp DEPENDS walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp DEPENDS walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/TorqueSphereMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES momentum_exchange_method/SquirmerTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+###################################################################################################
+# Discrete particle methods tests
+###################################################################################################
+
+waLBerla_compile_test( FILES discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+###################################################################################################
+# Geometry tests
+###################################################################################################
+
+waLBerla_compile_test( FILES geometry/PeIntersectionRatioTest.cpp DEPENDS walberla::pe )
+
+###################################################################################################
+# Utility tests
+###################################################################################################
+
+waLBerla_compile_test( FILES utility/BodiesForceTorqueContainerTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+waLBerla_compile_test( FILES utility/PeSubCyclingTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
+
+if( ${CMAKE_BUILD_TYPE} STREQUAL "Release" )
+
 waLBerla_execute_test( NAME DragForceSpherePSMSC1W1FuncTest     COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC1W1 --funcTest PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSpherePSMSC1W1SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC1W1            PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSpherePSMSC1W1ParallelTest COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC1W1            PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -23,8 +86,6 @@ waLBerla_execute_test( NAME DragForceSpherePSMSC2W2FuncTest     COMMAND $<TARGET
 waLBerla_execute_test( NAME DragForceSpherePSMSC2W2SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC2W2            PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSpherePSMSC3W2FuncTest     COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC3W2 --funcTest PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSpherePSMSC3W2SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSM> --PSMVariant SC3W2            PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
-
-waLBerla_compile_test( FILES partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W1FuncTest     COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC1W1 --funcTest PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W1SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC1W1            PROCESSES 1 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W1ParallelTest COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC1W1            PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -33,8 +94,6 @@ waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC3W1SingleTest   COMMAN
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC1W2SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC1W2            PROCESSES 1 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC2W2SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC2W2            PROCESSES 1 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSpherePSMRefinementSC3W2SingleTest   COMMAND $<TARGET_FILE:DragForceSpherePSMRefinement> --PSMVariant SC3W2            PROCESSES 1 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
-
-waLBerla_compile_test( FILES partially_saturated_cells_method/SegreSilberbergPSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME SegreSilberbergPSMSC1W1FuncTest     COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC1W1 --funcTest  PROCESSES 9 )
 waLBerla_execute_test( NAME SegreSilberbergPSMSC1W1Test         COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC1W1             PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME SegreSilberbergPSMSC2W1FuncTest     COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC2W1 --funcTest  PROCESSES 9 )
@@ -47,8 +106,6 @@ waLBerla_execute_test( NAME SegreSilberbergPSMSC2W2FuncTest     COMMAND $<TARGET
 waLBerla_execute_test( NAME SegreSilberbergPSMSC2W2Test         COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC2W2             PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME SegreSilberbergPSMSC3W2FuncTest     COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC3W2 --funcTest  PROCESSES 9 )
 waLBerla_execute_test( NAME SegreSilberbergPSMSC3W2Test         COMMAND $<TARGET_FILE:SegreSilberbergPSM> --SC3W2             PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
-
-waLBerla_compile_test( FILES partially_saturated_cells_method/TorqueSpherePSM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME TorqueSpherePSMSC1W1FuncTest     COMMAND $<TARGET_FILE:TorqueSpherePSM> --funcTest --SC1W1   PROCESSES 1 )
 waLBerla_execute_test( NAME TorqueSpherePSMSC1W1SingleTest   COMMAND $<TARGET_FILE:TorqueSpherePSM> --SC1W1              PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME TorqueSpherePSMSC1W1ParallelTest COMMAND $<TARGET_FILE:TorqueSpherePSM> --SC1W1              PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -62,20 +119,10 @@ waLBerla_execute_test( NAME TorqueSpherePSMSC2W2FuncTest     COMMAND $<TARGET_FI
 waLBerla_execute_test( NAME TorqueSpherePSMSC2W2SingleTest   COMMAND $<TARGET_FILE:TorqueSpherePSM> --SC2W2              PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME TorqueSpherePSMSC3W2FuncTest     COMMAND $<TARGET_FILE:TorqueSpherePSM> --funcTest --SC3W2   PROCESSES 1 )
 waLBerla_execute_test( NAME TorqueSpherePSMSC3W2SingleTest   COMMAND $<TARGET_FILE:TorqueSpherePSM> --SC3W2              PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
-
-###################################################################################################
-# Momentum exchange method tests
-###################################################################################################
-
-waLBerla_compile_test( FILES momentum_exchange_method/BodyAtBlockBoarderCheck.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME BodyAtBlockBoarderCheckTest1        COMMAND $<TARGET_FILE:BodyAtBlockBoarderCheck> 1         PROCESSES 8 )
 waLBerla_execute_test( NAME BodyAtBlockBoarderCheckTest2        COMMAND $<TARGET_FILE:BodyAtBlockBoarderCheck> 2         PROCESSES 8 LABELS longrun )
 waLBerla_execute_test( NAME BodyAtBlockBoarderCheckTest3        COMMAND $<TARGET_FILE:BodyAtBlockBoarderCheck> 3         PROCESSES 8 LABELS verylongrun )
-
-waLBerla_compile_test( FILES momentum_exchange_method/BodyMappingTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME BodyMappingTest COMMAND $<TARGET_FILE:BodyMappingTest> PROCESSES 1 )
-
-waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME DragForceSphereMEMFuncTest        COMMAND $<TARGET_FILE:DragForceSphereMEM> --funcTest          PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSphereMEMSingleTest      COMMAND $<TARGET_FILE:DragForceSphereMEM>                     PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSphereMEMParallelTest    COMMAND $<TARGET_FILE:DragForceSphereMEM>                     PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -85,29 +132,17 @@ waLBerla_execute_test( NAME DragForceSphereMEMCLIParallelTest COMMAND $<TARGET_F
 waLBerla_execute_test( NAME DragForceSphereMEMMRFuncTest      COMMAND $<TARGET_FILE:DragForceSphereMEM> --MEMVariant MR  --funcTest PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSphereMEMMRSingleTest    COMMAND $<TARGET_FILE:DragForceSphereMEM> --MEMVariant MR             PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSphereMEMMRParallelTest  COMMAND $<TARGET_FILE:DragForceSphereMEM> --MEMVariant MR             PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
-
-waLBerla_compile_test( FILES momentum_exchange_method/DragForceSphereMEMRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME DragForceSphereMEMRefinementFuncTest        COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement> --funcTest          PROCESSES 1 )
 waLBerla_execute_test( NAME DragForceSphereMEMRefinementSingleTest      COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement>                     PROCESSES 4 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSphereMEMRefinementParallelTest    COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement>                     PROCESSES 5 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME DragForceSphereMEMRefinementCLITest         COMMAND $<TARGET_FILE:DragForceSphereMEMRefinement> --MO_CLI            PROCESSES 4 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
-
-waLBerla_compile_test( FILES momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME GlobalBodyAsBoundaryMEMStaticRefinementTest        COMMAND $<TARGET_FILE:GlobalBodyAsBoundaryMEMStaticRefinement>          PROCESSES 1 )
-
-waLBerla_compile_test( FILES momentum_exchange_method/LubricationCorrectionMEM.cpp DEPENDS walberla::blockforest walberla::timeloop )
 waLBerla_execute_test( NAME LubricationCorrectionMEMFuncTest         COMMAND $<TARGET_FILE:LubricationCorrectionMEM> --funcTest                   PROCESSES 3 )
 waLBerla_execute_test( NAME LubricationCorrectionMEMSphereSphereTest COMMAND $<TARGET_FILE:LubricationCorrectionMEM> --split --fzyx --sphSphTest  PROCESSES 6 LABELS longrun             CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME LubricationCorrectionMEMSphereWallTest   COMMAND $<TARGET_FILE:LubricationCorrectionMEM> --split --fzyx --sphWallTest PROCESSES 3 LABELS longrun verylongrun CONFIGURATIONS Release RelWithDbgInfo )
-
-waLBerla_compile_test( FILES momentum_exchange_method/PeriodicParticleChannelMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME PeriodicParticleChannelMEMTest COMMAND $<TARGET_FILE:PeriodicParticleChannelMEM> --shortrun PROCESSES 4 LABELS longrun )
-
-waLBerla_compile_test( FILES momentum_exchange_method/TaylorCouetteFlowMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME TaylorCouetteFlowMEMTest COMMAND $<TARGET_FILE:TaylorCouetteFlowMEM> --shortrun )
 waLBerla_execute_test( NAME TaylorCouetteFlowMEMTest2 COMMAND $<TARGET_FILE:TaylorCouetteFlowMEM>  PROCESSES 4 LABELS verylongrun)
-
-waLBerla_compile_test( FILES momentum_exchange_method/SegreSilberbergMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME SegreSilberbergMEMSyncNextNeighbor    COMMAND $<TARGET_FILE:SegreSilberbergMEM> --shortrun                    PROCESSES 9 )
 waLBerla_execute_test( NAME SegreSilberbergMEMSyncShadowOwner     COMMAND $<TARGET_FILE:SegreSilberbergMEM> --shortrun --syncShadowOwners PROCESSES 9 )
 waLBerla_execute_test( NAME SegreSilberbergMEMTest                COMMAND $<TARGET_FILE:SegreSilberbergMEM>                      PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -119,20 +154,12 @@ waLBerla_execute_test( NAME SegreSilberbergMEMEanReconFuncTest    COMMAND $<TARG
 waLBerla_execute_test( NAME SegreSilberbergMEMEanReconTest        COMMAND $<TARGET_FILE:SegreSilberbergMEM> --MO_CLI --eanReconstructor   PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME SegreSilberbergMEMExtReconFuncTest    COMMAND $<TARGET_FILE:SegreSilberbergMEM> --funcTest --extReconstructor PROCESSES 9 )
 waLBerla_execute_test( NAME SegreSilberbergMEMExtReconTest        COMMAND $<TARGET_FILE:SegreSilberbergMEM> --MO_CLI --extReconstructor   PROCESSES 18 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
-
-waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEM.cpp DEPENDS walberla::timeloop )
 waLBerla_execute_test( NAME SettlingSphereMEMFuncTestSerial      COMMAND $<TARGET_FILE:SettlingSphereMEM> --funcTest PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME SettlingSphereMEMFuncTestParallel    COMMAND $<TARGET_FILE:SettlingSphereMEM> --funcTest PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo)
-
-waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp DEPENDS walberla::timeloop )
 waLBerla_execute_test( NAME SettlingSphereMEMDynamicRefinementFuncTestSerial      COMMAND $<TARGET_FILE:SettlingSphereMEMDynamicRefinement> --funcTest PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo)
 waLBerla_execute_test( NAME SettlingSphereMEMDynamicRefinementFuncTestParallel    COMMAND $<TARGET_FILE:SettlingSphereMEMDynamicRefinement> --funcTest PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo)
-
-waLBerla_compile_test( FILES momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp DEPENDS walberla::timeloop )
 waLBerla_execute_test( NAME SettlingSphereMEMStaticRefinementFuncTestSerial      COMMAND $<TARGET_FILE:SettlingSphereMEMStaticRefinement> --funcTest PROCESSES 1 LABELS longrun CONFIGURATIONS Release RelWithDbgInfo)
 waLBerla_execute_test( NAME SettlingSphereMEMStaticRefinementFuncTestParallel    COMMAND $<TARGET_FILE:SettlingSphereMEMStaticRefinement> --funcTest PROCESSES 8 CONFIGURATIONS Release RelWithDbgInfo)
-
-waLBerla_compile_test( FILES momentum_exchange_method/TorqueSphereMEM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME TorqueSphereMEMFuncTest        COMMAND $<TARGET_FILE:TorqueSphereMEM> --funcTest           PROCESSES 1 )
 waLBerla_execute_test( NAME TorqueSphereMEMSingleTest      COMMAND $<TARGET_FILE:TorqueSphereMEM>                      PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME TorqueSphereMEMParallelTest    COMMAND $<TARGET_FILE:TorqueSphereMEM>                      PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )
@@ -142,37 +169,14 @@ waLBerla_execute_test( NAME TorqueSphereMEMCLIParallelTest COMMAND $<TARGET_FILE
 waLBerla_execute_test( NAME TorqueSphereMEMMRFuncTest      COMMAND $<TARGET_FILE:TorqueSphereMEM> --funcTest --MO_MR   PROCESSES 1 )
 waLBerla_execute_test( NAME TorqueSphereMEMMRSingleTest    COMMAND $<TARGET_FILE:TorqueSphereMEM> --MO_MR              PROCESSES 1 LABELS longrun     CONFIGURATIONS Release RelWithDbgInfo )
 waLBerla_execute_test( NAME TorqueSphereMEMMRParallelTest  COMMAND $<TARGET_FILE:TorqueSphereMEM> --MO_MR              PROCESSES 8 LABELS verylongrun CONFIGURATIONS Release RelWithDbgInfo )  
-
-waLBerla_compile_test( FILES momentum_exchange_method/SquirmerTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME SquirmerShortTest COMMAND $<TARGET_FILE:SquirmerTest> --shortrun PROCESSES 1 )
 waLBerla_execute_test( NAME SquirmerTest COMMAND $<TARGET_FILE:SquirmerTest> PROCESSES 1 CONFIGURATIONS Release RelWithDbgInfo  )
-
-###################################################################################################
-# Discrete particle methods tests
-###################################################################################################
-
-waLBerla_compile_test( FILES discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME SphereWallCollisionBehaviorDPMFuncTest COMMAND $<TARGET_FILE:SphereWallCollisionBehaviorDPM> --funcTest PROCESSES 1 )
-
-waLBerla_compile_test( FILES discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME HinderedSettlingDynamicsDPMFuncTest COMMAND $<TARGET_FILE:HinderedSettlingDynamicsDPM> --funcTest PROCESSES 4 LABELS longrun CONFIGURATIONS RelWithDbgInfo )
-
-###################################################################################################
-# Geometry tests
-###################################################################################################
-
-waLBerla_compile_test( FILES geometry/PeIntersectionRatioTest.cpp DEPENDS walberla::pe )
 waLBerla_execute_test( NAME PeIntersectionRatioTest COMMAND $<TARGET_FILE:PeIntersectionRatioTest> PROCESSES 1 )
-
-###################################################################################################
-# Utility tests
-###################################################################################################
-
-waLBerla_compile_test( FILES utility/BodiesForceTorqueContainerTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME BodiesForceTorqueContainerTest COMMAND $<TARGET_FILE:BodiesForceTorqueContainerTest> PROCESSES 1 )
 waLBerla_execute_test( NAME BodiesForceTorqueContainerParallelTest COMMAND $<TARGET_FILE:BodiesForceTorqueContainerTest> PROCESSES 3 )
-
-waLBerla_compile_test( FILES utility/PeSubCyclingTest.cpp DEPENDS walberla::blockforest walberla::pe walberla::timeloop )
 waLBerla_execute_test( NAME PeSubCyclingTest COMMAND $<TARGET_FILE:PeSubCyclingTest> PROCESSES 1 )
 waLBerla_execute_test( NAME PeSubCyclingParallelTest COMMAND $<TARGET_FILE:PeSubCyclingTest> PROCESSES 3 )
 
+endif()