diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_test.cpp b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_test.cpp
index 3aab5bf4177..bb0a850e1b1 100644
--- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_test.cpp
+++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_test.cpp
@@ -214,8 +214,8 @@ bool test_face_graph_wrapper()
   
   CGAL::Face_graph_wrapper<SMesh> fgw1(m);
   std::vector<unsigned int> cells=fgw1.count_all_cells();
-  if (cells[0]!=1487 || cells[1]!=4406 || cells[2]!=2918 ||
-      fgw1.number_of_darts()!=8754)
+  if (cells[0]!=1487 || cells[1]!=4406 || cells[2]!=2921 ||
+      fgw1.number_of_darts()!=8812)
   {
     std::cout<<"Error: incorrect number of cells in test_face_graph_wrapper "
              <<"for Surface_mesh: "
@@ -235,8 +235,8 @@ bool test_face_graph_wrapper()
   in2>>p;
   CGAL::Face_graph_wrapper<Polyhedron> fgw2(p);
   cells=fgw2.count_all_cells();
-  if (cells[0]!=1487 || cells[1]!=4406 || cells[2]!=2918 ||
-      fgw2.number_of_darts()!=8754)
+  if (cells[0]!=1487 || cells[1]!=4406 || cells[2]!=2921 ||
+      fgw2.number_of_darts()!=8812)
   {
     std::cout<<"Error: incorrect number of cells in test_face_graph_wrapper "
              <<"for Polyhedron."
diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/fundamental_group_of_the_circle.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/fundamental_group_of_the_circle.cpp
index 3daae20b3ea..54d9ff78634 100644
--- a/Surface_mesh_topology/test/Surface_mesh_topology/fundamental_group_of_the_circle.cpp
+++ b/Surface_mesh_topology/test/Surface_mesh_topology/fundamental_group_of_the_circle.cpp
@@ -169,8 +169,11 @@ int main()
   }
 
   if (test_valid)
-  { std::cout<<"All tests are OK"<<std::endl; }
+  {
+    std::cout<<"All tests are OK"<<std::endl;
+    return EXIT_SUCCESS;
+  }
 
-  return test_valid;
+  return EXIT_FAILURE;
 }
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/fundamental_group_of_the_torus.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/fundamental_group_of_the_torus.cpp
index 9b07d9599da..aec023f030b 100644
--- a/Surface_mesh_topology/test/Surface_mesh_topology/fundamental_group_of_the_torus.cpp
+++ b/Surface_mesh_topology/test/Surface_mesh_topology/fundamental_group_of_the_torus.cpp
@@ -167,8 +167,11 @@ int main()
   }
 
   if (test_valid)
-  { std::cout<<"All tests are OK"<<std::endl; }
+  {
+    std::cout<<"All tests are OK"<<std::endl;
+    return EXIT_SUCCESS;
+  }
 
-  return test_valid;
+  return EXIT_FAILURE;
 }
-///////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
+///////////////////////////////////////////////////////////////////////////////
diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_big_cylinder.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_big_cylinder.cpp
index 8f2f8458b2d..18e808ae3e4 100644
--- a/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_big_cylinder.cpp
+++ b/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_big_cylinder.cpp
@@ -108,8 +108,11 @@ int main()
   }
 
   if (res)
-  { std::cout<<"SUCCESS homotopy_big_cylinder; all tests ok."<<std::endl; }
+  {
+    std::cout<<"SUCCESS homotopy_big_cylinder; all tests ok."<<std::endl;
+    return EXIT_SUCCESS;
+  }
 
-  return res;
+  return EXIT_FAILURE;
 }
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_double_torus_with_holes.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_double_torus_with_holes.cpp
index ce0a5cf22e7..e0370bae85d 100644
--- a/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_double_torus_with_holes.cpp
+++ b/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_double_torus_with_holes.cpp
@@ -101,8 +101,11 @@ int main()
   }
 
   if (res)
-  { std::cout<<"SUCCESS homotopy_double_torus_with_holes; all tests ok."<<std::endl; }
+  {
+    std::cout<<"SUCCESS homotopy_double_torus_with_holes; all tests ok."<<std::endl;
+    return EXIT_SUCCESS;
+  }
 
-  return res;
+  return EXIT_FAILURE;
 }
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_rond_point_saucisse.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_rond_point_saucisse.cpp
index 67ab2451b61..00f1928e7b9 100644
--- a/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_rond_point_saucisse.cpp
+++ b/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_rond_point_saucisse.cpp
@@ -113,8 +113,11 @@ int main()
   }
 
   if (res)
-  { std::cout<<"SUCCESS homotopy_rond_point_saucisse; all tests ok."<<std::endl; }
+  {
+    std::cout<<"SUCCESS homotopy_rond_point_saucisse; all tests ok."<<std::endl;
+    return EXIT_SUCCESS;
+  }
 
-  return res;
+  return EXIT_FAILURE;
 }
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_small_cylinder.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_small_cylinder.cpp
index 2bc2bdc1eb7..a53e59e4548 100644
--- a/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_small_cylinder.cpp
+++ b/Surface_mesh_topology/test/Surface_mesh_topology/homotopy_small_cylinder.cpp
@@ -76,8 +76,11 @@ int main()
   }
 
   if (res)
-  { std::cout<<"SUCCESS homotopy_small_cylinder; all tests ok."<<std::endl; }
+  {
+    std::cout<<"SUCCESS homotopy_small_cylinder; all tests ok."<<std::endl;
+    return EXIT_SUCCESS;
+  }
 
-  return res;
+  return EXIT_FAILURE;
 }
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/test_homotopy_with_polygonal_schema.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/test_homotopy_with_polygonal_schema.cpp
index 612a7273db0..01789334893 100644
--- a/Surface_mesh_topology/test/Surface_mesh_topology/test_homotopy_with_polygonal_schema.cpp
+++ b/Surface_mesh_topology/test/Surface_mesh_topology/test_homotopy_with_polygonal_schema.cpp
@@ -130,8 +130,11 @@ int main(int argc, char** argv)
   }
 
   if (res)
-  { std::cout<<"test_homotopy_with_polygonal_schema ALL TESTS OK."<<std::endl; }
+  {
+    std::cout<<"test_homotopy_with_polygonal_schema ALL TESTS OK."<<std::endl;
+    return EXIT_SUCCESS;
+  }
 
-  return res;
+  return EXIT_FAILURE;
 }
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/tests_path_on_surface.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/tests_path_on_surface.cpp
index a13bb272a1c..1b2aa5f300c 100644
--- a/Surface_mesh_topology/test/Surface_mesh_topology/tests_path_on_surface.cpp
+++ b/Surface_mesh_topology/test/Surface_mesh_topology/tests_path_on_surface.cpp
@@ -100,6 +100,9 @@ int main()
 
   std::cout<<"tests_path_on_surface "<<(success?"OK":"failed") <<std::endl;
 
-  return success;
+  if (!success) 
+  { return EXIT_FAILURE; }
+
+  return EXIT_SUCCESS;
 }
 ///////////////////////////////////////////////////////////////////////////////