From 5fda79d9fb129894e89a44d9c1a75deca8d5045c Mon Sep 17 00:00:00 2001
From: Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
Date: Fri, 29 Aug 2008 18:14:36 +0000
Subject: [PATCH] Rewrite the test-suite using: - a single test file - a
 template parameter for the kernel - data sets and results in the source code
 instead of text files using diff for comparing - no custom cgal_test script

---
 .gitattributes                                |   1 -
 Distance_3/test/Distance_3/DATA/tst321/ix.1   |   2 -
 Distance_3/test/Distance_3/DATA/tst321/ix.2   |   2 -
 Distance_3/test/Distance_3/DATA/tst321/ix.3   |   2 -
 Distance_3/test/Distance_3/DATA/tst321/ix.4   |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.1   |   3 -
 Distance_3/test/Distance_3/DATA/tst322/ix.10  |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.11  |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.12  |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.13  |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.14  |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.15  |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.16  |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.17  |   3 -
 Distance_3/test/Distance_3/DATA/tst322/ix.18  |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.2   |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.3   |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.4   |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.5   |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.6   |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.7   |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.8   |   2 -
 Distance_3/test/Distance_3/DATA/tst322/ix.9   |   2 -
 Distance_3/test/Distance_3/DATA/tst324/ix.1   |   2 -
 Distance_3/test/Distance_3/DATA/tst324/ix.2   |   2 -
 Distance_3/test/Distance_3/DATA/tst324/ix.3   |   2 -
 Distance_3/test/Distance_3/DATA/tst326/ix.1   |   2 -
 Distance_3/test/Distance_3/DATA/tst326/ix.2   |   3 -
 Distance_3/test/Distance_3/DATA/tst326/ix.3   |   2 -
 Distance_3/test/Distance_3/DATA/tst326/ix.4   |   2 -
 Distance_3/test/Distance_3/DATA/tst327/ix.1   |   2 -
 Distance_3/test/Distance_3/DATA/tst327/ix.2   |   2 -
 Distance_3/test/Distance_3/DATA/tst328/ix.1   |   2 -
 Distance_3/test/Distance_3/DATA/tst328/ix.2   |   2 -
 Distance_3/test/Distance_3/DATA/tst328/ix.3   |   2 -
 Distance_3/test/Distance_3/DATA/tst329/ix.1   |   2 -
 Distance_3/test/Distance_3/DATA/tst329/ix.2   |   2 -
 Distance_3/test/Distance_3/DATA/tst329/ix.3   |   2 -
 Distance_3/test/Distance_3/DATA/tst330/ix.1   |   2 -
 Distance_3/test/Distance_3/DATA/tst331/ix.1   |   2 -
 Distance_3/test/Distance_3/DATA/tst332/ix.1   |   2 -
 Distance_3/test/Distance_3/RESULT/tst322/ix.1 |   1 -
 .../test/Distance_3/RESULT/tst322/ix.10       |   1 -
 .../test/Distance_3/RESULT/tst322/ix.11       |   1 -
 .../test/Distance_3/RESULT/tst322/ix.12       |   1 -
 .../test/Distance_3/RESULT/tst322/ix.13       |   1 -
 .../test/Distance_3/RESULT/tst322/ix.14       |   1 -
 .../test/Distance_3/RESULT/tst322/ix.15       |   1 -
 .../test/Distance_3/RESULT/tst322/ix.16       |   1 -
 .../test/Distance_3/RESULT/tst322/ix.17       |   1 -
 .../test/Distance_3/RESULT/tst322/ix.18       |   1 -
 Distance_3/test/Distance_3/RESULT/tst322/ix.2 |   1 -
 Distance_3/test/Distance_3/RESULT/tst322/ix.3 |   1 -
 Distance_3/test/Distance_3/RESULT/tst322/ix.4 |   1 -
 Distance_3/test/Distance_3/RESULT/tst322/ix.5 |   1 -
 Distance_3/test/Distance_3/RESULT/tst322/ix.6 |   1 -
 Distance_3/test/Distance_3/RESULT/tst322/ix.7 |   1 -
 Distance_3/test/Distance_3/RESULT/tst322/ix.8 |   1 -
 Distance_3/test/Distance_3/RESULT/tst322/ix.9 |   1 -
 Distance_3/test/Distance_3/RESULT/tst325/ix.1 |   1 -
 .../test/Distance_3/RESULT/tst325/ix.10       |   1 -
 .../test/Distance_3/RESULT/tst325/ix.11       |   1 -
 .../test/Distance_3/RESULT/tst325/ix.12       |   1 -
 .../test/Distance_3/RESULT/tst325/ix.13       |   1 -
 .../test/Distance_3/RESULT/tst325/ix.14       |   1 -
 .../test/Distance_3/RESULT/tst325/ix.15       |   1 -
 .../test/Distance_3/RESULT/tst325/ix.16       |   1 -
 .../test/Distance_3/RESULT/tst325/ix.17       |   1 -
 .../test/Distance_3/RESULT/tst325/ix.18       |   1 -
 Distance_3/test/Distance_3/RESULT/tst325/ix.2 |   1 -
 Distance_3/test/Distance_3/RESULT/tst325/ix.3 |   1 -
 Distance_3/test/Distance_3/RESULT/tst325/ix.4 |   1 -
 Distance_3/test/Distance_3/RESULT/tst325/ix.5 |   1 -
 Distance_3/test/Distance_3/RESULT/tst325/ix.6 |   1 -
 Distance_3/test/Distance_3/RESULT/tst325/ix.7 |   1 -
 Distance_3/test/Distance_3/RESULT/tst325/ix.8 |   1 -
 Distance_3/test/Distance_3/RESULT/tst325/ix.9 |   1 -
 Distance_3/test/Distance_3/RESULT/tst327/ix.1 |   1 -
 Distance_3/test/Distance_3/RESULT/tst327/ix.2 |   1 -
 Distance_3/test/Distance_3/cgal_test          |  99 -------
 Distance_3/test/Distance_3/numrep1.h          |  95 -------
 Distance_3/test/Distance_3/numrep2.h          |  34 ---
 .../test/Distance_3/test_distance_3.cpp       | 252 ++++++++++++++++++
 Distance_3/test/Distance_3/tst321.cpp         |  35 ---
 Distance_3/test/Distance_3/tst322.cpp         |  40 ---
 Distance_3/test/Distance_3/tst323.cpp         |  36 ---
 Distance_3/test/Distance_3/tst324.cpp         |  40 ---
 Distance_3/test/Distance_3/tst325.cpp         |  42 ---
 Distance_3/test/Distance_3/tst326.cpp         |  41 ---
 Distance_3/test/Distance_3/tst327.cpp         |  36 ---
 Distance_3/test/Distance_3/tst328.cpp         |  41 ---
 Distance_3/test/Distance_3/tst329.cpp         |  39 ---
 Distance_3/test/Distance_3/tst330.cpp         |  32 ---
 Distance_3/test/Distance_3/tst331.cpp         |  39 ---
 Distance_3/test/Distance_3/tst332.cpp         |  39 ---
 Distance_3/test/Distance_3/tst333.cpp         |  39 ---
 96 files changed, 252 insertions(+), 849 deletions(-)
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst321/ix.1
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst321/ix.2
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst321/ix.3
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst321/ix.4
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.1
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.10
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.11
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.12
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.13
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.14
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.15
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.16
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.17
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.18
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.2
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.3
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.4
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.5
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.6
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.7
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.8
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst322/ix.9
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst324/ix.1
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst324/ix.2
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst324/ix.3
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst326/ix.1
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst326/ix.2
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst326/ix.3
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst326/ix.4
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst327/ix.1
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst327/ix.2
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst328/ix.1
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst328/ix.2
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst328/ix.3
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst329/ix.1
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst329/ix.2
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst329/ix.3
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst330/ix.1
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst331/ix.1
 delete mode 100644 Distance_3/test/Distance_3/DATA/tst332/ix.1
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.1
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.10
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.11
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.12
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.13
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.14
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.15
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.16
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.17
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.18
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.2
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.3
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.4
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.5
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.6
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.7
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.8
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst322/ix.9
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.1
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.10
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.11
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.12
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.13
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.14
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.15
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.16
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.17
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.18
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.2
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.3
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.4
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.5
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.6
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.7
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.8
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst325/ix.9
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst327/ix.1
 delete mode 100644 Distance_3/test/Distance_3/RESULT/tst327/ix.2
 delete mode 100755 Distance_3/test/Distance_3/cgal_test
 delete mode 100644 Distance_3/test/Distance_3/numrep1.h
 delete mode 100644 Distance_3/test/Distance_3/numrep2.h
 create mode 100644 Distance_3/test/Distance_3/test_distance_3.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst321.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst322.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst323.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst324.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst325.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst326.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst327.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst328.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst329.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst330.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst331.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst332.cpp
 delete mode 100644 Distance_3/test/Distance_3/tst333.cpp

diff --git a/.gitattributes b/.gitattributes
index a2c6da72d10..a05d05146c8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1425,7 +1425,6 @@ Developers_manual/doc_tex/Developers_manual/fig/reference_counting.pdf -text svn
 Developers_manual/doc_tex/Developers_manual/fig/use_real.eps -text svneol=unset#application/postscript
 Developers_manual/doc_tex/Developers_manual/fig/use_real.gif -text svneol=unset#image/gif
 Developers_manual/doc_tex/Developers_manual/fig/use_real.pdf -text svneol=unset#application/pdf
-Distance_3/test/Distance_3/cgal_test eol=lf
 Envelope_2/doc_tex/Envelope_2/fig/Envelope_2.png -text
 Envelope_2/doc_tex/Envelope_2/fig/ex_circle.eps -text svneol=unset#application/postscript
 Envelope_2/doc_tex/Envelope_2/fig/ex_circle.fig -text svneol=unset#application/octet-stream
diff --git a/Distance_3/test/Distance_3/DATA/tst321/ix.1 b/Distance_3/test/Distance_3/DATA/tst321/ix.1
deleted file mode 100644
index e481e11e3ce..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst321/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-0 1 2
--3 0 0  2 0 0
diff --git a/Distance_3/test/Distance_3/DATA/tst321/ix.2 b/Distance_3/test/Distance_3/DATA/tst321/ix.2
deleted file mode 100644
index 745243b4d74..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst321/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
-0 1 2
-3 0 0  2 0 0
diff --git a/Distance_3/test/Distance_3/DATA/tst321/ix.3 b/Distance_3/test/Distance_3/DATA/tst321/ix.3
deleted file mode 100644
index c8e0f6d3aeb..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst321/ix.3
+++ /dev/null
@@ -1,2 +0,0 @@
-0 1 2
-2 0 0  3 0 0
diff --git a/Distance_3/test/Distance_3/DATA/tst321/ix.4 b/Distance_3/test/Distance_3/DATA/tst321/ix.4
deleted file mode 100644
index ea5149b064f..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst321/ix.4
+++ /dev/null
@@ -1,2 +0,0 @@
-6 1 2
-2 0 0  3 0 0
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.1 b/Distance_3/test/Distance_3/DATA/tst322/ix.1
deleted file mode 100644
index 595ef9921b7..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.1
+++ /dev/null
@@ -1,3 +0,0 @@
- -8 -7 0  11 6 0
-23 -27 2  -17 16 2
-
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.10 b/Distance_3/test/Distance_3/DATA/tst322/ix.10
deleted file mode 100644
index d62b9c75cd1..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.10
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  5 0 0
-1 1 2  6 1 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.11 b/Distance_3/test/Distance_3/DATA/tst322/ix.11
deleted file mode 100644
index 69951fea358..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.11
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  5 0 0
-1 1 2  2 1 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.12 b/Distance_3/test/Distance_3/DATA/tst322/ix.12
deleted file mode 100644
index fb50ff94208..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.12
+++ /dev/null
@@ -1,2 +0,0 @@
-5 0 0  8 0 0
-1 1 2  2 1 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.13 b/Distance_3/test/Distance_3/DATA/tst322/ix.13
deleted file mode 100644
index 5b7bbb531a3..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.13
+++ /dev/null
@@ -1,2 +0,0 @@
-5 0 0  0 0 0
-1 1 2  2 1 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.14 b/Distance_3/test/Distance_3/DATA/tst322/ix.14
deleted file mode 100644
index 5b7bbb531a3..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.14
+++ /dev/null
@@ -1,2 +0,0 @@
-5 0 0  0 0 0
-1 1 2  2 1 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.15 b/Distance_3/test/Distance_3/DATA/tst322/ix.15
deleted file mode 100644
index 1af88bdad20..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.15
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  5 0 0
-6 1 2  8 1 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.16 b/Distance_3/test/Distance_3/DATA/tst322/ix.16
deleted file mode 100644
index 1411bd1deea..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.16
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  0 -3 0
-1 4 2  1 7 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.17 b/Distance_3/test/Distance_3/DATA/tst322/ix.17
deleted file mode 100644
index a6b12f31d48..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.17
+++ /dev/null
@@ -1,3 +0,0 @@
-
-0 0 0  5 0 0
-8 1 2  6 1 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.18 b/Distance_3/test/Distance_3/DATA/tst322/ix.18
deleted file mode 100644
index 85587d3ed65..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.18
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  0 0 0
-8 1 2  6 1 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.2 b/Distance_3/test/Distance_3/DATA/tst322/ix.2
deleted file mode 100644
index 18db8b40454..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  1 0 0
-2 1 2  2 -1 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.3 b/Distance_3/test/Distance_3/DATA/tst322/ix.3
deleted file mode 100644
index 0a7dca40556..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.3
+++ /dev/null
@@ -1,2 +0,0 @@
-2 0 0  0 2 0
-1 1 4  4 0 4
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.4 b/Distance_3/test/Distance_3/DATA/tst322/ix.4
deleted file mode 100644
index ceec0f692c7..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.4
+++ /dev/null
@@ -1,2 +0,0 @@
-10 0 0  0 10 0
-6 6 20  20 0 20
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.5 b/Distance_3/test/Distance_3/DATA/tst322/ix.5
deleted file mode 100644
index 37dee7b5b78..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.5
+++ /dev/null
@@ -1,2 +0,0 @@
--10 -13 0  0 10 0
-10 5 20  70 -30 20
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.6 b/Distance_3/test/Distance_3/DATA/tst322/ix.6
deleted file mode 100644
index d69d628bc49..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.6
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  30 -10 0
--5 20 20  40 30 20
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.7 b/Distance_3/test/Distance_3/DATA/tst322/ix.7
deleted file mode 100644
index 980413ad18e..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.7
+++ /dev/null
@@ -1,2 +0,0 @@
-4 0 0  -3 -1 0
-1 1 2  2 11 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.8 b/Distance_3/test/Distance_3/DATA/tst322/ix.8
deleted file mode 100644
index 26aa0e21887..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.8
+++ /dev/null
@@ -1,2 +0,0 @@
-3 4 0  7 7 0
-7 0 2  6 5 2
diff --git a/Distance_3/test/Distance_3/DATA/tst322/ix.9 b/Distance_3/test/Distance_3/DATA/tst322/ix.9
deleted file mode 100644
index 612a8a0d235..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst322/ix.9
+++ /dev/null
@@ -1,2 +0,0 @@
--1 1 0  3 4 0
-7 0 2  6 5 2
diff --git a/Distance_3/test/Distance_3/DATA/tst324/ix.1 b/Distance_3/test/Distance_3/DATA/tst324/ix.1
deleted file mode 100644
index f0eac217b8a..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst324/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 30  0 30 30
-100 -100 0  200 1 0
diff --git a/Distance_3/test/Distance_3/DATA/tst324/ix.2 b/Distance_3/test/Distance_3/DATA/tst324/ix.2
deleted file mode 100644
index 967ac85862a..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst324/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
-1 0 0  0 0 0
-1 3 3  0 0 3
diff --git a/Distance_3/test/Distance_3/DATA/tst324/ix.3 b/Distance_3/test/Distance_3/DATA/tst324/ix.3
deleted file mode 100644
index 91f0b03c098..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst324/ix.3
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  1 0 0
-0 0 2  -1 0 2
diff --git a/Distance_3/test/Distance_3/DATA/tst326/ix.1 b/Distance_3/test/Distance_3/DATA/tst326/ix.1
deleted file mode 100644
index ee5f81dd48c..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst326/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-10 0 0  20 0 0
-0 0 3  0 3 3
diff --git a/Distance_3/test/Distance_3/DATA/tst326/ix.2 b/Distance_3/test/Distance_3/DATA/tst326/ix.2
deleted file mode 100644
index 3e1a33f6be6..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst326/ix.2
+++ /dev/null
@@ -1,3 +0,0 @@
-
-0 0 30  0 30 30
-100 -100 0  200 1 0
diff --git a/Distance_3/test/Distance_3/DATA/tst326/ix.3 b/Distance_3/test/Distance_3/DATA/tst326/ix.3
deleted file mode 100644
index 967ac85862a..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst326/ix.3
+++ /dev/null
@@ -1,2 +0,0 @@
-1 0 0  0 0 0
-1 3 3  0 0 3
diff --git a/Distance_3/test/Distance_3/DATA/tst326/ix.4 b/Distance_3/test/Distance_3/DATA/tst326/ix.4
deleted file mode 100644
index 91f0b03c098..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst326/ix.4
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  1 0 0
-0 0 2  -1 0 2
diff --git a/Distance_3/test/Distance_3/DATA/tst327/ix.1 b/Distance_3/test/Distance_3/DATA/tst327/ix.1
deleted file mode 100644
index c8e0f6d3aeb..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst327/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-0 1 2
-2 0 0  3 0 0
diff --git a/Distance_3/test/Distance_3/DATA/tst327/ix.2 b/Distance_3/test/Distance_3/DATA/tst327/ix.2
deleted file mode 100644
index 11854a59b1e..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst327/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 2
-0 0 0  1 2 0
diff --git a/Distance_3/test/Distance_3/DATA/tst328/ix.1 b/Distance_3/test/Distance_3/DATA/tst328/ix.1
deleted file mode 100644
index 967ac85862a..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst328/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-1 0 0  0 0 0
-1 3 3  0 0 3
diff --git a/Distance_3/test/Distance_3/DATA/tst328/ix.2 b/Distance_3/test/Distance_3/DATA/tst328/ix.2
deleted file mode 100644
index d2db3a167a3..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst328/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
--90 0 0  -10 0 0
-0 0 3  0 3 3
diff --git a/Distance_3/test/Distance_3/DATA/tst328/ix.3 b/Distance_3/test/Distance_3/DATA/tst328/ix.3
deleted file mode 100644
index 91f0b03c098..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst328/ix.3
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  1 0 0
-0 0 2  -1 0 2
diff --git a/Distance_3/test/Distance_3/DATA/tst329/ix.1 b/Distance_3/test/Distance_3/DATA/tst329/ix.1
deleted file mode 100644
index ca3b3736ba7..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst329/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
--10 0 0  -90 0 0
-0 0 3  0 3 3
diff --git a/Distance_3/test/Distance_3/DATA/tst329/ix.2 b/Distance_3/test/Distance_3/DATA/tst329/ix.2
deleted file mode 100644
index 967ac85862a..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst329/ix.2
+++ /dev/null
@@ -1,2 +0,0 @@
-1 0 0  0 0 0
-1 3 3  0 0 3
diff --git a/Distance_3/test/Distance_3/DATA/tst329/ix.3 b/Distance_3/test/Distance_3/DATA/tst329/ix.3
deleted file mode 100644
index 91f0b03c098..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst329/ix.3
+++ /dev/null
@@ -1,2 +0,0 @@
-0 0 0  1 0 0
-0 0 2  -1 0 2
diff --git a/Distance_3/test/Distance_3/DATA/tst330/ix.1 b/Distance_3/test/Distance_3/DATA/tst330/ix.1
deleted file mode 100644
index 2025f51628f..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst330/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-2 5 3
-0 1 0 0
diff --git a/Distance_3/test/Distance_3/DATA/tst331/ix.1 b/Distance_3/test/Distance_3/DATA/tst331/ix.1
deleted file mode 100644
index 77795287467..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst331/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-2 -3 3  3 -7 4
-0 1 0 0
diff --git a/Distance_3/test/Distance_3/DATA/tst332/ix.1 b/Distance_3/test/Distance_3/DATA/tst332/ix.1
deleted file mode 100644
index a64350f3ae8..00000000000
--- a/Distance_3/test/Distance_3/DATA/tst332/ix.1
+++ /dev/null
@@ -1,2 +0,0 @@
-2 -4 3  3 -4 4
-0 1 0 0
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.1 b/Distance_3/test/Distance_3/RESULT/tst322/ix.1
deleted file mode 100644
index b8626c4cff2..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.1
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.10 b/Distance_3/test/Distance_3/RESULT/tst322/ix.10
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.10
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.11 b/Distance_3/test/Distance_3/RESULT/tst322/ix.11
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.11
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.12 b/Distance_3/test/Distance_3/RESULT/tst322/ix.12
deleted file mode 100644
index 8351c19397f..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.12
+++ /dev/null
@@ -1 +0,0 @@
-14
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.13 b/Distance_3/test/Distance_3/RESULT/tst322/ix.13
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.13
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.14 b/Distance_3/test/Distance_3/RESULT/tst322/ix.14
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.14
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.15 b/Distance_3/test/Distance_3/RESULT/tst322/ix.15
deleted file mode 100644
index 1e8b3149621..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.15
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.16 b/Distance_3/test/Distance_3/RESULT/tst322/ix.16
deleted file mode 100644
index aabe6ec3909..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.16
+++ /dev/null
@@ -1 +0,0 @@
-21
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.17 b/Distance_3/test/Distance_3/RESULT/tst322/ix.17
deleted file mode 100644
index 1e8b3149621..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.17
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.18 b/Distance_3/test/Distance_3/RESULT/tst322/ix.18
deleted file mode 100644
index 87523dd7a06..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.18
+++ /dev/null
@@ -1 +0,0 @@
-41
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.2 b/Distance_3/test/Distance_3/RESULT/tst322/ix.2
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.2
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.3 b/Distance_3/test/Distance_3/RESULT/tst322/ix.3
deleted file mode 100644
index b6a7d89c68e..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.3
+++ /dev/null
@@ -1 +0,0 @@
-16
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.4 b/Distance_3/test/Distance_3/RESULT/tst322/ix.4
deleted file mode 100644
index 52f22458dcc..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.4
+++ /dev/null
@@ -1 +0,0 @@
-402
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.5 b/Distance_3/test/Distance_3/RESULT/tst322/ix.5
deleted file mode 100644
index 6af403e65c7..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.5
+++ /dev/null
@@ -1 +0,0 @@
-524.642
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.6 b/Distance_3/test/Distance_3/RESULT/tst322/ix.6
deleted file mode 100644
index 22196bca7f2..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.6
+++ /dev/null
@@ -1 +0,0 @@
-824.706
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.7 b/Distance_3/test/Distance_3/RESULT/tst322/ix.7
deleted file mode 100644
index 1e8b3149621..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.7
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.8 b/Distance_3/test/Distance_3/RESULT/tst322/ix.8
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.8
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst322/ix.9 b/Distance_3/test/Distance_3/RESULT/tst322/ix.9
deleted file mode 100644
index fcdb3d1c43c..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst322/ix.9
+++ /dev/null
@@ -1 +0,0 @@
-13.8462
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.1 b/Distance_3/test/Distance_3/RESULT/tst325/ix.1
deleted file mode 100644
index b8626c4cff2..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.1
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.10 b/Distance_3/test/Distance_3/RESULT/tst325/ix.10
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.10
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.11 b/Distance_3/test/Distance_3/RESULT/tst325/ix.11
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.11
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.12 b/Distance_3/test/Distance_3/RESULT/tst325/ix.12
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.12
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.13 b/Distance_3/test/Distance_3/RESULT/tst325/ix.13
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.13
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.14 b/Distance_3/test/Distance_3/RESULT/tst325/ix.14
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.14
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.15 b/Distance_3/test/Distance_3/RESULT/tst325/ix.15
deleted file mode 100644
index 1e8b3149621..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.15
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.16 b/Distance_3/test/Distance_3/RESULT/tst325/ix.16
deleted file mode 100644
index aabe6ec3909..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.16
+++ /dev/null
@@ -1 +0,0 @@
-21
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.17 b/Distance_3/test/Distance_3/RESULT/tst325/ix.17
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.17
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.18 b/Distance_3/test/Distance_3/RESULT/tst325/ix.18
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.18
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.2 b/Distance_3/test/Distance_3/RESULT/tst325/ix.2
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.2
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.3 b/Distance_3/test/Distance_3/RESULT/tst325/ix.3
deleted file mode 100644
index b8626c4cff2..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.3
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.4 b/Distance_3/test/Distance_3/RESULT/tst325/ix.4
deleted file mode 100644
index 5a1844e9121..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.4
+++ /dev/null
@@ -1 +0,0 @@
-4.02
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.5 b/Distance_3/test/Distance_3/RESULT/tst325/ix.5
deleted file mode 100644
index 7c0955ca673..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.5
+++ /dev/null
@@ -1 +0,0 @@
-5.24642
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.6 b/Distance_3/test/Distance_3/RESULT/tst325/ix.6
deleted file mode 100644
index e0ac8d172c6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.6
+++ /dev/null
@@ -1 +0,0 @@
-8.24706
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.7 b/Distance_3/test/Distance_3/RESULT/tst325/ix.7
deleted file mode 100644
index 1e8b3149621..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.7
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.8 b/Distance_3/test/Distance_3/RESULT/tst325/ix.8
deleted file mode 100644
index b8626c4cff2..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.8
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/Distance_3/test/Distance_3/RESULT/tst325/ix.9 b/Distance_3/test/Distance_3/RESULT/tst325/ix.9
deleted file mode 100644
index fcdb3d1c43c..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst325/ix.9
+++ /dev/null
@@ -1 +0,0 @@
-13.8462
diff --git a/Distance_3/test/Distance_3/RESULT/tst327/ix.1 b/Distance_3/test/Distance_3/RESULT/tst327/ix.1
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst327/ix.1
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/Distance_3/test/Distance_3/RESULT/tst327/ix.2 b/Distance_3/test/Distance_3/RESULT/tst327/ix.2
deleted file mode 100644
index b8626c4cff2..00000000000
--- a/Distance_3/test/Distance_3/RESULT/tst327/ix.2
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/Distance_3/test/Distance_3/cgal_test b/Distance_3/test/Distance_3/cgal_test
deleted file mode 100755
index 0dde916474b..00000000000
--- a/Distance_3/test/Distance_3/cgal_test
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-OUTPUTFILE=error.txt
-
-use_purify=0
-
-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
-		cat diffoutput >> ProgramOutput.${base}.$PLATFORM
-	    fi
-	else
-	    succes=ja
-	fi
-    else
-	succes=nee
-    fi
-    if [ ${succes} = ja ]
-    then
-	echo "succes: ${base} < ${datafile}">> $OUTPUTFILE
-    else
-	echo "ERROR:  ${base} < ${datafile}" >> $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
-
-if [ $# -ne 0 ]
-then
-    sourcefiles="$*"
-else
-    sourcefiles="tst*.cpp"
-fi
-
-
-for file in ${sourcefiles}
-do
-    base=`basename ${file} .cpp`
-    rm -f ProgramOutput.${base}.$PLATFORM
-    touch -f ProgramOutput.${base}.$PLATFORM
-    datafiles="ls DATA/${base}/ix*"
-    if [  "${datafiles}" ]
-    then
-        echo "TESTR=1" >> ProgramOutput.${base}.$PLATFORM
-	make_and_execute 1;
-    fi
-    if [  "${datafiles}" ]
-    then
-        echo "TESTR=2" >> ProgramOutput.${base}.$PLATFORM
-	make_and_execute 2;
-    fi
-done
-
-
-
diff --git a/Distance_3/test/Distance_3/numrep1.h b/Distance_3/test/Distance_3/numrep1.h
deleted file mode 100644
index 4bf10d716cb..00000000000
--- a/Distance_3/test/Distance_3/numrep1.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#if TESTR == 1
-
-#include <CGAL/Cartesian.h>
-
-inline double to_nt(int d)
-{
-    return double(d);
-}
-#endif
-
-#if TESTR == 2
-
-#include <CGAL/Homogeneous.h>
-
-inline double to_nt(int d)
-{
-    return d;
-}
-#endif
-
-
-#if TESTR == 3
-
-#include <CGAL/test_types.h>
-#include <CGAL/Cartesian.h>
-
-inline CGAL::TestfieldC to_nt(int d)
-{
-    unsigned char dummy1 = 'a';
-    signed char dummy2 = 'a';
-    return CGAL::TestfieldC(dummy1, dummy2, (double)d);
-}
-
-#endif
-
-
-#if TESTR == 4
-
-#include <CGAL/test_types.h>
-#include <CGAL/Homogeneous.h>
-
-inline CGAL::TestrepH to_nt(int d)
-{
-    unsigned char dummy1 = 'a';
-    signed char dummy2 = 'a';
-    return CGAL::TestrepH(dummy1, dummy2, d);
-}
-#endif
-
-#if TESTR == 5
-
-#include <CGAL/Homogeneous.h>
-#include <CGAL/Integer.h>
-
-#if CGAL_LEDA_VERSION < 500
-#include <LEDA/REDEFINE_NAMES.h>
-#else
-#include <LEDA/internal/REDEFINE_NAMES.h>
-#endif
-inline integer to_nt(int d)
-{
-    return integer(d);
-}
-#if CGAL_LEDA_VERSION < 500
-#include <LEDA/UNDEFINE_NAMES.h>
-#else
-#include <LEDA/internal/UNDEFINE_NAMES.h>
-#endif
-#endif
-
-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;
-}
-
diff --git a/Distance_3/test/Distance_3/numrep2.h b/Distance_3/test/Distance_3/numrep2.h
deleted file mode 100644
index 324de4641bb..00000000000
--- a/Distance_3/test/Distance_3/numrep2.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#if TESTR == 1
-    typedef double testnt;
-    typedef CGAL::Cartesian<testnt> TestR;
-#endif
-
-#if TESTR == 2
-    typedef double testnt;
-    typedef CGAL::Homogeneous<testnt> TestR;
-#endif
-
-#if TESTR == 3
-    typedef CGAL::TestfieldC testnt;
-    typedef CGAL::Cartesian<testnt> TestR;
-#endif
-
-#if TESTR == 4
-    typedef CGAL::TestrepH testnt;
-    typedef CGAL::Homogeneous<testnt> TestR;
-#endif
-
-#if TESTR == 5
-#if CGAL_LEDA_VERSION < 500
-#include <LEDA/REDEFINE_NAMES.h>
-#else
-#include <LEDA/internal/REDEFINE_NAMES.h>
-#endif
-    typedef integer testnt;
-#if CGAL_LEDA_VERSION < 500
-#include <LEDA/UNDEFINE_NAMES.h>
-#else
-#include <LEDA/internal/UNDEFINE_NAMES.h>
-#endif
-    typedef CGAL::Homogeneous<testnt> TestR;
-#endif
diff --git a/Distance_3/test/Distance_3/test_distance_3.cpp b/Distance_3/test/Distance_3/test_distance_3.cpp
new file mode 100644
index 00000000000..c34b6306055
--- /dev/null
+++ b/Distance_3/test/Distance_3/test_distance_3.cpp
@@ -0,0 +1,252 @@
+// 3D distance tests.
+
+#include <CGAL/Object.h>
+#include <CGAL/Line_3.h>
+#include <CGAL/Point_3.h>
+#include <CGAL/Segment_3.h>
+#include <CGAL/Ray_3.h>
+#include <CGAL/Triangle_3.h>
+#include <CGAL/Iso_cuboid_3.h>
+
+#include <CGAL/Cartesian.h>
+#include <CGAL/Homogeneous.h>
+
+#include <vector>
+#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;
+}
+
+randomint ri;
+
+inline double to_nt(int d)
+{
+    return double(d);
+}
+
+template < typename K >
+struct Test {
+
+  typedef typename K::FT              FT;
+  typedef CGAL::Point_3< K >          P;
+  typedef CGAL::Line_3< K >           L;
+  typedef CGAL::Segment_3< K >        S;
+  typedef CGAL::Ray_3< K >            R;
+  typedef CGAL::Triangle_3< K >       T;
+  typedef CGAL::Plane_3< K >          Pl;
+  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 O1, typename O2 >
+  void check_squared_distance(const O1& o1, const O2& o2, const FT& result)
+  {
+	assert(approx_equal_nt(CGAL::squared_distance(o1, o2), result));
+	assert(approx_equal_nt(CGAL::squared_distance(o2, o1), result));
+  }
+
+
+  P p(int x, int y, int z)
+  {
+    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)
+  {
+    int w = ri.next();
+    return Pl(to_nt(a*w), to_nt(b*w), to_nt(c*w), to_nt(d*w));
+  }
+
+
+  void P_P()
+  {
+    std::cout << "Point - Point\n";
+    check_squared_distance (p(0, 0, 0), p(0, 0, 0), 0);
+    check_squared_distance (p(1, 1, 1), p(0, 0, 0), 3);
+  }
+
+  void P_S()
+  {
+    // Note : the values are not verified by hand
+    std::cout << "Point - Segment\n";
+    check_squared_distance (p(0, 1, 2), S(p(-3, 0, 0), p( 2, 0, 0)), 5);
+    check_squared_distance (p(0, 1, 2), S(p( 3, 0, 0), p( 2, 0, 0)), 9);
+    check_squared_distance (p(0, 1, 2), S(p( 2, 0, 0), p( 3, 0, 0)), 9);
+    check_squared_distance (p(6, 1, 2), S(p( 2, 0, 0), p( 3, 0, 0)), 14);
+  }
+
+  void S_S()
+  {
+    std::cout << "Segment - Segment\n";
+    check_squared_distance (S(p( -8, -7,  0), p( 11, 6, 0)), S(p(23, -27, 2), p( -17, 16, 2)), 4);
+    check_squared_distance (S(p(  0,  0,  0), p(  5, 0, 0)), S(p( 1,   1, 2), p(   6,  1, 2)), 5);
+    check_squared_distance (S(p(  0,  0,  0), p(  5, 0, 0)), S(p( 1,   1, 2), p(   2,  1, 2)), 5);
+    check_squared_distance (S(p(  5,  0,  0), p(  8, 0, 0)), S(p( 1,   1, 2), p(   2,  1, 2)), 14);
+    check_squared_distance (S(p(  5,  0,  0), p(  0, 0, 0)), S(p( 1,   1, 2), p(   2,  1, 2)), 5);
+    check_squared_distance (S(p(  0,  0,  0), p(  5, 0, 0)), S(p( 6,   1, 2), p(   8,  1, 2)), 6);
+    check_squared_distance (S(p(  0,  0,  0), p(  0,-3, 0)), S(p( 1,   4, 2), p(   1,  7, 2)), 21);
+    check_squared_distance (S(p(  0,  0,  0), p(  5, 0, 0)), S(p( 8,   1, 2), p(   6,  1, 2)), 6);
+    check_squared_distance (S(p(  0,  0,  0), p(  0, 0, 0)), S(p( 8,   1, 2), p(   6,  1, 2)), 41);
+    check_squared_distance (S(p(  0,  0,  0), p(  1, 0, 0)), S(p( 2,   1, 2), p(   2, -1, 2)), 5);
+    check_squared_distance (S(p(  2,  0,  0), p(  0, 2, 0)), S(p( 1,   1, 4), p(   4,  0, 4)), 16);
+    check_squared_distance (S(p( 10,  0,  0), p(  0,10, 0)), S(p( 6,   6,20), p(  20,  0,20)), 402);
+    check_squared_distance (S(p(-10,-13,  0), p(  0,10, 0)), S(p(10,   5,20), p(  70,-30,20)), 524.642);
+    check_squared_distance (S(p(  0,  0,  0), p(30,-10, 0)), S(p(-5,  20,20), p(  40, 30,20)), 824.706);
+    check_squared_distance (S(p(  4,  0,  0), p(-3, -1, 0)), S(p( 1,   1, 2), p(   2, 11, 2)), 6);
+    check_squared_distance (S(p(  3,  4,  0), p( 7,  7, 0)), S(p( 7,   0, 2), p(   6,  5, 2)), 5);
+    check_squared_distance (S(p( -1,  1,  0), p( 3,  4, 0)), S(p( 7,   0, 2), p(   6,  5, 2)), 13.8462);
+  }
+
+  void P_R()
+  {
+    // Note : the value is not verified by hand
+    std::cout << "Point - Ray\n";
+    check_squared_distance (p( -8, -7,  0), R(p(23, -27, 2), p( -17, 16, 2)), 86.3685);
+  }
+
+  void R_R()
+  {
+    // Note : the values are not verified by hand
+    std::cout << "Ray - Ray\n";
+    check_squared_distance (R(p( 0, 0, 30), p(  0, 30, 30)), R(p(100, -100, 0), p( 200,  1, 0)), 20899.5);
+    check_squared_distance (R(p( 1, 0,  0), p(  0,  0,  0)), R(p(  1,    3, 3), p(   0,  0, 3)), 9);
+    check_squared_distance (R(p( 0, 0,  0), p(  1,  0,  0)), R(p(  0,    0, 2), p(  -1,  0, 2)), 4);
+  }
+
+  void S_R()
+  {
+    // Note : the values are not verified by hand
+    std::cout << "Segment - Ray\n";
+    check_squared_distance (S(p( 0, 0, 30), p(  0, 30, 30)), R(p(100, -100, 0), p( 200,  1, 0)), 20899.5);
+  }
+
+  void R_L()
+  {
+    // Note : the values are not verified by hand
+    std::cout << "Ray - Line\n";
+    check_squared_distance (R(p(10, 0,  0), p( 20,  0,  0)), L(p(  0,    0, 3), p(   0,  3, 3)), 109);
+    check_squared_distance (R(p( 0, 0, 30), p(  0, 30, 30)), L(p(100, -100, 0), p( 200,  1, 0)), 20899.5);
+    check_squared_distance (R(p( 1, 0,  0), p(  0,  0,  0)), L(p(  1,    3, 3), p(   0,  0, 3)), 9);
+    check_squared_distance (R(p( 0, 0,  0), p(  1,  0,  0)), L(p(  0,    0, 2), p(  -1,  0, 2)), 4);
+  }
+
+  void P_L()
+  {
+    std::cout << "Point - Line\n";
+    check_squared_distance (p(  0,  1,  2), L(p(  2,    0, 0), p(   3,  0, 0)), 5);
+    check_squared_distance (p(  0,  0,  2), L(p(  0,    0, 0), p(   1,  2, 0)), 4);
+  }
+
+  void S_L()
+  {
+    // Note : the values are not verified by hand
+    std::cout << "Segment - Line\n";
+    check_squared_distance (S(p( 1, 0,  0), p(  0,  0,  0)), L(p(  1,    3, 3), p(   0,  0, 3)), 9);
+    check_squared_distance (S(p(-90, 0,  0), p(-10,  0,  0)), L(p(  0,    0, 3), p(   0,  3, 3)), 109);
+    check_squared_distance (S(p(  0, 0,  0), p(  1,  0,  0)), L(p(  0,    0, 2), p(  -1,  0, 2)), 4);
+  }
+
+  void L_L()
+  {
+    // Note : the values are not verified by hand
+    std::cout << "Line - Line\n";
+    check_squared_distance (L(p(-10, 0,  0), p(-90,  0,  0)), L(p(  0,    0, 3), p(   0,  3, 3)), 9);
+    check_squared_distance (L(p(  1, 0,  0), p(  0,  0,  0)), L(p(  1,    3, 3), p(   0,  0, 3)), 9);
+    check_squared_distance (L(p(  0, 0,  0), p(  1,  0,  0)), L(p(  0,    0, 2), p(  -1,  0, 2)), 4);
+  }
+
+  void P_Pl()
+  {
+    std::cout << "Point - Plane\n";
+    check_squared_distance (p(2, 5,  3), Pl(0, 1, 0, 0), 25);
+  }
+
+  void S_Pl()
+  {
+    std::cout << "Segment - Plane\n";
+    check_squared_distance (S(p(2, -3,  3), p( 3,-7, 4)), pl(0, 1, 0, 0), 9);
+  }
+
+  void R_Pl()
+  {
+    std::cout << "Ray - Plane\n";
+    check_squared_distance (R(p(2, -4,  3), p( 3,-4, 4)), Pl(0, 1, 0, 0), 16);
+    check_squared_distance (R(p(2, -4,  3), p( 3, 4, 4)), Pl(0, 1, 0, 0), 0);
+    check_squared_distance (R(p(2, -4,  3), p( 3,-8, 4)), Pl(0, 1, 0, 0), 16);
+  }
+
+  void L_Pl()
+  {
+    std::cout << "Line - Plane\n";
+    check_squared_distance (L(p(2, -4,  3), p( 3,-4, 4)), Pl(0, 1, 0, 0), 16);
+    check_squared_distance (L(p(2, -4,  3), p( 3, 4, 4)), Pl(0, 1, 0, 0), 0);
+    check_squared_distance (L(p(2, -4,  3), p( 3,-8, 4)), Pl(0, 1, 0, 0), 0);
+  }
+
+  void run()
+  {
+    std::cout << "3D Distance tests\n";
+    P_P();
+    P_S();
+    S_S();
+    P_R();
+    R_R();
+    S_R();
+    R_L();
+    P_L();
+    S_L();
+    L_L();
+    P_Pl();
+    S_Pl();
+    R_Pl();
+    L_Pl();
+  }
+
+};
+
+int main()
+{
+	Test< CGAL::Cartesian<double>   >().run();
+	Test< CGAL::Homogeneous<double> >().run();
+	// TODO : test more kernels.
+}
diff --git a/Distance_3/test/Distance_3/tst321.cpp b/Distance_3/test/Distance_3/tst321.cpp
deleted file mode 100644
index 03629c07345..00000000000
--- a/Distance_3/test/Distance_3/tst321.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/squared_distance_3_1.h>
-
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Segment_3< TestR > segment_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    TestR::FT d;
-    cin >> x1 >> y1 >> z1;
-    if (!cin)
-	return 1;
-    w1 = ri.next();
-    point_t pt(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    segment_t seg(tp1,tp2);
-    d = CGAL::squared_distance(pt, seg);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst322.cpp b/Distance_3/test/Distance_3/tst322.cpp
deleted file mode 100644
index bc6d3123f3c..00000000000
--- a/Distance_3/test/Distance_3/tst322.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "numrep1.h"
-/*
- * Squared distance between two segments.
- */
-#include <CGAL/Point_3.h>
-#include <CGAL/squared_distance_3.h>
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Segment_3< TestR > segment_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    TestR::FT d;
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    segment_t seg1(tp1,tp2);
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    segment_t seg2(tp3,tp4);
-    d = CGAL::squared_distance(seg1, seg2);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst323.cpp b/Distance_3/test/Distance_3/tst323.cpp
deleted file mode 100644
index 6401e328cf8..00000000000
--- a/Distance_3/test/Distance_3/tst323.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/Ray_3.h>
-#include <CGAL/squared_distance_3.h>
-
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Ray_3< TestR > ray_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    TestR::FT d;
-    cin >> x1 >> y1 >> z1;
-    if (!cin)
-	return 1;
-    w1 = ri.next();
-    point_t pt(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    ray_t ray(tp1, tp2);
-    d = CGAL::squared_distance(pt, ray);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst324.cpp b/Distance_3/test/Distance_3/tst324.cpp
deleted file mode 100644
index be10296af95..00000000000
--- a/Distance_3/test/Distance_3/tst324.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/Ray_3.h>
-#include <CGAL/squared_distance_3_1.h>
-
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Ray_3< TestR > ray_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    TestR::FT d;
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    ray_t ray1(tp1, tp2);
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    ray_t ray2(tp3, tp4);
-    d = CGAL::squared_distance(ray1, ray2);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
- 
diff --git a/Distance_3/test/Distance_3/tst325.cpp b/Distance_3/test/Distance_3/tst325.cpp
deleted file mode 100644
index 7c21af5999f..00000000000
--- a/Distance_3/test/Distance_3/tst325.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "numrep1.h"
-/*
- * Squared distance between two segments.
- */
-#include <CGAL/Point_3.h>
-#include <CGAL/Ray_3.h>
-#include <CGAL/squared_distance_3.h>
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Segment_3< TestR > segment_t;
-typedef CGAL::Ray_3< TestR > ray_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    TestR::FT d;
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    segment_t seg(tp1, tp2);
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    ray_t ray(tp3, tp4);
-    d = CGAL::squared_distance(seg, ray);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst326.cpp b/Distance_3/test/Distance_3/tst326.cpp
deleted file mode 100644
index 82d369ccdff..00000000000
--- a/Distance_3/test/Distance_3/tst326.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/Line_3.h>
-#include <CGAL/Ray_3.h>
-#include <CGAL/squared_distance_3_1.h>
-
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Line_3< TestR > line_t;
-typedef CGAL::Ray_3< TestR > ray_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    TestR::FT d;
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    ray_t ray(tp1, tp2);
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    line_t line(tp3, tp4);
-    d = CGAL::squared_distance(ray, line);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst327.cpp b/Distance_3/test/Distance_3/tst327.cpp
deleted file mode 100644
index 24d6e557b59..00000000000
--- a/Distance_3/test/Distance_3/tst327.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/Line_3.h>
-#include <CGAL/squared_distance_3_1.h>
-
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Line_3< TestR > line_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    TestR::FT d;
-    cin >> x1 >> y1 >> z1;
-    if (!cin)
-	return 1;
-    w1 = ri.next();
-    point_t pt(to_nt(w1*x1), to_nt(w1*y1), to_nt(w1*z1), to_nt(w1));
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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);
-    d = CGAL::squared_distance(pt, line);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst328.cpp b/Distance_3/test/Distance_3/tst328.cpp
deleted file mode 100644
index e755c8bd55a..00000000000
--- a/Distance_3/test/Distance_3/tst328.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/Line_3.h>
-#include <CGAL/Ray_3.h>
-#include <CGAL/squared_distance_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 > seg_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    TestR::FT d;
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    seg_t seg(tp1, tp2);
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    line_t line(tp3, tp4);
-    d = CGAL::squared_distance(seg, line);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst329.cpp b/Distance_3/test/Distance_3/tst329.cpp
deleted file mode 100644
index 80b5753a5a3..00000000000
--- a/Distance_3/test/Distance_3/tst329.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/Line_3.h>
-#include <CGAL/squared_distance_3_1.h>
-
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Line_3< TestR > line_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x1, x2, y1, y2, z1, z2, w1, w2;
-    TestR::FT d;
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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 line1(tp1, tp2);
-    cin >> x1 >> y1 >> z1 >> x2 >> y2 >> z2;
-    if (!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));
-    line_t line2(tp1, tp2);
-    d = CGAL::squared_distance(line1, line2);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst330.cpp b/Distance_3/test/Distance_3/tst330.cpp
deleted file mode 100644
index 969f5184950..00000000000
--- a/Distance_3/test/Distance_3/tst330.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/Plane_3.h>
-#include <CGAL/squared_distance_3_2.h>
-
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Plane_3< TestR > plane_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x, y, z, w, w1;
-    TestR::FT d;
-    cin >> x >> y >> z;
-    if (!cin)
-	return 1;
-    w1 = ri.next();
-    point_t pt(to_nt(w1*x), to_nt(w1*y), to_nt(w1*z), to_nt(w1));
-    cin >> x >> y >> z >> w;
-    if (!cin)
-	return 1;
-    plane_t plane(to_nt(x), to_nt(y), to_nt(z), to_nt(w));
-    d = CGAL::squared_distance(pt, plane);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst331.cpp b/Distance_3/test/Distance_3/tst331.cpp
deleted file mode 100644
index 30388b9652e..00000000000
--- a/Distance_3/test/Distance_3/tst331.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/Segment_3.h>
-#include <CGAL/Plane_3.h>
-#include <CGAL/squared_distance_3_2.h>
-
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Segment_3< TestR > seg_t;
-typedef CGAL::Plane_3< TestR > plane_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x, y, z, w, w1;
-    TestR::FT d;
-    cin >> x >> y >> z;
-    if (!cin)
-	return 1;
-    w1 = ri.next();
-    point_t pt1(to_nt(w1*x), to_nt(w1*y), to_nt(w1*z), to_nt(w1));
-    cin >> x >> y >> z;
-    if (!cin)
-	return 1;
-    w1 = ri.next();
-    point_t pt2(to_nt(w1*x), to_nt(w1*y), to_nt(w1*z), to_nt(w1));
-    cin >> x >> y >> z >> w;
-    if (!cin)
-	return 1;
-    plane_t plane(to_nt(x), to_nt(y), to_nt(z), to_nt(w));
-    d = CGAL::squared_distance(seg_t(pt1, pt2), plane);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst332.cpp b/Distance_3/test/Distance_3/tst332.cpp
deleted file mode 100644
index e42a2bdd7d6..00000000000
--- a/Distance_3/test/Distance_3/tst332.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/Ray_3.h>
-#include <CGAL/Plane_3.h>
-#include <CGAL/squared_distance_3_2.h>
-
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Ray_3< TestR > ray_t;
-typedef CGAL::Plane_3< TestR > plane_t;
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x, y, z, w1, w;
-    TestR::FT d;
-    cin >> x >> y >> z;
-    if (!cin)
-	return 1;
-    w1 = ri.next();
-    point_t pt1(to_nt(w1*x), to_nt(w1*y), to_nt(w1*z), to_nt(w1));
-    cin >> x >> y >> z;
-    if (!cin)
-	return 1;
-    w1 = ri.next();
-    point_t pt2(to_nt(w1*x), to_nt(w1*y), to_nt(w1*z), to_nt(w1));
-    cin >> x >> y >> z >> w;
-    if (!cin)
-	return 1;
-    plane_t plane(to_nt(x), to_nt(y), to_nt(z), to_nt(w));
-    d = CGAL::squared_distance(ray_t(pt1, pt2), plane);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}
diff --git a/Distance_3/test/Distance_3/tst333.cpp b/Distance_3/test/Distance_3/tst333.cpp
deleted file mode 100644
index 7257d769057..00000000000
--- a/Distance_3/test/Distance_3/tst333.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "numrep1.h"
-#include <CGAL/Point_3.h>
-#include <CGAL/Line_3.h>
-#include <CGAL/Plane_3.h>
-#include <CGAL/squared_distance_3_2.h>
-
-#include "numrep2.h"
-
-typedef CGAL::Point_3< TestR > point_t;
-typedef CGAL::Line_3< TestR > line_t;
-typedef CGAL::Plane_3< TestR > plane_t;
-
-
-using std::cin;
-using std::cout;
-
-int main()
-{
-    randomint ri;
-    int x, y, z, w1, w;
-    TestR::FT d;
-    cin >> x >> y >> z;
-    if (!cin)
-	return 1;
-    w1 = ri.next();
-    point_t pt1(to_nt(w1*x), to_nt(w1*y), to_nt(w1*z), to_nt(w1));
-    cin >> x >> y >> z;
-    if (!cin)
-	return 1;
-    w1 = ri.next();
-    point_t pt2(to_nt(w1*x), to_nt(w1*y), to_nt(w1*z), to_nt(w1));
-    cin >> x >> y >> z >> w;
-    if (!cin)
-	return 1;
-    plane_t plane(to_nt(x), to_nt(y), to_nt(z), to_nt(w));
-    d = CGAL::squared_distance(line_t(pt1, pt2), plane);
-    cout << CGAL::to_double(d) << '\n';
-    return 0;
-}