diff --git a/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/CMakeLists.txt
index c20cb41a14d..a7ed6b5b8a2 100644
--- a/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/CMakeLists.txt
+++ b/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/CMakeLists.txt
@@ -4,20 +4,7 @@
 project( Surface_mesh_approximation )
 
 
-cmake_minimum_required(VERSION 2.6.2)
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
-  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
-    cmake_policy(VERSION 2.8.4)
-  else()
-    cmake_policy(VERSION 2.6)
-  endif()
-endif()
-
-if ( COMMAND cmake_policy )
-
-  cmake_policy( SET CMP0003 NEW )  
-
-endif()
+cmake_minimum_required(VERSION 2.8.11)
 
 # CGAL and its components
 find_package( CGAL QUIET COMPONENTS  )
@@ -50,12 +37,13 @@ endif()
 include_directories( BEFORE ../../include )
 
 
-# Creating entries for all .cpp/.C files with "main" routine
+# Creating entries for all C++ files with "main" routine
 # ##########################################################
 
 include( CGAL_CreateSingleSourceCGALProgram )
 
-create_single_source_cgal_program( "vsa_timing_benchmark.cpp" )
 create_single_source_cgal_program( "vsa_autoinit_timing_benchmark.cpp" )
 
+create_single_source_cgal_program( "vsa_timing_benchmark.cpp" )
+
 
diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt
index 90a5030762b..09316de8319 100644
--- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt
+++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt
@@ -1,46 +1,51 @@
-# Created by the script cgal_create_cmake_script_with_options
+# Created by the script cgal_create_CMakeLists
 # This is the CMake script for compiling a set of CGAL applications.
 
-project( Surface_mesh_approximation_Examples )
+project( Surface_mesh_approximation )
+
 
 cmake_minimum_required(VERSION 2.8.11)
 
-if ( COMMAND cmake_policy )
-  cmake_policy( SET CMP0003 NEW )  
-endif()
-
 # CGAL and its components
 find_package( CGAL QUIET COMPONENTS  )
+
 if ( NOT CGAL_FOUND )
+
   message(STATUS "This project requires the CGAL library, and will not be compiled.")
   return()  
+
 endif()
 
 # include helper file
 include( ${CGAL_USE_FILE} )
 
+
 # Boost and its components
-find_package( Boost )
+find_package( Boost REQUIRED )
+
 if ( NOT Boost_FOUND )
+
   message(STATUS "This project requires the Boost library, and will not be compiled.")
+
   return()  
+
 endif()
 
-# find_package( OpenMesh QUIET )
-# if ( OpenMesh_FOUND )
-# include( UseOpenMesh )
-# else()
-#   message(STATUS "Examples that use OpenMesh will not be compiled.")
-# endif()
+# include for local directory
 
 # include for local package
 include_directories( BEFORE ../../include )
 
-# Creating entries for all .cpp/.C files with "main" routine
+
+# Creating entries for all C++ files with "main" routine
 # ##########################################################
 
 include( CGAL_CreateSingleSourceCGALProgram )
 
+create_single_source_cgal_program( "vsa_class_interface_example.cpp" )
+
 create_single_source_cgal_program( "vsa_example.cpp" )
-create_single_source_cgal_program( "vsa_class_interface_example.cpp")
-create_single_source_cgal_program( "vsa_metric_example.cpp")
+
+create_single_source_cgal_program( "vsa_metric_example.cpp" )
+
+
diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt
index 1b22b7ecd71..7c4be2ac2eb 100644
--- a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt
+++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt
@@ -1,29 +1,55 @@
-# Created by the script cgal_create_cmake_script
-# This is the CMake script for compiling a CGAL application.
+# Created by the script cgal_create_CMakeLists
+# This is the CMake script for compiling a set of CGAL applications.
+
+project( Surface_mesh_approximation )
 
 
-project( Surface_mesh_approximation_Tests )
+cmake_minimum_required(VERSION 2.8.11)
 
-cmake_minimum_required(VERSION 2.8.10)
+# CGAL and its components
+find_package( CGAL QUIET COMPONENTS  )
 
-find_package(CGAL QUIET)
+if ( NOT CGAL_FOUND )
 
-if ( CGAL_FOUND )
+  message(STATUS "This project requires the CGAL library, and will not be compiled.")
+  return()  
 
-  include( ${CGAL_USE_FILE} )
-
-  include( CGAL_CreateSingleSourceCGALProgram )
-
-  include_directories (BEFORE "../../include")
-
-  # create a target per cppfile
-  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
-  foreach(cppfile ${cppfiles})
-    create_single_source_cgal_program( "${cppfile}" )
-  endforeach()
-
-else()
-  
-    message(STATUS "This program requires the CGAL library, and will not be compiled.")
-  
 endif()
+
+# include helper file
+include( ${CGAL_USE_FILE} )
+
+
+# Boost and its components
+find_package( Boost REQUIRED )
+
+if ( NOT Boost_FOUND )
+
+  message(STATUS "This project requires the Boost library, and will not be compiled.")
+
+  return()  
+
+endif()
+
+# include for local directory
+
+# include for local package
+include_directories( BEFORE ../../include )
+
+
+# Creating entries for all C++ files with "main" routine
+# ##########################################################
+
+include( CGAL_CreateSingleSourceCGALProgram )
+
+create_single_source_cgal_program( "vsa_class_interface_test.cpp" )
+
+create_single_source_cgal_program( "vsa_correctness_test.cpp" )
+
+create_single_source_cgal_program( "vsa_error_decrease_test.cpp" )
+
+create_single_source_cgal_program( "vsa_free_function_test.cpp" )
+
+create_single_source_cgal_program( "vsa_metric_test.cpp" )
+
+