diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/make_x_monotone.cv b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/make_x_monotone.cv
index d3e8b1fd354..5ec73e51e70 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/make_x_monotone.cv
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/make_x_monotone.cv
@@ -1,17 +1,17 @@
 # Original cases <Cases 0-6>
-3  0/1 0/1 0/1 1/1 0/1 2/1
-3  0/1 0/1 1/1 1/1 0/1 2/1
-6  0/1 0/1 0/1 1/1 0/1 2/1 1/1 2/1 1/1 1/1 1/1 0/1
-5  0/1 0/1 2/1 2/1 4/1 2/1 3/1 1/1 0/1 1/1
-5  0/1 0/1 3/1 6/1 6/1 0/1 0/1 4/1 6/1 4/1
-2  0/1 0/1 1/1 1/1
-10 0/1 0/1 3/1 0/1 3/1 3/1 1/1 3/1 1/1 1/1 4/1 1/1 4/1 5/1 2/1 5/1 2/1 3/1 5/1 3/1
+3  0 0 0 1 0 2
+3  0 0 1 1 0 2
+6  0 0 0 1 0 2 1 2 1 1 1 0
+5  0 0 2 2 4 2 3 1 0 1
+5  0 0 3 6 6 0 0 4 6 4
+2  0 0 1 1
+10 0 0 3 0 3 3 1 3 1 1 4 1 4 5 2 5 2 3 5 3
 #
 # Inverse polylines of original cases <Cases 7-13>
-3  0/1 2/1 0/1 1/1 0/1 0/1
-3  0/1 2/1 1/1 1/1 0/1 0/1
-6  1/1 0/1 1/1 1/1 1/1 2/1 0/1 2/1 0/1 1/1 0/1 0/1
-5  0/1 1/1 3/1 1/1 4/1 2/1 2/1 2/1 0/1 0/1
-5  6/1 4/1 0/1 4/1 6/1 0/1 3/1 6/1 0/1 0/1
-2  1/1 1/1 0/1 0/1
-10 5/1 3/1 2/1 3/1 2/1 5/1 4/1 5/1 4/1 1/1 1/1 1/1 1/1 3/1 3/1 3/1 3/1 0/1 0/1 0/1
+3  0 2 0 1 0 0
+3  0 2 1 1 0 0
+6  1 0 1 1 1 2 0 2 0 1 0 0
+5  0 1 3 1 4 2 2 2 0 0
+5  6 4 0 4 6 0 3 6 0 0
+2  1 1 0 0
+10 5 3 2 3 2 5 4 5 4 1 1 1 1 3 3 3 3 0 0 0
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/make_x_monotone.xcv b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/make_x_monotone.xcv
index 0777e7a2e0e..8e9a6a94cab 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/make_x_monotone.xcv
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/make_x_monotone.xcv
@@ -1,20 +1,20 @@
-3 0/1 0/1 0/1 1/1 0/1 2/1
-2 0/1 0/1 1/1 1/1
-2 1/1 1/1 0/1 2/1
-2 0/1 2/1 1/1 2/1
-3 1/1 2/1 1/1 1/1 1/1 0/1
-3 0/1 0/1 2/1 2/1 4/1 2/1
-3 4/1 2/1 3/1 1/1 0/1 1/1
-3 0/1 0/1 3/1 6/1 6/1 0/1
-2 6/1 0/1 0/1 4/1
-2 0/1 4/1 6/1 4/1
-2 0/1 0/1 1/1 1/1
-2 0/1 0/1 3/1 0/1
-2 3/1 0/1 3/1 3/1
-2 3/1 3/1 1/1 3/1
-2 1/1 3/1 1/1 1/1
-2 1/1 1/1 4/1 1/1
-2 4/1 1/1 4/1 5/1
-2 4/1 5/1 2/1 5/1
-2 2/1 5/1 2/1 3/1
-2 2/1 3/1 5/1 3/1
+3 0 0 0 1 0 2
+2 0 0 1 1
+2 1 1 0 2
+2 0 2 1 2
+3 1 2 1 1 1 0
+3 0 0 2 2 4 2
+3 4 2 3 1 0 1
+3 0 0 3 6 6 0
+2 6 0 0 4
+2 0 4 6 4
+2 0 0 1 1
+2 0 0 3 0
+2 3 0 3 3
+2 3 3 1 3
+2 1 3 1 1
+2 1 1 4 1
+2 4 1 4 5
+2 4 5 2 5
+2 2 5 2 3
+2 2 3 5 3