diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
index 08d054ea54c..d23762f811e 100644
--- a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
+++ b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
@@ -39,6 +39,7 @@ if(GMP_FOUND)
   create_single_source_cgal_program("Arithmetic_kernel.cpp")
   create_single_source_cgal_program("LEDA_arithmetic_kernel.cpp")
   create_single_source_cgal_program("CORE_arithmetic_kernel.cpp")
+  create_single_source_cgal_program("GMPXX_arithmetic_kernel.cpp")
   create_single_source_cgal_program("Get_arithmetic_kernel.cpp")
 
 else()
diff --git a/BGL/test/BGL/CMakeLists.txt b/BGL/test/BGL/CMakeLists.txt
index 3b4304b5056..0cbb7c3b9fc 100644
--- a/BGL/test/BGL/CMakeLists.txt
+++ b/BGL/test/BGL/CMakeLists.txt
@@ -35,6 +35,7 @@ create_single_source_cgal_program("test_test_face.cpp" )
 create_single_source_cgal_program("test_Collapse_edge.cpp" )
 create_single_source_cgal_program("test_Collapse_edge_with_constraints.cpp" )
 create_single_source_cgal_program("test_graph_traits.cpp")
+create_single_source_cgal_program("test_Surface_mesh.cpp")
 create_single_source_cgal_program("test_Properties.cpp")
 create_single_source_cgal_program("bench_read_from_stream_vs_add_face_and_add_faces.cpp")
 create_single_source_cgal_program("graph_traits_inheritance.cpp" )
diff --git a/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt b/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt
index 9adb636537f..b5adbf664ec 100644
--- a/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt
+++ b/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt
@@ -14,6 +14,7 @@ create_single_source_cgal_program(Linear_cell_complex_2_test.cpp ${hfiles})
 create_single_source_cgal_program(Linear_cell_complex_3_test.cpp ${hfiles})
 create_single_source_cgal_program(Linear_cell_complex_4_test.cpp ${hfiles})
 create_single_source_cgal_program(Linear_cell_complex_copy_test.cpp ${hfiles})
+create_single_source_cgal_program(LCC_3_incremental_builder_test.cpp ${hfiles})
 
 # Same targets, defining USE_COMPACT_CONTAINER_WITH_INDEX to test index version
 add_executable(Linear_cell_complex_2_test_index Linear_cell_complex_2_test.cpp ${hfiles})
diff --git a/Mesh_3/examples/Mesh_3/CMakeLists.txt b/Mesh_3/examples/Mesh_3/CMakeLists.txt
index dbcd3ea7cfa..0b59088e04a 100644
--- a/Mesh_3/examples/Mesh_3/CMakeLists.txt
+++ b/Mesh_3/examples/Mesh_3/CMakeLists.txt
@@ -49,6 +49,9 @@ target_link_libraries(mesh_hybrid_mesh_domain PUBLIC CGAL::Eigen3_support)
 create_single_source_cgal_program("mesh_implicit_sphere.cpp")
 target_link_libraries(mesh_implicit_sphere PUBLIC CGAL::Eigen3_support)
 
+create_single_source_cgal_program("mesh_implicit_ellipsoid.cpp")
+target_link_libraries(mesh_implicit_ellipsoid PUBLIC CGAL::Eigen3_support)
+
 create_single_source_cgal_program("mesh_implicit_sphere_variable_size.cpp")
 target_link_libraries(mesh_implicit_sphere_variable_size PUBLIC CGAL::Eigen3_support)
 
diff --git a/Mesh_3/test/Mesh_3/CMakeLists.txt b/Mesh_3/test/Mesh_3/CMakeLists.txt
index 2a8e19e1c38..5332a40702a 100644
--- a/Mesh_3/test/Mesh_3/CMakeLists.txt
+++ b/Mesh_3/test/Mesh_3/CMakeLists.txt
@@ -55,6 +55,7 @@ create_single_source_cgal_program( "test_mesh_polyhedral_domain_with_features_de
 create_single_source_cgal_program( "test_meshing_with_one_step.cpp" )
 create_single_source_cgal_program( "test_mesh_cell_base_3.cpp")
 create_single_source_cgal_program( "test_min_edge_length.cpp")
+create_single_source_cgal_program( "implicit_functions.cpp")
 
 foreach(target
     test_boost_has_xxx
diff --git a/Number_types/test/Number_types/CMakeLists.txt b/Number_types/test/Number_types/CMakeLists.txt
index 400d76fdd1c..b3dd989c766 100644
--- a/Number_types/test/Number_types/CMakeLists.txt
+++ b/Number_types/test/Number_types/CMakeLists.txt
@@ -63,6 +63,8 @@ create_single_source_cgal_program("_test_valid_finite_float.cpp")
 create_single_source_cgal_program("to_interval_test.cpp")
 create_single_source_cgal_program("unsigned.cpp")
 create_single_source_cgal_program("utilities.cpp")
+create_single_source_cgal_program("Exact_rational.cpp")
+create_single_source_cgal_program("Mpzf_new.cpp")
 
 find_package( GMP )
 if( GMP_FOUND AND NOT CGAL_DISABLE_GMP )
diff --git a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
index 3f5583bb8b8..cbd77792290 100644
--- a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
+++ b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
@@ -68,6 +68,9 @@ if(TARGET CGAL::Eigen3_support)
 
   create_single_source_cgal_program("jet_pointer_as_property_map.cpp")
   target_link_libraries(jet_pointer_as_property_map PUBLIC CGAL::Eigen3_support)
+
+  create_single_source_cgal_program("psp_jet_includes.cpp")
+  target_link_libraries(psp_jet_includes PUBLIC CGAL::Eigen3_support)
 else()
   message(STATUS "NOTICE: Some tests require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/STL_Extension/test/STL_Extension/CMakeLists.txt b/STL_Extension/test/STL_Extension/CMakeLists.txt
index 88bfc93ca5d..efa222f2e7b 100644
--- a/STL_Extension/test/STL_Extension/CMakeLists.txt
+++ b/STL_Extension/test/STL_Extension/CMakeLists.txt
@@ -51,6 +51,8 @@ create_single_source_cgal_program("test_vector.cpp")
 create_single_source_cgal_program("test_join_iterators.cpp")
 create_single_source_cgal_program("test_for_each.cpp")
 create_single_source_cgal_program("test_skiplist.cpp")
+create_single_source_cgal_program("test_leak.cpp")
+create_single_source_cgal_program("test_nth_element.cpp")
 if(TARGET CGAL::TBB_support)
   message(STATUS "Found TBB")
   target_link_libraries(test_for_each PUBLIC CGAL::TBB_support)
diff --git a/Shape_regularization/test/Shape_regularization/CMakeLists.txt b/Shape_regularization/test/Shape_regularization/CMakeLists.txt
index ddaa6f3ea31..b465c7cfa16 100644
--- a/Shape_regularization/test/Shape_regularization/CMakeLists.txt
+++ b/Shape_regularization/test/Shape_regularization/CMakeLists.txt
@@ -22,7 +22,8 @@ if(TARGET CGAL::OSQP_support)
   test_3_segments
   test_4_segments
   test_100_segments_angles
-  test_100_segments_offsets)
+  test_100_segments_offsets
+  test_cgal_solver)
 
   foreach(osqp_target ${osqp_targets})
     create_single_source_cgal_program("${osqp_target}.cpp")
diff --git a/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt b/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
index f637565bc51..0041dc4ccd0 100644
--- a/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
+++ b/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
@@ -19,6 +19,7 @@ create_single_source_cgal_program("skin_surface_subdiv.cpp")
 create_single_source_cgal_program("skin_surface_subdiv_with_normals.cpp")
 create_single_source_cgal_program("union_of_balls_simple.cpp")
 create_single_source_cgal_program("union_of_balls_subdiv.cpp")
+create_single_source_cgal_program("skin_surface_retrieve_defining_weighted_points.cpp")
 
 find_package(ESBTL QUIET)
 if(ESBTL_FOUND)
diff --git a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt
index 33a3969adc6..f9546507bd4 100644
--- a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt
+++ b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt
@@ -27,6 +27,8 @@ create_single_source_cgal_program("searching_polyhedron_vertices_with_fuzzy_sphe
 create_single_source_cgal_program("user_defined_point_and_distance.cpp")
 create_single_source_cgal_program("using_fair_splitting_rule.cpp")
 create_single_source_cgal_program("weighted_Minkowski_distance.cpp")
+create_single_source_cgal_program("searching_sphere_orthogonally.cpp")
+create_single_source_cgal_program("splitter_worst_cases.cpp")
 
 find_package(Eigen3 3.1.91 QUIET) #(requires 3.1.91 or greater)
 include(CGAL_Eigen3_support)
diff --git a/Triangulation/examples/Triangulation/CMakeLists.txt b/Triangulation/examples/Triangulation/CMakeLists.txt
index 3ad27172e58..bed700a1b85 100644
--- a/Triangulation/examples/Triangulation/CMakeLists.txt
+++ b/Triangulation/examples/Triangulation/CMakeLists.txt
@@ -21,6 +21,8 @@ if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("triangulation.cpp")
   create_single_source_cgal_program("triangulation_data_structure_dynamic.cpp")
   create_single_source_cgal_program("triangulation_data_structure_static.cpp")
+  create_single_source_cgal_program("triangulation1.cpp")
+  create_single_source_cgal_program("triangulation2.cpp")
 
   foreach(
     target
@@ -30,7 +32,9 @@ if(TARGET CGAL::Eigen3_support)
     regular_triangulation
     triangulation
     triangulation_data_structure_dynamic
-    triangulation_data_structure_static)
+    triangulation_data_structure_static
+    triangulation1
+    triangulation2)
     target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
   endforeach()
 else()
diff --git a/Triangulation_3/test/Triangulation_3/CMakeLists.txt b/Triangulation_3/test/Triangulation_3/CMakeLists.txt
index 88d63413f64..f6da43d10ce 100644
--- a/Triangulation_3/test/Triangulation_3/CMakeLists.txt
+++ b/Triangulation_3/test/Triangulation_3/CMakeLists.txt
@@ -29,6 +29,9 @@ create_single_source_cgal_program("test_static_filters.cpp")
 create_single_source_cgal_program("test_triangulation_3.cpp")
 create_single_source_cgal_program("test_io_triangulation_3.cpp")
 create_single_source_cgal_program("test_triangulation_serialization_3.cpp")
+create_single_source_cgal_program("test_dt_deterministic_3.cpp")
+create_single_source_cgal_program("test_Triangulation_with_transform_iterator.cpp")
+create_single_source_cgal_program("test_Triangulation_with_zip_iterator.cpp")
 
 if(TARGET CGAL::TBB_support)
   message(STATUS "Found TBB")