diff --git a/Processes/EnergyLoss/CMakeLists.txt b/Processes/EnergyLoss/CMakeLists.txt
index 41eb2ececa1ba9baba44836c58151d8dfd5f6623..5333eaf4cc8ba39d59ecd67ea83ffcefd55687bd 100644
--- a/Processes/EnergyLoss/CMakeLists.txt
+++ b/Processes/EnergyLoss/CMakeLists.txt
@@ -52,8 +52,7 @@ install (
 
 # --------------------
 # code unit testing
-#add_executable (testNullModel testNullModel.cc)
-
+#CORSIKA_ADD_TEST (testNullModel testNullModel.cc)
 #target_link_libraries (
 #  testNullModel  ProcessNullModel
 #  CORSIKAsetup
@@ -61,5 +60,4 @@ install (
 #  CORSIKAunits
 #  CORSIKAthirdparty # for catch2
 #  )
-# CORSIKA_ADD_TEST(testNullModel)
 
diff --git a/Processes/HadronicElasticModel/CMakeLists.txt b/Processes/HadronicElasticModel/CMakeLists.txt
index 60f0b7999d0820f6b1881b63a980c2f983ff2431..993aeba732e0dc20a224109299bf1259eb66f09f 100644
--- a/Processes/HadronicElasticModel/CMakeLists.txt
+++ b/Processes/HadronicElasticModel/CMakeLists.txt
@@ -51,14 +51,12 @@ install (
 
 # --------------------
 # code unit testing
-#~ add_executable (ProcessHadronicElasticModel testProcessHadronicElasticModel.cc)
-
-#~ target_link_libraries (
-  #~ testProcessHadronicElasticModel
-  #~ ProcessHadronicElasticModel
-  #~ CORSIKAsetup
-  #~ CORSIKAgeometry
-  #~ CORSIKAunits
-  #~ CORSIKAthirdparty # for catch2
-  #~ )
-#~ CORSIKA_ADD_TEST(testNullModel)
+# CORSIKA_ADD_TEST (testProcessHadronicElasticModel)
+# target_link_libraries (
+  # testProcessHadronicElasticModel
+  # ProcessHadronicElasticModel
+  # CORSIKAsetup
+  # CORSIKAgeometry
+  # CORSIKAunits
+  # CORSIKAthirdparty # for catch2
+  # )
diff --git a/Processes/SwitchProcess/CMakeLists.txt b/Processes/SwitchProcess/CMakeLists.txt
index feac9f360ced5356d90ecd87cc7d4ca51939e0f6..577fdf9ce2faaf6cb7edd286f07b996b4ecc29ac 100644
--- a/Processes/SwitchProcess/CMakeLists.txt
+++ b/Processes/SwitchProcess/CMakeLists.txt
@@ -38,8 +38,7 @@ install (FILES ${MODEL_HEADERS} DESTINATION include/${MODEL_NAMESPACE})
 
 # --------------------
 # code unit testing
-add_executable (testSwitchProcess testSwitchProcess.cc)
-
+CORSIKA_ADD_TEST(testSwitchProcess)
 target_link_libraries (
   testSwitchProcess
   ProcessSwitch
@@ -47,4 +46,3 @@ target_link_libraries (
   CORSIKAthirdparty # for catch2
 )
 
-CORSIKA_ADD_TEST(testSwitchProcess)
diff --git a/Processes/TrackWriter/CMakeLists.txt b/Processes/TrackWriter/CMakeLists.txt
index 67b99083ff4f3de803bd585fb4136931268148fd..b1cad804b85baacad0958a9172f965247a0806dc 100644
--- a/Processes/TrackWriter/CMakeLists.txt
+++ b/Processes/TrackWriter/CMakeLists.txt
@@ -51,8 +51,7 @@ install (
 
 # --------------------
 # code unit testing
-#add_executable (testNullModel testNullModel.cc)
-
+# CORSIKA_ADD_TEST(testNullModel)
 #target_link_libraries (
 #  testNullModel  ProcessNullModel
 #  CORSIKAsetup
@@ -60,5 +59,4 @@ install (
 #  CORSIKAunits
 #  CORSIKAthirdparty # for catch2
 #  )
-# CORSIKA_ADD_TEST(testNullModel)