diff --git a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp
index 246cdd25c34..e4e420178b5 100644
--- a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp
+++ b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp
@@ -383,10 +383,10 @@ bool test_one_file(std::ifstream & inp)
   else
     inp >> pwh2;
 
-  if (type1 == 0 && type2 == 0) return test(inp, p1 ,p2);
-  if (type1 == 0 && type2 == 1) return test(inp, p1 ,pwh2);
-  if (type1 == 1 && type2 == 0) return test(inp, pwh1, p2);
-  if (type1 == 1 && type2 == 1) return test(inp, pwh1, pwh2);
+  if (type1 == 0 && type2 == 0) return ::test(inp, p1 ,p2);
+  if (type1 == 0 && type2 == 1) return ::test(inp, p1 ,pwh2);
+  if (type1 == 1 && type2 == 0) return ::test(inp, pwh1, p2);
+  if (type1 == 1 && type2 == 1) return ::test(inp, pwh1, pwh2);
   return false;
 }
 
diff --git a/Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp b/Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp
index 6cbf9ec1074..634f9ad7175 100644
--- a/Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp
+++ b/Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp
@@ -207,44 +207,44 @@ int main () {
   const float tf = 5.0e-7f;  // tolerance for float computation
 
   cout << "test exact LP-algorithm with sqrts:" << endl;
-  test<2,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T);
-  test<3,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T);
-  test<5,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T);
+  ::test<2,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T);
+  ::test<3,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T);
+  ::test<5,FieldType,CGAL::Tag_true,CGAL::LP_algorithm>(N,T);
 
   cout << "test exact LP-algorithm without sqrts:" << endl;
-  test<2,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T);
-  test<3,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T);
-  test<5,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T);
+  ::test<2,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T);
+  ::test<3,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T);
+  ::test<5,FieldType,CGAL::Tag_false,CGAL::LP_algorithm>(N,T);
 
   cout << "test exact farthest-first heuristic with sqrts:" << endl;
-  test<2,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T);
-  test<3,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T);
-  test<5,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T);
+  ::test<2,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T);
+  ::test<3,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T);
+  ::test<5,FieldType,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,T);
 
   cout << "test exact farthest-first heuristic without sqrts:" << endl;
-  test<2,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T);
-  test<3,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T);
-  test<5,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T);
+  ::test<2,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T);
+  ::test<3,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T);
+  ::test<5,FieldType,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,T);
 
   cout << "test double farthest-first heuristic with sqrts:" << endl;
-  test<2,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t);
-  test<3,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t);
-  test<5,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t);
+  ::test<2,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t);
+  ::test<3,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t);
+  ::test<5,double,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,t);
 
   cout << "test double farthest-first heuristic without sqrts:" << endl;
-  test<2,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t);
-  test<3,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t);
-  test<5,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t);
+  ::test<2,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t);
+  ::test<3,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t);
+  ::test<5,double,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,t);
     
   cout << "test float farthest-first heuristic with sqrts:" << endl;
-  test<2,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf);
-  test<3,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf);
-  test<5,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf);
+  ::test<2,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf);
+  ::test<3,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf);
+  ::test<5,float,CGAL::Tag_true,CGAL::Farthest_first_heuristic>(N,tf);
 
   cout << "test float farthest-first heuristic without sqrts:" << endl;
-  test<2,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf);
-  test<3,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf);
-  test<5,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf);
+  ::test<2,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf);
+  ::test<3,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf);
+  ::test<5,float,CGAL::Tag_false,CGAL::Farthest_first_heuristic>(N,tf);
 
   cout << endl
        << "Notice: Because the LP-algorithm is not good when used with" << endl