diff --git a/.gitattributes b/.gitattributes
index 39518c53f80..e6aaa6fea1d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1726,7 +1726,6 @@ Interpolation/doc_tex/Interpolation/nn_coords.gif -text svneol=unset#image/gif
 Interpolation/doc_tex/Interpolation/nn_coords.ipe -text svneol=unset#application/postscript
 Interpolation/doc_tex/Interpolation/nn_coords.pdf -text svneol=unset#application/pdf
 Interpolation/doc_tex/Interpolation/nn_coords.xml svneol=native#text/xml
-Intersections_3/test/Intersections_3/cgal_test eol=lf
 Interval_skip_list/doc_tex/Interval_skip_list/query.png -text
 Interval_skip_list/examples/Interval_skip_list/terrain.pts -text
 Jet_fitting_3/clean_tree.csh eol=lf
diff --git a/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.0 b/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.0
deleted file mode 100644
index 672cc07b238..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.0
+++ /dev/null
@@ -1,2 +0,0 @@
--7 6 1 7092 71 58
--758 -98725 43 17 9025473 47
diff --git a/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.1 b/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.1
deleted file mode 100644
index dd7bc79d019..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
--7 6 1 7092 71 58
--758 98725 43 17 9025473 47
diff --git a/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.2 b/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.2
deleted file mode 100644
index f37151ac2de..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
--73 6 1 -70 71 58
-8 -98725 43 17 9025473 47
diff --git a/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.3 b/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.3
deleted file mode 100644
index 160f579be23..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/isocub_isocub/ix.3
+++ /dev/null
@@ -1,2 +0,0 @@
--7 6 1 7092 71 58
--758 -98725 -47 17 9025473 -43
diff --git a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.0 b/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.0
deleted file mode 100644
index 1e6e26818d4..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.0
+++ /dev/null
@@ -1,3 +0,0 @@
--3 1 -5 -2 -5 -7
--7 -8 -9 -1 2 -4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.1 b/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.1
deleted file mode 100644
index 595fb6e37cd..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.1
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 3 1 2 3
-1 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.2 b/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.2
deleted file mode 100644
index 2ec571b0277..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.2
+++ /dev/null
@@ -1,3 +0,0 @@
-1 0 0 1 2 3
-1 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.3 b/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.3
deleted file mode 100644
index 3e21ead148a..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.3
+++ /dev/null
@@ -1,3 +0,0 @@
-0 2 0 1 2 3
-2 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.4 b/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.4
deleted file mode 100644
index 7ee79ea8942..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.4
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 0 1 0 3
-2 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.5 b/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.5
deleted file mode 100644
index 9e93f6ada71..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.5
+++ /dev/null
@@ -1,3 +0,0 @@
-4 0 0 4 1 3
-2 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.6 b/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.6
deleted file mode 100644
index 7f819e76e8b..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/line_isocub/ix.6
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 0 1 2 3
-1 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_line/ix.1 b/Intersections_3/test/Intersections_3/DATA/plane_line/ix.1
deleted file mode 100644
index 7d1a3d0cbc5..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_line/ix.1
+++ /dev/null
@@ -1,4 +0,0 @@
-1 1 1 0
-1 1 1
-2 3 4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_line/ix.2 b/Intersections_3/test/Intersections_3/DATA/plane_line/ix.2
deleted file mode 100644
index 406201253cd..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_line/ix.2
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 1 -1
-1 1 1
-2 3 1
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_line/ix.3 b/Intersections_3/test/Intersections_3/DATA/plane_line/ix.3
deleted file mode 100644
index 80bd14aa903..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_line/ix.3
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 1 -2
-1 1 1
-2 3 1
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_line/ix.4 b/Intersections_3/test/Intersections_3/DATA/plane_line/ix.4
deleted file mode 100644
index 72e9a2bfd1d..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_line/ix.4
+++ /dev/null
@@ -1,4 +0,0 @@
-1 0 1 3
-1 1 1
-2 3 -1
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_line/ix.5 b/Intersections_3/test/Intersections_3/DATA/plane_line/ix.5
deleted file mode 100644
index abff911ba0e..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_line/ix.5
+++ /dev/null
@@ -1,4 +0,0 @@
-1 2 4 7
-1 1 1
-2 3 4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.1 b/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.1
deleted file mode 100644
index 57fc37123a2..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 1 0
-0 1 0 0
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.2 b/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.2
deleted file mode 100644
index cbb054acbc0..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 1 1
-0 0 3 3
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.3 b/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.3
deleted file mode 100644
index 3e64ef09781..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.3
+++ /dev/null
@@ -1,2 +0,0 @@
-2 1 3 4
-6 3 9 3
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.4 b/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.4
deleted file mode 100644
index 49b42f8bbec..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.4
+++ /dev/null
@@ -1,2 +0,0 @@
-2 1 3 4
-6 3 9 12
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.5 b/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.5
deleted file mode 100644
index 64075bb84ec..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_plane/ix.5
+++ /dev/null
@@ -1,2 +0,0 @@
-2 3 7 5
-9 7 1 3
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.1 b/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.1
deleted file mode 100644
index 7d1a3d0cbc5..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.1
+++ /dev/null
@@ -1,4 +0,0 @@
-1 1 1 0
-1 1 1
-2 3 4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.10 b/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.10
deleted file mode 100644
index d2588e6c43d..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.10
+++ /dev/null
@@ -1,3 +0,0 @@
--3 7 5 -2
-12 -3 7
--1 5 -3
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.2 b/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.2
deleted file mode 100644
index 406201253cd..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.2
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 1 -1
-1 1 1
-2 3 1
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.3 b/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.3
deleted file mode 100644
index 80bd14aa903..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.3
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 1 -2
-1 1 1
-2 3 1
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.4 b/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.4
deleted file mode 100644
index 72e9a2bfd1d..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.4
+++ /dev/null
@@ -1,4 +0,0 @@
-1 0 1 3
-1 1 1
-2 3 -1
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.5 b/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.5
deleted file mode 100644
index abff911ba0e..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.5
+++ /dev/null
@@ -1,4 +0,0 @@
-1 2 4 7
-1 1 1
-2 3 4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.6 b/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.6
deleted file mode 100644
index 575d4828dcd..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.6
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 1 0
-1 1 -1
-2 3 4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.7 b/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.7
deleted file mode 100644
index 0719e4d9729..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.7
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 1 0
-2 3 4
-1 1 -1
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.8 b/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.8
deleted file mode 100644
index 55b9b43f7af..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.8
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 1 0
-7 1 0
-83 1 -4
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.9 b/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.9
deleted file mode 100644
index efbb5c1ea10..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_ray/ix.9
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 1 0
-12 6 -4
-7 25 0
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.1 b/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.1
deleted file mode 100644
index 7d1a3d0cbc5..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.1
+++ /dev/null
@@ -1,4 +0,0 @@
-1 1 1 0
-1 1 1
-2 3 4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.10 b/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.10
deleted file mode 100644
index d2588e6c43d..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.10
+++ /dev/null
@@ -1,3 +0,0 @@
--3 7 5 -2
-12 -3 7
--1 5 -3
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.2 b/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.2
deleted file mode 100644
index 406201253cd..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.2
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 1 -1
-1 1 1
-2 3 1
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.3 b/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.3
deleted file mode 100644
index 80bd14aa903..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.3
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 1 -2
-1 1 1
-2 3 1
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.4 b/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.4
deleted file mode 100644
index 72e9a2bfd1d..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.4
+++ /dev/null
@@ -1,4 +0,0 @@
-1 0 1 3
-1 1 1
-2 3 -1
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.5 b/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.5
deleted file mode 100644
index abff911ba0e..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.5
+++ /dev/null
@@ -1,4 +0,0 @@
-1 2 4 7
-1 1 1
-2 3 4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.6 b/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.6
deleted file mode 100644
index 575d4828dcd..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.6
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 1 0
-1 1 -1
-2 3 4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.7 b/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.7
deleted file mode 100644
index 0719e4d9729..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.7
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 1 0
-2 3 4
-1 1 -1
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.8 b/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.8
deleted file mode 100644
index 55b9b43f7af..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.8
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 1 0
-7 1 0
-83 1 -4
diff --git a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.9 b/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.9
deleted file mode 100644
index efbb5c1ea10..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/plane_seg/ix.9
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 1 0
-12 6 -4
-7 25 0
-
diff --git a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.0 b/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.0
deleted file mode 100644
index 1e6e26818d4..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.0
+++ /dev/null
@@ -1,3 +0,0 @@
--3 1 -5 -2 -5 -7
--7 -8 -9 -1 2 -4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.1 b/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.1
deleted file mode 100644
index 595fb6e37cd..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.1
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 3 1 2 3
-1 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.2 b/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.2
deleted file mode 100644
index 2ec571b0277..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.2
+++ /dev/null
@@ -1,3 +0,0 @@
-1 0 0 1 2 3
-1 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.3 b/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.3
deleted file mode 100644
index 3e21ead148a..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.3
+++ /dev/null
@@ -1,3 +0,0 @@
-0 2 0 1 2 3
-2 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.4 b/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.4
deleted file mode 100644
index 7ee79ea8942..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.4
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 0 1 0 3
-2 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.5 b/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.5
deleted file mode 100644
index 9e93f6ada71..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.5
+++ /dev/null
@@ -1,3 +0,0 @@
-4 0 0 4 1 3
-2 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.6 b/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.6
deleted file mode 100644
index 7f819e76e8b..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/ray_isocub/ix.6
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 0 1 2 3
-1 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.0 b/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.0
deleted file mode 100644
index 1e6e26818d4..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.0
+++ /dev/null
@@ -1,3 +0,0 @@
--3 1 -5 -2 -5 -7
--7 -8 -9 -1 2 -4
-
diff --git a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.1 b/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.1
deleted file mode 100644
index 595fb6e37cd..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.1
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 3 1 2 3
-1 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.2 b/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.2
deleted file mode 100644
index 2ec571b0277..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.2
+++ /dev/null
@@ -1,3 +0,0 @@
-1 0 0 1 2 3
-1 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.3 b/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.3
deleted file mode 100644
index 3e21ead148a..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.3
+++ /dev/null
@@ -1,3 +0,0 @@
-0 2 0 1 2 3
-2 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.4 b/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.4
deleted file mode 100644
index 7ee79ea8942..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.4
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 0 1 0 3
-2 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.5 b/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.5
deleted file mode 100644
index 9e93f6ada71..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.5
+++ /dev/null
@@ -1,3 +0,0 @@
-4 0 0 4 1 3
-2 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.6 b/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.6
deleted file mode 100644
index 7f819e76e8b..00000000000
--- a/Intersections_3/test/Intersections_3/DATA/seg_isocub/ix.6
+++ /dev/null
@@ -1,3 +0,0 @@
-0 0 0 1 2 3
-1 1 1 3 5 8
-
diff --git a/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.0 b/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.0
deleted file mode 100644
index 3c915a56a11..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.0
+++ /dev/null
@@ -1,2 +0,0 @@
-Intersection.
--7 +6 +43 +17 +71 +47
diff --git a/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.1 b/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.1
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.1
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.2 b/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.2
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.2
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.3 b/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.3
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/isocub_isocub/ix.3
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.0 b/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.0
deleted file mode 100644
index 0b8b9ac716f..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.0
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
--3.16667 +2 -4.66667  -1.5 -8 -8
diff --git a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.1 b/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.1
deleted file mode 100644
index 30e24e9fe3b..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
-+1 +2 +3  +2.5 +5 +3
diff --git a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.2 b/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.2
deleted file mode 100644
index 6065127da82..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
-+1 +1 +1.5  +1 +5 +7.5
diff --git a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.3 b/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.3
deleted file mode 100644
index ee53d0d9a7c..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.3
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
-+2 +2 +6  +2.66667 +2 +8
diff --git a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.4 b/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.4
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.4
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.5 b/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.5
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.5
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.6 b/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.6
deleted file mode 100644
index 8f55c93357b..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/line_isocub/ix.6
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
-+1 +2 +3  +2.5 +5 +7.5
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.1 b/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.1
deleted file mode 100644
index b201b015f1b..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-0.5 0 -0.5
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.2 b/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.2
deleted file mode 100644
index 985657d4de7..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.2
+++ /dev/null
@@ -1 +0,0 @@
-Line intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.3 b/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.3
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.3
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.4 b/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.4
deleted file mode 100644
index eb703b1ee18..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.4
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-6 11 -9
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.5 b/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.5
deleted file mode 100644
index f760ae5903c..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_line/ix.5
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-0.176471 -0.647059 -1.47059
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.1 b/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.1
deleted file mode 100644
index 4a5e077a17d..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.1
+++ /dev/null
@@ -1,3 +0,0 @@
-Line intersection.
-0 0 0
--85 0 0
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.2 b/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.2
deleted file mode 100644
index 7e59510fcdb..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.2
+++ /dev/null
@@ -1 +0,0 @@
-Plane intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.3 b/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.3
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.3
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.4 b/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.4
deleted file mode 100644
index 7e59510fcdb..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.4
+++ /dev/null
@@ -1 +0,0 @@
-Plane intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.5 b/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.5
deleted file mode 100644
index 5c9138196ad..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_plane/ix.5
+++ /dev/null
@@ -1,3 +0,0 @@
-Line intersection.
-2 -3 0
--3908 5182 -1105
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.1 b/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.1
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.1
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.10 b/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.10
deleted file mode 100644
index 376db53f5c4..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.10
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-5.06667 1.26667 1.66667
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.2 b/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.2
deleted file mode 100644
index 895c40435a8..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.2
+++ /dev/null
@@ -1 +0,0 @@
-Ray intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.3 b/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.3
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.3
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.4 b/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.4
deleted file mode 100644
index eb703b1ee18..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.4
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-6 11 -9
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.5 b/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.5
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.5
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.6 b/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.6
deleted file mode 100644
index 284a494c428..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.6
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-1.2 1.4 0
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.7 b/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.7
deleted file mode 100644
index 284a494c428..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.7
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-1.2 1.4 0
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.8 b/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.8
deleted file mode 100644
index fab3f491705..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.8
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-7 1 0
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.9 b/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.9
deleted file mode 100644
index 1de4dd96d5c..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_ray/ix.9
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-7 25 0
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.1 b/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.1
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.1
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.10 b/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.10
deleted file mode 100644
index 376db53f5c4..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.10
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-5.06667 1.26667 1.66667
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.2 b/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.2
deleted file mode 100644
index c216dc94366..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.2
+++ /dev/null
@@ -1 +0,0 @@
-Segment intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.3 b/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.3
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.3
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.4 b/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.4
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.4
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.5 b/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.5
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.5
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.6 b/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.6
deleted file mode 100644
index 284a494c428..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.6
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-1.2 1.4 0
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.7 b/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.7
deleted file mode 100644
index 284a494c428..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.7
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-1.2 1.4 0
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.8 b/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.8
deleted file mode 100644
index fab3f491705..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.8
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-7 1 0
diff --git a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.9 b/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.9
deleted file mode 100644
index 1de4dd96d5c..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/plane_seg/ix.9
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-7 25 0
diff --git a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.0 b/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.0
deleted file mode 100644
index c472dc98a95..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.0
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
--3 +1 -5  -1.5 -8 -8
diff --git a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.1 b/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.1
deleted file mode 100644
index 30e24e9fe3b..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
-+1 +2 +3  +2.5 +5 +3
diff --git a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.2 b/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.2
deleted file mode 100644
index 6065127da82..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
-+1 +1 +1.5  +1 +5 +7.5
diff --git a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.3 b/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.3
deleted file mode 100644
index ee53d0d9a7c..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.3
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
-+2 +2 +6  +2.66667 +2 +8
diff --git a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.4 b/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.4
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.4
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.5 b/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.5
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.5
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.6 b/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.6
deleted file mode 100644
index 8f55c93357b..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/ray_isocub/ix.6
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
-+1 +2 +3  +2.5 +5 +7.5
diff --git a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.0 b/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.0
deleted file mode 100644
index d8bfc14108d..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.0
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
--3 +1 -5  -2 -5 -7
diff --git a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.1 b/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.1
deleted file mode 100644
index a2ca939a2cc..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-+1 +2 +3
diff --git a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.2 b/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.2
deleted file mode 100644
index f423528fe55..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
-Segment intersection.
-+1 +1 +1.5  +1 +2 +3
diff --git a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.3 b/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.3
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.3
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.4 b/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.4
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.4
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.5 b/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.5
deleted file mode 100644
index d08c33ef799..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.5
+++ /dev/null
@@ -1 +0,0 @@
-No intersection.
diff --git a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.6 b/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.6
deleted file mode 100644
index a2ca939a2cc..00000000000
--- a/Intersections_3/test/Intersections_3/RESULT/seg_isocub/ix.6
+++ /dev/null
@@ -1,2 +0,0 @@
-Point intersection.
-+1 +2 +3
diff --git a/Intersections_3/test/Intersections_3/cgal_test b/Intersections_3/test/Intersections_3/cgal_test
deleted file mode 100755
index a0a924e29dc..00000000000
--- a/Intersections_3/test/Intersections_3/cgal_test
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/sh
-OUTPUTFILE=error.txt
-DIFFOUTPUT=ErrorDiff
-ERRORFILE=error.txt
-
-use_purify=0
-
-compile_and_run()
-{
-   echo "Compiling $1 ... "
-   if eval 'make CGAL_MAKEFILE=$CGAL_MAKEFILE \
-            TESTSUITE_CXXFLAGS="$TESTSUITE_CXXFLAGS" \
-            TESTSUITE_LDFLAGS="$TESTSUITE_LDFLAGS" $1' ; then
-     echo "   compilation of $1 succeeded" >> $ERRORFILE
-   else
-     echo "   ERROR: compilation of $1 failed" >> $ERRORFILE
-   fi
-
-   if [ -f $1 ] ; then
-      OUTPUTFILE=ProgramOutput.$1.$PLATFORM
-     rm -f $OUTPUTFILE
-     COMMAND="./$1"
-     if [ -f $1.cmd ] ; then
-       COMMAND="$COMMAND `cat $1.cmd`"
-     fi
-     if [ -f $1.cin ] ; then
-       COMMAND="cat $1.cin | $COMMAND"
-     fi
-     echo "Executing $1 ... "
-     echo
-     if eval 2>&1 $COMMAND > $OUTPUTFILE ; then
-       echo "   execution of $1 succeeded" >> $ERRORFILE
-     else
-       echo "   ERROR: execution of $1 failed" >> $ERRORFILE
-     fi
-   else
-     echo "   ERROR: could not execute $1" >> $ERRORFILE
-   fi
-
-   eval "2>&1 make CGAL_MAKEFILE=$CGAL_MAKEFILE $1.clean > /dev/null "
-}
-
-
-one_run()
-{
-     goodresult=RESULT/${base}/`basename ${datafile}`
-     if "./${base}" < ${datafile} >output
-     then
-	if [ -r ${goodresult} ]
-	then
-	    if diff -b output ${goodresult} > diffoutput
-	    then
-		succes=ja
-	    else
-		succes=nee
-		echo "input: ${datafile}" >> ProgramOutput.${base}.$PLATFORM
-         	cat diffoutput >> ProgramOutput.${base}.$PLATFORM
-	    fi
-	else
-	    succes=ja
-	fi
-     else
-	succes=nee
-	explanation="non zero return code"
-     fi
-     if [ ${succes} = ja ]
-     then
-	echo "succes: ${base} < ${datafile}">> $OUTPUTFILE
-     else
-	echo "ERROR:  ${base} < ${datafile}" >> $OUTPUTFILE
-	echo "    " "$explanation" >> $OUTPUTFILE
-     fi
-}
-
-make_and_execute()
-{
-     if [ -r ii_files/${base}.ii.$1 ]
-     then
-	mv ii_files/${base}.ii.$1 ii_files/${base}.ii
-     fi
-     EXTRA_FLAGS="-DTESTR=$1"
-     export EXTRA_FLAGS
-     if make ${base} # 2>/dev/null
-     then
-	echo "succes: compiling ${file} with TESTR=$1" >> $OUTPUTFILE
-	if [ -r ii_files/${base}.ii ]
-	then
-	    mv ii_files/${base}.ii ii_files/${base}.ii.$1
-	fi
-	if [ ${use_purify} -eq 1 ]
-	then
-	    purify -log-file="%v.$1.%p.plog" ${base}
-	    mv ${base}.pure ${base}
-	fi
-	for datafile in ${datafiles}
-	do
-	    if [ -r ${datafile} ]
-	    then
-		one_run
-	    fi
-	done
-     else
-	echo "ERROR:  compiling ${file}  with TESTR=$1" >> $OUTPUTFILE
-     fi
-     make ${base}.clean
-}
-
-echo ${CGAL_LIB_DIR}
-
-rm -f $OUTPUTFILE
-touch $OUTPUTFILE
-rm -f $DIFFOUTPUT
-touch $DIFFOUTPUT
-
-if [ $# -ne 0 ]
-then
-     sourcefiles="$*"
-else
-     sourcefiles="*.cpp"
-fi
-
-
-for file in ${sourcefiles}
-do
-     base=`basename ${file} .cpp`
-     rm -f ProgramOutput.${base}.$PLATFORM
-     touch -f ProgramOutput.${base}.$PLATFORM
-     xdatafiles="DATA/${base}.x.*"
-#    idatafiles="DATA/${base}.i.*"
-#    ixdatafiles="DATA/${base}.ix.*"
-#    datafiles="${idatafiles} ${ixdatafiles}"
-#    datafiles="${ixdatafiles}"
-     if [ -d  "DATA/${base}" ]
-     then
-	datafiles="DATA/${base}/ix.*"
-     else
-	datafiles=""
-     fi
-     if [  "${datafiles}" ]
-     then
-         echo "TESTR=1" >> ProgramOutput.${base}.$PLATFORM
-	make_and_execute 1;
-     fi
-#    datafiles="${xdatafiles} ${ixdatafiles}"
-     if [  "${datafiles}" ]
-     then
-         echo "TESTR=5" >> ProgramOutput.${base}.$PLATFORM
-	make_and_execute 5;
-     else
-	compile_and_run ${base}
-     fi
-done
-
diff --git a/Intersections_3/test/Intersections_3/isocub_isocub.cpp b/Intersections_3/test/Intersections_3/isocub_isocub.cpp
deleted file mode 100644
index c6db1cd7e56..00000000000
--- a/Intersections_3/test/Intersections_3/isocub_isocub.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 3D Iso_rectangle Segment intersection.
- */
-
-#include "numrep1.h"
-#include <CGAL/Object.h>
-#include <CGAL/Point_3.h>
-#include <CGAL/Iso_cuboid_3.h> 
-#include <CGAL/intersection_3_1.h>
-
-#include "numrep2.h"
-#include <iostream>
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Iso_cuboid_3< TestR > rect_t;
-
-void print(const point_t &pt)
-{
-    double xd = CGAL::to_double(pt.x());
-    double yd = CGAL::to_double(pt.y());
-    double zd = CGAL::to_double(pt.z());
-    // force 0 to be positive zero.
-    if (xd == 0.0)
-	xd = 0.0;
-    if (yd == 0.0)
-	yd = 0.0;
-    if (zd == 0.0)
-	zd = 0.0;
-    std::cout.setf(std::ios::showpos, std::ios::showpos);
-    std::cout << xd <<' '<< yd<<' '<< zd;
-    std::cout.unsetf(std::ios::showpos);
-}
-
-
-
-void one_pair(rect_t const & irect1, rect_t const & irect2)
-{
-    rect_t irect;
-    CGAL::Object result = CGAL::intersection(irect1, irect2);
-    if (CGAL::assign(irect, result)) {
-	std::cout << "Intersection.\n";
-	print((irect.min)());
-	std::cout << ' ';
-	print((irect.max)());
-	std::cout << '\n';
-    }
-    if (!CGAL::assign(irect, result)) {
-	std::cout << "No intersection.\n";
-    }
-}
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    std::cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!std::cin)
-	return 1;
-    point_t p1, p2;
-    w1 = ri.next();
-    w2 = ri.next();
-    p1 = point_t(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    p2 = point_t(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
-    rect_t irect1(p1, p2);
-    std::cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!std::cin)
-	return 1;
-    w1 = ri.next();
-    w2 = ri.next();
-    p1 = point_t(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    p2 = point_t(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
-    rect_t irect2(p1, p2);
-    one_pair(irect1, irect2);
-    return 0;
-}
diff --git a/Intersections_3/test/Intersections_3/line_isocub.cpp b/Intersections_3/test/Intersections_3/line_isocub.cpp
deleted file mode 100644
index 3cc65d8bbe8..00000000000
--- a/Intersections_3/test/Intersections_3/line_isocub.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "numrep1.h"
-#include <iostream>
-#include <CGAL/Object.h>
-#include <CGAL/Iso_cuboid_3.h>
-#include <CGAL/intersection_3_1.h>
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3<TestR> point_t;
-typedef CGAL::Line_3<TestR> line_t;
-typedef CGAL::Segment_3<TestR> segment_t;
-typedef CGAL::Iso_cuboid_3< TestR > rect_t;
-
-void print(const point_t &pt)
-{
-    double xd = CGAL::to_double(pt.x());
-    double yd = CGAL::to_double(pt.y());
-    double zd = CGAL::to_double(pt.z());
-    // force 0 to be positive zero.
-    if (xd == 0.0)
-	xd = 0.0;
-    if (yd == 0.0)
-	yd = 0.0;
-    if (zd == 0.0)
-	zd = 0.0;
-    std::cout.setf(std::ios::showpos, std::ios::showpos);
-    std::cout << xd <<' '<< yd <<' '<< zd;
-    std::cout.unsetf(std::ios::showpos);
-}
-
-
-
-void one_pair(line_t const & line, rect_t const & rect)
-{
-    segment_t seg;
-    point_t point;
-    CGAL::Object result = CGAL::intersection(line, rect);
-    if (CGAL::assign(point, result)) {
-	std::cout << "Point intersection.\n";
-	print(point);
-	std::cout << '\n';
-    }
-    if (CGAL::assign(seg, result)) {
-	std::cout << "Segment intersection.\n";
-	print(seg.source());
-	std::cout << "  ";
-	print(seg.target());
-	std::cout << '\n';
-    }
-    if (!CGAL::assign(point, result) && !CGAL::assign(seg, result)) {
-	std::cout << "No intersection.\n";
-    }
-}
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    std::cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2 ;
-    if (!std::cin)
-	return 1;
-    w1 = ri.next();
-    w2 = ri.next();
-    point_t tp1(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    point_t tp2(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
-    line_t line(tp1, tp2);
-    std::cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!std::cin)
-	return 1;
-    w1 = ri.next();
-    w2 = ri.next();
-    point_t tp3(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    point_t tp4(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
-    rect_t rect(tp3, tp4);
-    one_pair(line, rect);
-    return 0;
-}
diff --git a/Intersections_3/test/Intersections_3/plane_line.cpp b/Intersections_3/test/Intersections_3/plane_line.cpp
deleted file mode 100644
index db69699a3d9..00000000000
--- a/Intersections_3/test/Intersections_3/plane_line.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Plane_3.h>
-#include <CGAL/Line_3.h>
-#include <CGAL/intersection_3_1.h>
-#include "numrep2.h"
-
-using std::cout;
-using std::cin;
-
-typedef CGAL::Plane_3<TestR> Plane;
-typedef CGAL::Line_3<TestR> Line;
-typedef CGAL::Point_3<TestR> Point;
-typedef CGAL::Direction_3<TestR> Direction;
-
-
-bool read_data(Plane &pl, Line &l)
-{
-    randomint ri;
-    int a, b, c, d, w;
-    cin >> a >> b >> c >> d;
-    if (!cin)
-	return false;
-    w = ri.next();
-    pl = Plane(a*w, b*w, c*w, d*w);
-    cin >> a >> b >> c;
-    if (!cin)
-	return false;
-    w = ri.next();
-    Point p1(a*w, b*w, c*w, w);
-    cin >> a >> b >> c;
-    if (!cin)
-	return false;
-    w = ri.next();
-    Point p2(a*w, b*w, c*w, w);
-    l = Line(p1, p2);
-    return true;
-}
-
-void write_point(const Point & pt)
-{
-    double xd = CGAL::to_double(pt.x());
-    double yd = CGAL::to_double(pt.y());
-    double zd = CGAL::to_double(pt.z());
-    // force 0 to be positive zero.
-    if (xd == 0.0)
-	xd = 0.0;
-    if (yd == 0.0)
-	yd = 0.0;
-    if (zd == 0.0)
-	zd = 0.0;
-    cout << xd <<' '<< yd <<' '<< zd << '\n';
-}
-
-
-int main()
-{
-    Plane pl;
-    Point pt;
-    Line l;
-    CGAL::Object result;
-    
-    if (!read_data(pl, l))
-	return 1;
-    result = CGAL::intersection(pl, l);
-    if (result.is_empty()) {
-	if (CGAL::do_intersect(pl, l)) {
-	    cout << "do_intersect is inconsistent with intersection result.\n";
-	    return 1;
-	}
-	cout << "No intersection.\n";
-	return 0;
-    }
-    if (!CGAL::do_intersect(pl, l)) {
-	cout << "do_intersect is inconsistent with intersection result.\n";
-	return 1;
-    }
-    if (CGAL::assign(pt, result)) {
-	cout << "Point intersection.\n";
-	write_point(pt);
-	return 0;
-    } else {
-	if (CGAL::assign(l, result)) {
-	    cout << "Line intersection.\n";
-	    return 0;
-	}
-    }
-    cout << "Unknown result.\n";
-    return 1;
-}
diff --git a/Intersections_3/test/Intersections_3/plane_plane.cpp b/Intersections_3/test/Intersections_3/plane_plane.cpp
deleted file mode 100644
index 43c7c7062ca..00000000000
--- a/Intersections_3/test/Intersections_3/plane_plane.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Plane_3.h>
-#include <CGAL/Line_3.h>
-#include <CGAL/intersection_3_1.h>
-#include "numrep2.h"
-
-using std::cout;
-using std::cin;
-
-typedef CGAL::Plane_3<TestR> Plane;
-typedef CGAL::Line_3<TestR> Line;
-typedef CGAL::Point_3<TestR> Point;
-typedef CGAL::Direction_3<TestR> Direction;
-typedef CGAL::Object  Object;
-
-
-bool read_data(Plane &pl1, Plane &pl2)
-{
-    randomint ri;
-    int a, b, c, d, w;
-    cin >> a >> b >> c >> d;
-    if (!cin)
-	return false;
-    w = ri.next();
-    pl1 = Plane(a*w, b*w, c*w, d*w);
-    cin >> a >> b >> c >> d;
-    if (!cin)
-	return false;
-    w = ri.next();
-    pl2 = Plane(a*w, b*w, c*w, d*w);
-    return true;
-}
-
-void write_point(const Point & pt)
-{
-    double xd = CGAL::to_double(pt.x());
-    double yd = CGAL::to_double(pt.y());
-    double zd = CGAL::to_double(pt.z());
-    // force 0 to be positive zero.
-    if (xd == 0.0)
-	xd = 0.0;
-    if (yd == 0.0)
-	yd = 0.0;
-    if (zd == 0.0)
-	zd = 0.0;
-    cout << xd <<' '<< yd <<' '<< zd << '\n';
-}
-
-// Testing intersections of 3 planes.
-bool plane_plane_plane()
-{
-  Plane pl1(1,0,0,0);
-  Plane pl2(0,1,0,0);
-  Plane pl3(0,0,1,0);
-
-  // Generic intersection.
-  Object o = CGAL::intersection(pl1, pl2, pl3);
-  Point p;
-  if (!assign(p, o)) {
-    std::cerr << "Unexpected intersection result" << std::endl;
-    return false;
-  }
-
-  if (p != Point(0,0,0)) {
-    std::cerr << "Unexpected intersection result" << std::endl;
-    return false;
-  }
-
-  // Empty intersection.
-  Plane pl4(1,0,0,1); // pl4 is // to pl1.
-
-  Object o2 = CGAL::intersection(pl1, pl2, pl4);
-  if (!o2.is_empty()) {
-    std::cerr << "Unexpected intersection result" << std::endl;
-    return false;
-  }
-
-  Object o3 = CGAL::intersection(pl1, pl4, pl2);
-  if (!o3.is_empty()) {
-    std::cerr << "Unexpected intersection result" << std::endl;
-    return false;
-  }
-
-  // Intersection in a line.
-  Plane pl5(1,1,0,0); // pl1, pl2, pl5 intersect in the line l.
-  Line l;
-
-  Object o4 = CGAL::intersection(pl1, pl2, pl5);
-  if (!assign(l, o4)) {
-    std::cerr << "Unexpected intersection result" << std::endl;
-    return false;
-  }
-
-  if (l != Line(Point(0,0,0), Point(0,0,1))) {
-    std::cerr << "Unexpected intersection result" << std::endl;
-    return false;
-  }
-
-  // Intersection in a plane.
-  Object o5 = CGAL::intersection(pl1, pl1, pl1);
-  Plane pl;
-  if (!assign(pl, o5)) {
-    std::cerr << "Unexpected intersection result" << std::endl;
-    return false;
-  }
-
-  if (pl != pl1) {
-    std::cerr << "Unexpected intersection result" << std::endl;
-    return false;
-  }
-
-  return true;
-}
-
-int main()
-{
-    if (!plane_plane_plane())
-      return 1;
-
-    Plane pl1, pl2;
-    Line l;
-    CGAL::Object result;
-    
-    if (!read_data(pl1, pl2))
-	return 1;
-    result = CGAL::intersection(pl1, pl2);
-    if (result.is_empty()) {
-	if (CGAL::do_intersect(pl1, pl2)) {
-	    cout << "do_intersect is inconsistent with intersection result.\n";
-	    return 1;
-	}
-	cout << "No intersection.\n";
-	return 0;
-    }
-    if (!CGAL::do_intersect(pl1, pl2)) {
-	cout << "do_intersect is inconsistent with intersection result.\n";
-	return 1;
-    }
-    if (CGAL::assign(l, result)) {
-	cout << "Line intersection.\n";
-	write_point(l.point(0));
-	write_point(l.point(1));
-	return 0;
-    } else {
-	if (CGAL::assign(pl1, result)) {
-	    cout << "Plane intersection.\n";
-	    return 0;
-	}
-    }
-    cout << "Unknown result.\n";
-    return 1;
-}
diff --git a/Intersections_3/test/Intersections_3/plane_ray.cpp b/Intersections_3/test/Intersections_3/plane_ray.cpp
deleted file mode 100644
index c89b15993e5..00000000000
--- a/Intersections_3/test/Intersections_3/plane_ray.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Plane_3.h>
-#include <CGAL/Line_3.h>
-#include <CGAL/intersection_3_1.h>
-#include "numrep2.h"
-
-using std::cout;
-using std::cin;
-
-typedef CGAL::Plane_3<TestR> Plane;
-typedef CGAL::Ray_3<TestR> Ray;
-typedef CGAL::Point_3<TestR> Point;
-typedef CGAL::Direction_3<TestR> Direction;
-
-
-bool read_data(Plane &pl, Ray &ray)
-{
-    randomint ri;
-    int a, b, c, d, w;
-    cin >> a >> b >> c >> d;
-    if (!cin)
-	return false;
-    w = ri.next();
-    pl = Plane(a*w, b*w, c*w, d*w);
-    cin >> a >> b >> c;
-    if (!cin)
-	return false;
-    w = ri.next();
-    Point p1(a*w, b*w, c*w, w);
-    cin >> a >> b >> c;
-    if (!cin)
-	return false;
-    w = ri.next();
-    Point p2(a*w, b*w, c*w, w);
-    ray = Ray(p1, p2);
-    return true;
-}
-
-void write_point(const Point & pt)
-{
-    double xd = CGAL::to_double(pt.x());
-    double yd = CGAL::to_double(pt.y());
-    double zd = CGAL::to_double(pt.z());
-    // force 0 to be positive zero.
-    if (xd == 0.0)
-	xd = 0.0;
-    if (yd == 0.0)
-	yd = 0.0;
-    if (zd == 0.0)
-	zd = 0.0;
-    cout << xd <<' '<< yd <<' '<< zd << '\n';
-}
-
-
-int main()
-{
-    Plane pl;
-    Point pt;
-    Ray ray;
-    CGAL::Object result;
-    
-    if (!read_data(pl, ray))
-	return 1;
-    result = CGAL::intersection(pl, ray);
-    if (result.is_empty()) {
-	if (CGAL::do_intersect(pl, ray)) {
-	    cout << "do_intersect is inconsistent with intersection result.\n";
-	    return 1;
-	}
-	cout << "No intersection.\n";
-	return 0;
-    }
-    if (!CGAL::do_intersect(pl, ray)) {
-	cout << "do_intersect is inconsistent with intersection result.\n";
-	return 1;
-    }
-    if (CGAL::assign(pt, result)) {
-	cout << "Point intersection.\n";
-	write_point(pt);
-	return 0;
-    } else {
-	if (CGAL::assign(ray, result)) {
-	    cout << "Ray intersection.\n";
-	    return 0;
-	}
-    }
-    cout << "Unknown result.\n";
-    return 1;
-}
diff --git a/Intersections_3/test/Intersections_3/plane_seg.cpp b/Intersections_3/test/Intersections_3/plane_seg.cpp
deleted file mode 100644
index 74c6dbdf4ec..00000000000
--- a/Intersections_3/test/Intersections_3/plane_seg.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Plane_3.h>
-#include <CGAL/Line_3.h>
-#include <CGAL/intersection_3_1.h>
-#include "numrep2.h"
-
-using std::cout;
-using std::cin;
-
-typedef CGAL::Plane_3<TestR> Plane;
-typedef CGAL::Segment_3<TestR> Segment;
-typedef CGAL::Point_3<TestR> Point;
-typedef CGAL::Direction_3<TestR> Direction;
-
-
-bool read_data(Plane &pl, Segment &seg)
-{
-    randomint ri;
-    int a, b, c, d, w;
-    cin >> a >> b >> c >> d;
-    if (!cin)
-	return false;
-    w = ri.next();
-    pl = Plane(a*w, b*w, c*w, d*w);
-    cin >> a >> b >> c;
-    if (!cin)
-	return false;
-    w = ri.next();
-    Point p1(a*w, b*w, c*w, w);
-    cin >> a >> b >> c;
-    if (!cin)
-	return false;
-    w = ri.next();
-    Point p2(a*w, b*w, c*w, w);
-    seg = Segment(p1, p2);
-    return true;
-}
-
-
-void write_point(const Point & pt)
-{
-    double xd = CGAL::to_double(pt.x());
-    double yd = CGAL::to_double(pt.y());
-    double zd = CGAL::to_double(pt.z());
-    // force 0 to be positive zero.
-    if (xd == 0.0)
-	xd = 0.0;
-    if (yd == 0.0)
-	yd = 0.0;
-    if (zd == 0.0)
-	zd = 0.0;
-    cout << xd <<' '<< yd <<' '<< zd << '\n';
-}
-
-/*
-void write_point(const Point & pt)
-{
-    cout << CGAL::to_double(pt.x()) <<' '
-	<< CGAL::to_double(pt.y()) <<' '
-	<< CGAL::to_double(pt.z()) << '\n';
-}
-*/
-
-int main()
-{
-    Plane pl;
-    Point pt;
-    Segment seg;
-    CGAL::Object result;
-    
-    if (!read_data(pl, seg))
-	return 1;
-    result = CGAL::intersection(pl, seg);
-    if (result.is_empty()) {
-	if (CGAL::do_intersect(pl, seg)) {
-	    cout << "do_intersect is inconsistent with intersection result.\n";
-	    return 1;
-	}
-	cout << "No intersection.\n";
-	return 0;
-    }
-    if (!CGAL::do_intersect(pl, seg)) {
-	cout << "do_intersect is inconsistent with intersection result.\n";
-	return 1;
-    }
-    if (CGAL::assign(pt, result)) {
-	cout << "Point intersection.\n";
-	write_point(pt);
-	return 0;
-    } else {
-	if (CGAL::assign(seg, result)) {
-	    cout << "Segment intersection.\n";
-	    return 0;
-	}
-    }
-    cout << "Unknown result.\n";
-    return 1;
-}
diff --git a/Intersections_3/test/Intersections_3/ray_isocub.cpp b/Intersections_3/test/Intersections_3/ray_isocub.cpp
deleted file mode 100644
index b2f9336968c..00000000000
--- a/Intersections_3/test/Intersections_3/ray_isocub.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 2D Iso_rectangle Ray intersection.
- */
-
-#include "numrep1.h"
-#include <CGAL/Object.h>
-#include <CGAL/Iso_cuboid_3.h> 
-#include <CGAL/intersection_3_1.h>
-#include "numrep2.h"
-#include <iostream>
-
-typedef CGAL::Point_3<TestR> point_t;
-typedef CGAL::Ray_3<TestR> ray_t;
-typedef CGAL::Segment_3<TestR> segment_t;
-typedef CGAL::Iso_cuboid_3< TestR > rect_t;
-
-void print(const point_t &pt)
-{
-    double xd = CGAL::to_double(pt.x());
-    double yd = CGAL::to_double(pt.y());
-    double zd = CGAL::to_double(pt.z());
-    // force 0 to be positive zero.
-    if (xd == 0.0)
-	xd = 0.0;
-    if (yd == 0.0)
-	yd = 0.0;
-    if (zd == 0.0)
-	zd = 0.0;
-    std::cout.setf(std::ios::showpos, std::ios::showpos);
-    std::cout << xd <<' '<< yd <<' '<< zd;
-    std::cout.unsetf(std::ios::showpos);
-}
-
-
-void one_pair(ray_t const & ray, rect_t const & rect)
-{
-    segment_t seg;
-    point_t point;
-
-    CGAL::Object result = CGAL::intersection(ray, rect);
-    if (CGAL::assign(point, result)) {
-	std::cout << "Point intersection.\n";
-	print(point);
-	std::cout << '\n';
-    }
-    if (CGAL::assign(seg, result)) {
-	std::cout << "Segment intersection.\n";
-	print(seg.source());
-	std::cout << "  ";
-	print(seg.target());
-	std::cout << '\n';
-    }
-    if (!CGAL::assign(point, result) && !CGAL::assign(seg, result)) {
-	std::cout << "No intersection.\n";
-    }
-}
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    std::cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!std::cin)
-	return 1;
-    point_t p1, p2;
-    w1 = ri.next();
-    w2 = ri.next();
-    p1 = point_t(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    p2 = point_t(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
-    ray_t ray(p1, p2);
-    std::cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!std::cin)
-	return 1;
-    w1 = ri.next();
-    w2 = ri.next();
-    p1 = point_t(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    p2 = point_t(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
-    rect_t rect(p1, p2);
-    one_pair(ray, rect);
-    return 0;
-}
diff --git a/Intersections_3/test/Intersections_3/seg_isocub.cpp b/Intersections_3/test/Intersections_3/seg_isocub.cpp
deleted file mode 100644
index 430e0cf9886..00000000000
--- a/Intersections_3/test/Intersections_3/seg_isocub.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 2D Iso_rectangle Segment intersection.
- */
-#include "numrep1.h"
-
-#include <iostream>
-#include <CGAL/Object.h>
-#include <CGAL/Iso_cuboid_3.h> 
-#include <CGAL/intersection_3_1.h>
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3<TestR> point_t;
-typedef CGAL::Segment_3<TestR> segment_t;
-typedef CGAL::Iso_cuboid_3< TestR > rect_t;
-
-void print(const point_t &pt)
-{
-    double xd = CGAL::to_double(pt.x());
-    double yd = CGAL::to_double(pt.y());
-    double zd = CGAL::to_double(pt.z());
-    // force 0 to be positive zero.
-    if (xd == 0.0)
-	xd = 0.0;
-    if (yd == 0.0)
-	yd = 0.0;
-    if (zd == 0.0)
-	zd = 0.0;
-    std::cout.setf(std::ios::showpos, std::ios::showpos);
-    std::cout << xd <<' '<< yd <<' '<< zd;
-    std::cout.unsetf(std::ios::showpos);
-}
-
-
-void one_pair(segment_t const & seg, rect_t const & rect)
-{
-    segment_t iseg;
-    point_t point;
-
-    CGAL::Object result = CGAL::intersection(seg, rect);
-    if (CGAL::assign(point, result)) {
-	std::cout << "Point intersection.\n";
-	print(point);
-	std::cout << '\n';
-    }
-    if (CGAL::assign(iseg, result)) {
-	std::cout << "Segment intersection.\n";
-	print(iseg.source());
-	std::cout << "  ";
-	print(iseg.target());
-	std::cout << '\n';
-    }
-    if (!CGAL::assign(point, result) && !CGAL::assign(iseg, result)) {
-	std::cout << "No intersection.\n";
-    }
-}
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    std::cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!std::cin)
-	return 1;
-    point_t p1, p2;
-    w1 = ri.next();
-    w2 = ri.next();
-    p1 = point_t(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    p2 = point_t(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
-    segment_t seg(p1, p2);
-    std::cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!std::cin)
-	return 1;
-    w1 = ri.next();
-    w2 = ri.next();
-    p1 = point_t(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    p2 = point_t(to_nt(w2*x2), to_nt(w2*y2), to_nt(w2*z2), to_nt(w2));
-    rect_t rect(p1, p2);
-    one_pair(seg, rect);
-    return 0;
-}
diff --git a/Intersections_3/test/Intersections_3/test_intersections_3.cpp b/Intersections_3/test/Intersections_3/test_intersections_3.cpp
new file mode 100644
index 00000000000..a194d804559
--- /dev/null
+++ b/Intersections_3/test/Intersections_3/test_intersections_3.cpp
@@ -0,0 +1,317 @@
+// 3D intersection tests.
+
+#include <CGAL/Object.h>
+#include <CGAL/Point_3.h>
+#include <CGAL/Iso_cuboid_3.h>
+#include <CGAL/Cartesian.h>
+#include <CGAL/Homogeneous.h>
+#include <CGAL/MP_Float.h>
+
+#include <iostream>
+#include <cassert>
+
+#ifdef NDEBUG
+#  error The test-suite needs no NDEBUG defined
+#endif
+
+const double epsilon = 0.001;
+
+struct randomint {
+  randomint() ;
+  int	get() const { return sequence[cur]; }
+  int next() { cur = (cur+1)%11; return get();}
+private:
+  int sequence[11];
+  int cur;
+};
+
+inline randomint::randomint()
+{
+  cur = 0;
+  sequence[0] = 19;
+  sequence[1] = 5;
+  sequence[2] = 17;
+  sequence[3] = 13;
+  sequence[4] = 29;
+  sequence[5] = 2;
+  sequence[6] = 23;
+  sequence[7] = 31;
+  sequence[8] = 3;
+  sequence[9] = 37;
+  sequence[10] = 11;
+}
+
+inline double to_nt(int d)
+{
+    return double(d);
+}
+
+template < typename K >
+struct Test {
+
+  typedef CGAL::Point_3< K >          P;
+  typedef CGAL::Segment_3< K >        S;
+  typedef CGAL::Line_3< K >           L;
+  typedef CGAL::Plane_3< K >          Pl;
+  typedef CGAL::Ray_3< K >            R;
+  typedef CGAL::Iso_cuboid_3< K >     Cub;
+
+
+  template < typename Type >
+  bool approx_equal_nt(const Type &t1, const Type &t2)
+  {
+	if (t1 == t2)
+		return true;
+	if (CGAL::abs(t1 - t2) / CGAL::max(CGAL::abs(t1), CGAL::abs(t2)) < epsilon)
+		return true;
+	std::cout << " Approximate comparison failed between : " << t1 << "  and  " << t2 << "\n";
+	return false;
+  }
+
+  template < typename Type >
+  bool approx_equal(const Type&t1, const Type&t2)
+  {
+	return t1 == t2;
+	// we need approx equal to check approx kernels, but maybe we should only test with exact kernels
+	// (approx kernels were useful before, when the text output was checked by diff ?)
+	// idea : test containment with intervals ?  or use some "epsilon double"?
+	// I need to convert the text output to exact rationals in the source...
+	// Well, for now the current scheme works.
+  }
+
+  bool approx_equal(const P & p, const P & q)
+  {
+	return approx_equal_nt(p.x(), q.x()) &&
+	       approx_equal_nt(p.y(), q.y()) &&
+	       approx_equal_nt(p.z(), q.z());
+  }
+
+  bool approx_equal(const S & p, const S & q)
+  {
+	return approx_equal(p.source(), q.source()) && approx_equal(p.target(), q.target());
+  }
+
+  /*
+  bool approx_equal(const Pol & p, const Pol & q)
+  {
+	if (p.size() != q.size())
+		return false;
+	for(typename Pol::const_iterator itp = p.begin(), itq = q.begin(); itp != p.end(); ++itp, ++itq)
+		if (!approx_equal(*itp, *itq))
+			return false;
+	return true;
+  }
+  */
+
+  template < typename O1, typename O2>
+  void check_no_intersection(const O1& o1, const O2& o2)
+  {
+	// FIXME : assert(!CGAL::do_intersect(o1, o2)); some are missing...
+	assert(CGAL::intersection(o1, o2).empty());
+  }
+
+  template < typename Res, typename O1, typename O2 >
+  void check_intersection(const O1& o1, const O2& o2)
+  {
+	Res tmp;
+	// FIXME : assert(CGAL::do_intersect(o1, o2));
+	assert(CGAL::assign(tmp, CGAL::intersection(o1, o2)));
+  }
+
+  template < typename Res, typename O1, typename O2 >
+  void check_intersection(const O1& o1, const O2& o2, const Res& result)
+  {
+	// FIXME : assert(CGAL::do_intersect(o1, o2));
+	Res tmp;
+	assert(CGAL::assign(tmp, CGAL::intersection(o1, o2)));
+	assert(approx_equal(tmp, result));
+  }
+
+
+  P p(int x, int y, int z)
+  {
+    randomint ri;
+    int w = ri.next();
+    return P(to_nt(x*w), to_nt(y*w), to_nt(z*w), to_nt(w));
+  }
+
+  Pl pl(int a, int b, int c, int d)
+  {
+    randomint ri;
+    int w = ri.next();
+    return Pl(to_nt(a*w), to_nt(b*w), to_nt(c*w), to_nt(d*w));
+  }
+
+  void Cub_Cub()
+  {
+    std::cout << "Iso_cuboid - Iso_cuboid\n";
+    check_intersection     (Cub(p(-7, 6, 1), p(7092, 71, 58)), Cub(p(-758, -98725, 43), p(17, 9025473, 47)),
+		            Cub(p(-7, 6, 43), p(17, 71, 47)));
+    check_no_intersection  (Cub(p(-7, 6, 1), p(7092, 71, 58)), Cub(p(-758, 98725, 43), p(17, 9025473, 47)));
+    check_no_intersection  (Cub(p(-73, 6, 1), p(-70, 71, 58)), Cub(p(8, -98725, 43), p(17, 9025473, 47)));
+    check_no_intersection  (Cub(p(-7, 6, 1), p(7092, 71, 58)), Cub(p(-758, -98725, -47), p(17, 9025473, -43)));
+  }
+
+  void L_Cub()
+  {
+    std::cout << "Line - Iso_cuboid\n";
+    check_intersection     (L(p(-3, 1,-5), p(  -2, -5, -7)), Cub(p(  -7,     -8, -9), p(-1,       2, -4)),
+		            S(P(-3.16667, 2, -4.66667), P(-1.5, -8, -8)));
+    check_intersection     (L(p( 0, 0, 3), p(   1,  2,  3)), Cub(p(   1,      1,  1), p( 3,       5,  8)),
+		            S(P(       1, 2,        3), P( 2.5,  5,  3)));
+    check_intersection     (L(p( 1, 0, 0), p(   1,  2,  3)), Cub(p(   1,      1,  1), p( 3,       5,  8)),
+		            S(P(       1, 1,      1.5), P(   1,  5, 7.5)));
+    check_intersection     (L(p( 0, 2, 0), p(   1,  2,  3)), Cub(p(   2,      1,  1), p( 3,       5,  8)),
+		            S(P(       2, 2,        6), P(2.66667, 2, 8)));
+    check_no_intersection  (L(p( 0, 0, 0), p(   1,  0,  3)), Cub(p(   2,      1,  1), p( 3,       5,  8)));
+    check_no_intersection  (L(p( 4, 0, 0), p(   4,  1,  3)), Cub(p(   2,      1,  1), p( 3,       5,  8)));
+    check_intersection     (L(p( 0, 0, 0), p(   1,  2,  3)), Cub(p(   1,      1,  1), p( 3,       5,  8)),
+		            S(P(       1, 2,        3), P(2.5, 5, 7.5)));
+  }
+
+  void Pl_L()
+  {
+    std::cout << "Plane - Line\n";
+    check_intersection     (pl(1, 1, 1, 0), L(p(   1,      1,  1), p( 2,       3,  4)),
+		            P(0.5, 0, -0.5));
+    check_intersection<L>  (pl(0, 0, 1,-1), L(p(   1,      1,  1), p( 2,       3,  1)));
+    check_no_intersection  (pl(0, 0, 1,-2), L(p(   1,      1,  1), p( 2,       3,  1)));
+    check_intersection     (pl(1, 0, 1, 3), L(p(   1,      1,  1), p( 2,       3, -1)),
+		            P(  6, 11, -9));
+    check_intersection     (pl(1, 2, 4, 7), L(p(   1,      1,  1), p( 2,       3,  4)),
+		            P( 0.176471, -0.647059, -1.47059));
+  }
+
+  void Pl_Pl()
+  {
+    std::cout << "Plane - Plane\n";
+    check_intersection     (pl(0, 0, 1, 0), pl(0, 1, 0, 0), L(P(0, 0, 0), P(-85, 0, 0)));
+    check_intersection<Pl> (pl(0, 0, 1, 1), pl(0, 0, 3, 3));
+    check_no_intersection  (pl(2, 1, 3, 4), pl(6, 3, 9, 3));
+    check_intersection<Pl> (pl(2, 1, 3, 4), pl(6, 3, 9, 12));
+    check_intersection     (pl(2, 3, 7, 5), pl(9, 7, 1, 3), L(P(2,-3, 0), P(-3908, 5182, -1105)));
+  }
+
+  void Pl_Pl_Pl()
+  {
+    std::cout << "Plane - Plane - Plane\n";
+    Pl pl1(1,0,0,0);
+    Pl pl2(0,1,0,0);
+    Pl pl3(0,0,1,0);
+
+    // Generic intersection.
+    CGAL::Object o = CGAL::intersection(pl1, pl2, pl3);
+    P p;
+    assert(assign(p, o));
+    assert(p == P(0,0,0));
+
+    // Empty intersection.
+    Pl pl4(1,0,0,1); // pl4 is // to pl1.
+
+    CGAL::Object o2 = CGAL::intersection(pl1, pl2, pl4);
+    assert(o2.is_empty());
+
+    CGAL::Object o3 = CGAL::intersection(pl1, pl4, pl2);
+    assert(o3.is_empty());
+
+    // Intersection in a line.
+    Pl pl5(1,1,0,0); // pl1, pl2, pl5 intersect in the line l.
+    L l;
+
+    CGAL::Object o4 = CGAL::intersection(pl1, pl2, pl5);
+    assert(assign(l, o4));
+
+    assert(l == L(P(0,0,0), P(0,0,1)));
+
+    // Intersection in a plane.
+    CGAL::Object o5 = CGAL::intersection(pl1, pl1, pl1);
+    Pl pl;
+    assert(assign(pl, o5));
+    assert(pl == pl1);
+  }
+
+  void Pl_R()
+  {
+    std::cout << "Plane - Ray\n";
+    check_no_intersection  (pl( 1, 1, 1,  0), R(p(1, 1, 1), p(2, 3, 4)));
+    check_intersection     (pl(-3, 7, 5, -2), R(p(12, -3, 7), p(-1, 5, -3)), P(5.06667, 1.26667, 1.66667));
+    check_intersection<R>  (pl( 0, 0, 1, -1), R(p( 1,  1, 1), p( 2, 3,  1)));
+    check_no_intersection  (pl( 0, 0, 1, -2), R(p( 1,  1, 1), p( 2, 3,  1)));
+    check_intersection     (pl( 1, 0, 1,  3), R(p( 1,  1, 1), p( 2, 3, -1)), P(6, 11, -9));
+    check_no_intersection  (pl( 1, 2, 4,  7), R(p( 1,  1, 1), p( 2, 3,  4)));
+    check_intersection     (pl( 0, 0, 1,  0), R(p( 1,  1,-1), p( 2, 3,  4)), P(1.2, 1.4, 0));
+    check_intersection     (pl( 0, 0, 1,  0), R(p( 2,  3, 4), p( 1, 1, -1)), P(1.2, 1.4, 0));
+    check_intersection     (pl( 0, 0, 1,  0), R(p( 7,  1, 0), p(83, 1, -4)), P(  7,   1, 0));
+    check_intersection     (pl( 0, 0, 1,  0), R(p(12,  6,-4), p( 7,25,  0)), P(  7,  25, 0));
+  }
+
+  void Pl_S()
+  {
+    std::cout << "Plane - Segment\n";
+    check_no_intersection  (pl( 1, 1, 1,  0), S(p(1, 1, 1), p(2, 3, 4)));
+    check_intersection     (pl(-3, 7, 5, -2), S(p(12, -3, 7), p(-1, 5, -3)), P(5.06667, 1.26667, 1.66667));
+    check_intersection<S>  (pl( 0, 0, 1, -1), S(p( 1,  1, 1), p( 2, 3,  1)));
+    check_no_intersection  (pl( 0, 0, 1, -2), S(p( 1,  1, 1), p( 2, 3,  1)));
+    check_no_intersection  (pl( 1, 0, 1,  3), S(p( 1,  1, 1), p( 2, 3, -1)));
+    check_no_intersection  (pl( 1, 2, 4,  7), S(p( 1,  1, 1), p( 2, 3,  4)));
+    check_intersection     (pl( 0, 0, 1,  0), S(p( 1,  1,-1), p( 2, 3,  4)), P(1.2, 1.4, 0));
+    check_intersection     (pl( 0, 0, 1,  0), S(p( 2,  3, 4), p( 1, 1, -1)), P(1.2, 1.4, 0));
+    check_intersection     (pl( 0, 0, 1,  0), S(p( 7,  1, 0), p(83, 1, -4)), P(  7,   1, 0));
+    check_intersection     (pl( 0, 0, 1,  0), S(p(12,  6,-4), p( 7,25,  0)), P(  7,  25, 0));
+  }
+
+  void R_Cub()
+  {
+    std::cout << "Ray - Iso_cuboid\n";
+    check_intersection     (R(p( -3,  1,  -5), p( -2,  -5,  -7)), Cub(p( -7,  -8,  -9), p( -1,  2,  -4)),
+		            S(P(-3, 1, -5), P(-1.5, -8, -8)));
+    check_intersection     (R(p(  0,  0,   3), p(  1,   2,   3)), Cub(p(  1,   1,   1), p(  3,  5,   8)),
+		            S(P( 1, 2,  3), P( 2.5,  5,  3)));
+    check_intersection     (R(p(  1,  0,   0), p(  1,   2,   3)), Cub(p(  1,   1,   1), p(  3,  5,   8)),
+		            S(P( 1, 1,1.5), P(   1,  5,7.5)));
+    check_intersection     (R(p(  0,  2,   0), p(  1,   2,   3)), Cub(p(  2,   1,   1), p(  3,  5,   8)),
+		            S(P( 2, 2,  6), P(2.66667,2, 8)));
+    check_no_intersection  (R(p(  0,  0,   0), p(  1,   0,   3)), Cub(p(  2,   1,   1), p(  3,  5,   8)));
+    check_no_intersection  (R(p(  4,  0,   0), p(  4,   1,   3)), Cub(p(  2,   1,   1), p(  3,  5,   8)));
+    check_intersection     (R(p(  0,  0,   0), p(  1,   2,   3)), Cub(p(  1,   1,   1), p(  3,  5,   8)),
+		            S(P( 1, 2,  3), P(2.5, 5, 7.5)));
+  }
+
+  void S_Cub()
+  {
+    std::cout << "Segment - Iso_cuboid\n";
+    check_intersection     (S(p( -3,  1,  -5), p( -2,  -5,  -7)), Cub(p( -7,  -8,  -9), p( -1,  2,  -4)),
+		            S(P(-3, 1, -5), P(  -2, -5, -7)));
+    check_intersection     (S(p(  0,  0,   3), p(  1,   2,   3)), Cub(p(  1,   1,   1), p(  3,  5,   8)),
+		            P( 1,  2,  3));
+    check_intersection     (S(p(  1,  0,   0), p(  1,   2,   3)), Cub(p(  1,   1,   1), p(  3,  5,   8)),
+		            S(P( 1, 1, 1.5), P(   1,  2, 3)));
+    check_no_intersection  (S(p(  0,  2,   0), p(  1,   2,   3)), Cub(p(  2,   1,   1), p(  3,  5,   8)));
+    check_no_intersection  (S(p(  0,  0,   0), p(  1,   0,   3)), Cub(p(  2,   1,   1), p(  3,  5,   8)));
+    check_no_intersection  (S(p(  4,  0,   0), p(  4,   1,   3)), Cub(p(  2,   1,   1), p(  3,  5,   8)));
+    check_intersection     (S(p(  0,  0,   0), p(  1,   2,   3)), Cub(p(  1,   1,   1), p(  3,  5,   8)),
+		            P( 1, 2,  3));
+  }
+
+  void run()
+  {
+    std::cout << "3D Intersection tests\n";
+    Cub_Cub();
+    L_Cub();
+    Pl_L();
+    Pl_Pl();
+    Pl_Pl_Pl();
+    Pl_R();
+    Pl_S();
+    R_Cub();
+    S_Cub();
+  }
+
+};
+
+int main()
+{
+	Test< CGAL::Cartesian<double>   >().run();
+	Test< CGAL::Homogeneous<CGAL::MP_Float> >().run();
+	// TODO : test more kernels.
+}