diff --git a/BGL/test/BGL/CMakeLists.txt b/BGL/test/BGL/CMakeLists.txt
index 9479d6a3f57..e3938cdd9c6 100644
--- a/BGL/test/BGL/CMakeLists.txt
+++ b/BGL/test/BGL/CMakeLists.txt
@@ -76,6 +76,8 @@ create_single_source_cgal_program( "graph_concept_Gwdwg_Surface_mesh.cpp" )
 
 create_single_source_cgal_program( "graph_concept_Linear_cell_complex.cpp" )
 
+create_single_source_cgal_program( "graph_concept_Arrangement_2.cpp" )
+
 create_single_source_cgal_program( "test_clear.cpp" )
 
 create_single_source_cgal_program( "test_helpers.cpp" )
diff --git a/BGL/test/BGL/graph_concept_Face_filtered_graph.cpp b/BGL/test/BGL/graph_concept_Face_filtered_graph.cpp
index ab8957bfb60..c34d6446726 100644
--- a/BGL/test/BGL/graph_concept_Face_filtered_graph.cpp
+++ b/BGL/test/BGL/graph_concept_Face_filtered_graph.cpp
@@ -43,6 +43,7 @@ void concept_check_adapter()
 
   // null
   boost::graph_traits<Adapter>::null_vertex();
+  boost::graph_traits<Adapter>::null_halfedge();
   boost::graph_traits<Adapter>::null_face();
 }
 
diff --git a/BGL/test/BGL/graph_concept_Gwdwg_Surface_mesh.cpp b/BGL/test/BGL/graph_concept_Gwdwg_Surface_mesh.cpp
index c40bca20022..02a5b6cf1e7 100644
--- a/BGL/test/BGL/graph_concept_Gwdwg_Surface_mesh.cpp
+++ b/BGL/test/BGL/graph_concept_Gwdwg_Surface_mesh.cpp
@@ -45,6 +45,7 @@ void concept_check_surface_mesh()
 
   // null
   boost::graph_traits<Surface_mesh>::null_vertex();
+  boost::graph_traits<Surface_mesh>::null_halfedge();
   boost::graph_traits<Surface_mesh>::null_face();
 }
 
diff --git a/BGL/test/BGL/graph_concept_Linear_cell_complex.cpp b/BGL/test/BGL/graph_concept_Linear_cell_complex.cpp
index 8b70e8832f9..118070257ae 100644
--- a/BGL/test/BGL/graph_concept_Linear_cell_complex.cpp
+++ b/BGL/test/BGL/graph_concept_Linear_cell_complex.cpp
@@ -48,6 +48,7 @@ void concept_check_polyhedron() {
 
   // null
   boost::graph_traits<LCC>::null_vertex();
+  boost::graph_traits<LCC>::null_halfedge();
   boost::graph_traits<LCC>::null_face();
 }
 
diff --git a/BGL/test/BGL/graph_concept_OpenMesh.cpp b/BGL/test/BGL/graph_concept_OpenMesh.cpp
index 544b3720c2b..2e697e997fe 100644
--- a/BGL/test/BGL/graph_concept_OpenMesh.cpp
+++ b/BGL/test/BGL/graph_concept_OpenMesh.cpp
@@ -26,8 +26,8 @@ void concept_check_polyhedron() {
   boost::function_requires< boost::IncidenceGraphConcept<Sm> >();
   boost::function_requires< boost::AdjacencyMatrixConcept<Sm> >();
   boost::function_requires< boost::BidirectionalGraphConcept<Sm> >();
+//  boost::function_requires< boost::MutableGraphConcept<Sm> >();
 
-  // boost::function_requires< boost::MutableGraphConcept<Sm> >();
   boost::function_requires< CGAL::HalfedgeGraphConcept<Sm> >();
   boost::function_requires< CGAL::HalfedgeListGraphConcept<Sm> >();
   boost::function_requires< CGAL::FaceGraphConcept<Sm> >();
@@ -44,14 +44,13 @@ void concept_check_polyhedron() {
   boost::function_requires< boost::concepts::ReadablePropertyGraph<Sm, face_descriptor,     CGAL::face_index_t> >();
   boost::function_requires< boost::concepts::ReadablePropertyGraph<Sm, halfedge_descriptor, CGAL::halfedge_index_t> >();
   //  boost::function_requires< boost::concepts::ReadablePropertyGraph<Sm, vertex_descriptor,   CGAL::vertex_is_border_t> >();
+
   // null
   boost::graph_traits<Sm>::null_vertex();
+  boost::graph_traits<Sm>::null_halfedge();
   boost::graph_traits<Sm>::null_face();
 }
 
-
-
-
 int main()
 {
   concept_check_polyhedron<OpenMesh::PolyMesh_ArrayKernelT<> >();
diff --git a/BGL/test/BGL/graph_concept_Polyhedron_3.cpp b/BGL/test/BGL/graph_concept_Polyhedron_3.cpp
index 683b8632666..00b9bd6103d 100644
--- a/BGL/test/BGL/graph_concept_Polyhedron_3.cpp
+++ b/BGL/test/BGL/graph_concept_Polyhedron_3.cpp
@@ -52,14 +52,11 @@ void concept_check_polyhedron() {
 
   // null
   boost::graph_traits<Polyhedron>::null_vertex();
+  boost::graph_traits<Polyhedron>::null_halfedge();
   boost::graph_traits<Polyhedron>::null_face();
 }
 
-
-
-
-int
-main()
+int main()
 {
   concept_check_polyhedron<Polyhedron>();
 
diff --git a/BGL/test/BGL/graph_concept_Seam_mesh_Surface_mesh.cpp b/BGL/test/BGL/graph_concept_Seam_mesh_Surface_mesh.cpp
index 75857fc76ae..459b0709e92 100644
--- a/BGL/test/BGL/graph_concept_Seam_mesh_Surface_mesh.cpp
+++ b/BGL/test/BGL/graph_concept_Seam_mesh_Surface_mesh.cpp
@@ -23,7 +23,7 @@ typedef Traits::halfedge_descriptor halfedge_descriptor;
 typedef Traits::vertex_descriptor vertex_descriptor;
 typedef Traits::face_descriptor face_descriptor;
 
-void concept_check_surface_mesh()
+void concept_check_seam_surface_mesh()
 {
   boost::function_requires< boost::GraphConcept<Seam_mesh> >();
   boost::function_requires< boost::VertexListGraphConcept<Seam_mesh> >();
@@ -31,19 +31,20 @@ void concept_check_surface_mesh()
   boost::function_requires< boost::IncidenceGraphConcept<Seam_mesh> >();
   boost::function_requires< boost::AdjacencyMatrixConcept<Seam_mesh> >();
   boost::function_requires< boost::BidirectionalGraphConcept<Seam_mesh> >();
+
   boost::function_requires< CGAL::HalfedgeGraphConcept<Seam_mesh> >();
   boost::function_requires< CGAL::HalfedgeListGraphConcept<Seam_mesh> >();
   boost::function_requires< CGAL::FaceGraphConcept<Seam_mesh> >();
   boost::function_requires< CGAL::FaceListGraphConcept<Seam_mesh> >();
 
-
   // null
   boost::graph_traits<Seam_mesh>::null_vertex();
+  boost::graph_traits<Seam_mesh>::null_halfedge();
   boost::graph_traits<Seam_mesh>::null_face();
 }
 
 int main()
 {
-  concept_check_surface_mesh();
+  concept_check_seam_surface_mesh();
   return 0;
 }
diff --git a/BGL/test/BGL/graph_concept_Surface_mesh.cpp b/BGL/test/BGL/graph_concept_Surface_mesh.cpp
index c109fadc739..dfeef4b03b6 100644
--- a/BGL/test/BGL/graph_concept_Surface_mesh.cpp
+++ b/BGL/test/BGL/graph_concept_Surface_mesh.cpp
@@ -43,6 +43,7 @@ void concept_check_surface_mesh()
 
   // null
   boost::graph_traits<Surface_mesh>::null_vertex();
+  boost::graph_traits<Surface_mesh>::null_halfedge();
   boost::graph_traits<Surface_mesh>::null_face();
 }
 
diff --git a/BGL/test/BGL/graph_concept_Triangulation_2.cpp b/BGL/test/BGL/graph_concept_Triangulation_2.cpp
index 88f75e5696c..6f2ab046d85 100644
--- a/BGL/test/BGL/graph_concept_Triangulation_2.cpp
+++ b/BGL/test/BGL/graph_concept_Triangulation_2.cpp
@@ -8,19 +8,48 @@
 
 #include <CGAL/boost/graph/graph_concepts.h>
 
-typedef CGAL::Simple_cartesian<double> Kernel;
-typedef CGAL::Triangulation_2<Kernel> Triangulation;
-typedef CGAL::Delaunay_triangulation_2<Kernel> DT2;
-typedef CGAL::Constrained_triangulation_2<Kernel> CT2;
-typedef CGAL::Constrained_Delaunay_triangulation_2<Kernel> CDT2;
-typedef CGAL::Constrained_triangulation_plus_2<CDT2> CDTP2;
-typedef CGAL::Triangulation_hierarchy_2<DT2> THDT2;
-typedef CGAL::Triangulation_hierarchy_2<CDTP2> THCDTP2;
+typedef CGAL::Simple_cartesian<double>                                Kernel;
+
+typedef CGAL::Triangulation_2<Kernel>                                 Triangulation;
+typedef CGAL::Delaunay_triangulation_2<Kernel>                        DT2;
+typedef CGAL::Constrained_triangulation_2<Kernel>                     CT2;
+typedef CGAL::Constrained_Delaunay_triangulation_2<Kernel>            CDT2;
+typedef CGAL::Constrained_triangulation_plus_2<CDT2>                  CDTP2;
+
+typedef CGAL::Triangulation_vertex_base_2<Kernel>                     Vbb;
+typedef CGAL::Triangulation_hierarchy_vertex_base_2<Vbb>              Vb;
+typedef CGAL::Constrained_triangulation_face_base_2<Kernel>           Fb;
+typedef CGAL::Triangulation_data_structure_2<Vb, Fb>                  TDS;
+typedef CGAL::Exact_predicates_tag                                    Itag;
+typedef CGAL::Constrained_Delaunay_triangulation_2<Kernel, TDS, Itag> CDT;
+typedef CGAL::Triangulation_hierarchy_2<CDT>                          THCDT2;
+typedef CGAL::Constrained_triangulation_plus_2<THCDT2>                THCDTP2;
 
 template<typename T>
-void concept_check_triangulation() {
+void concept_check_triangulation()
+{
+  typedef typename boost::graph_traits<T>::vertex_descriptor         vertex_descriptor;
+  typedef typename boost::graph_traits<T>::halfedge_descriptor       halfedge_descriptor;
+  typedef typename boost::graph_traits<T>::edge_descriptor           edge_descriptor;
+  typedef typename boost::graph_traits<T>::face_descriptor           face_descriptor;
+
+  boost::function_requires< boost::GraphConcept<T> >();
+  boost::function_requires< boost::IncidenceGraphConcept<T> >();
   boost::function_requires< boost::VertexListGraphConcept<T> >();
+  boost::function_requires< boost::EdgeListGraphConcept<T> >();
   boost::function_requires< boost::BidirectionalGraphConcept<T> >();
+
+  boost::function_requires< CGAL::HalfedgeGraphConcept<T> >();
+  boost::function_requires< CGAL::HalfedgeListGraphConcept<T> >();
+  boost::function_requires< CGAL::FaceGraphConcept<T> >();
+  boost::function_requires< CGAL::FaceListGraphConcept<T> >();
+//  boost::function_requires< CGAL::MutableHalfedgeGraphConcept<T> >();
+//  boost::function_requires< CGAL::MutableFaceGraphConcept<T> >();
+
+  // null
+  boost::graph_traits<T>::null_vertex();
+  boost::graph_traits<T>::null_halfedge();
+  boost::graph_traits<T>::null_face();
 }
 
 int main()
@@ -30,7 +59,7 @@ int main()
   concept_check_triangulation<CT2>();
   concept_check_triangulation<CDT2>();
   concept_check_triangulation<CDTP2>();
-  concept_check_triangulation<THDT2>();
+  concept_check_triangulation<THCDT2>();
   concept_check_triangulation<THCDTP2>();
   return 0;
 }