diff --git a/src/DrawResources/CheckCommands.tcl b/src/DrawResources/CheckCommands.tcl
index 25bab92d7d..6e032a9f32 100644
--- a/src/DrawResources/CheckCommands.tcl
+++ b/src/DrawResources/CheckCommands.tcl
@@ -710,7 +710,7 @@ proc checklength {shape args} {
 
     if { ${compared_notequal_shape} != -1 } {
         upvar ${compared_notequal_shape} ${compared_notequal_shape}
-        regexp regexp "The +length+ ${compared_notequal_shape} +is +(\[-0-9.+eE\]+)" [${CommandName} ${compared_notequal_shape} ${epsilon}] full compared_m
+        regexp "The +length+ ${compared_notequal_shape} +is +(\[-0-9.+eE\]+)" [${CommandName} ${compared_notequal_shape} ${epsilon}] full compared_m
         if { $compared_m == $m } {
             puts "Error: length of shape ${compared_notequal_shape} is equal shape to ${shape}"
         }
diff --git a/tests/geometry/2dbeziecurve/A1 b/tests/geometry/2dbeziecurve/A1
index b1cee8fc9a..3190e22f7b 100644
--- a/tests/geometry/2dbeziecurve/A1
+++ b/tests/geometry/2dbeziecurve/A1
@@ -1,4 +1,4 @@
 2dbeziercurve result  8  0 0 0 1 -2 1 -2 -3 4 -3 4 5 -6 5 -6 -4
 reverse result
-set length 14.909963698913941
+checklength result -l 14.909963698913941
 
diff --git a/tests/geometry/2dbeziecurve/A2 b/tests/geometry/2dbeziecurve/A2
index 1e9286ea46..21a06f709c 100644
--- a/tests/geometry/2dbeziecurve/A2
+++ b/tests/geometry/2dbeziecurve/A2
@@ -1,4 +1,4 @@
 2dbeziercurve result  3  -2 0  0 -3  2 0
 insertpole result 2 1 6 1
-set length 7.1843642663784797
+checklength result -l 7.1843642663784797
 
diff --git a/tests/geometry/2dbeziecurve/A3 b/tests/geometry/2dbeziecurve/A3
index 31e04578f4..c7069992bf 100644
--- a/tests/geometry/2dbeziecurve/A3
+++ b/tests/geometry/2dbeziecurve/A3
@@ -2,5 +2,5 @@
 trim b2 b1 0 0.2
 trim b3 b1 0.3 0.5
 trim result b1 0.6 0.8
-set length 3.3427826104791247
+checklength result -l 3.3427826104791247
 
diff --git a/tests/geometry/2dbeziecurve/A4 b/tests/geometry/2dbeziecurve/A4
index 4547e3ef35..88d5a62c8d 100644
--- a/tests/geometry/2dbeziecurve/A4
+++ b/tests/geometry/2dbeziecurve/A4
@@ -1,4 +1,4 @@
 2dbeziercurve result  8  0 0 0 1 -2 1 -2 -3 4 -3 4 5 -6 5 -6 -4
 2dlmirror result 0 0 0 1
-set length 14.909963698913938
+checklength result -l 14.909963698913938
 
diff --git a/tests/geometry/2dbeziecurve/A5 b/tests/geometry/2dbeziecurve/A5
index 44f59c968c..6cebac81c6 100644
--- a/tests/geometry/2dbeziecurve/A5
+++ b/tests/geometry/2dbeziecurve/A5
@@ -1,4 +1,4 @@
 2dbeziercurve result  8  0 0 0 1 -2 1 -2 -3 4 -3 4 5 -6 5 -6 -4
 2dpmirror result 0 0
-set length 14.909963698913938
+checklength result -l 14.909963698913938
 
diff --git a/tests/geometry/2dbeziecurve/A6 b/tests/geometry/2dbeziecurve/A6
index f3fe908f8d..cecdc219b5 100644
--- a/tests/geometry/2dbeziecurve/A6
+++ b/tests/geometry/2dbeziecurve/A6
@@ -1,4 +1,4 @@
 2dbeziercurve result  8  0 0 0 1 -2 1 -2 -3 4 -3 4 5 -6 5 -6 -4
 repeat 20 { 2dpscale result 0 0 0 1.1; copy result . }
-set length 100.30678002889022
+checklength result -l 100.30678002889022
 
diff --git a/tests/geometry/2dbeziecurve/A7 b/tests/geometry/2dbeziecurve/A7
index 912517f0b8..e628e1fdcd 100644
--- a/tests/geometry/2dbeziecurve/A7
+++ b/tests/geometry/2dbeziecurve/A7
@@ -1,4 +1,4 @@
 2dbeziercurve result  8  0 0 0 1 -2 1 -2 -3 4 -3 4 5 -6 5 -6 -4
 2drotate result 0 0 90
-set length 14.909963698913938
+checklength result -l 14.909963698913938
 
diff --git a/tests/geometry/2dbeziecurve/A8 b/tests/geometry/2dbeziecurve/A8
index d15583d07d..f04d50744e 100644
--- a/tests/geometry/2dbeziecurve/A8
+++ b/tests/geometry/2dbeziecurve/A8
@@ -1,3 +1,3 @@
 2dbeziercurve result  3  2 0 4 1 6 0
-set length 4.1609152777389031
+checklength result -l 4.1609152777389031
 
diff --git a/tests/geometry/2dbeziecurve/A9 b/tests/geometry/2dbeziecurve/A9
index fe946cf32f..f6949f8ad4 100644
--- a/tests/geometry/2dbeziecurve/A9
+++ b/tests/geometry/2dbeziecurve/A9
@@ -1,3 +1,3 @@
 2dbeziercurve result  8  0 0 0 1 -2 1 -2 -3 4 -3 4 5 -6 5 -6 -4
-set length 14.909963698913938
+checklength result -l 14.909963698913938
 
diff --git a/tests/geometry/2dbeziecurve/B1 b/tests/geometry/2dbeziecurve/B1
index 2d85d1bcdc..e15537f211 100644
--- a/tests/geometry/2dbeziecurve/B1
+++ b/tests/geometry/2dbeziecurve/B1
@@ -42,5 +42,5 @@ repeat 10 {comparepnt2d rd1_$i d1_$i  $tol; incr i 1}
 set i 1
 puts " --> Test D2"
 repeat 10 {comparepnt2d rd2_$i d2_$i $tol; incr i 1}
-set length 14.909963698913938
+checklength result -l 14.909963698913938
 
diff --git a/tests/geometry/2dbeziecurve/begin b/tests/geometry/2dbeziecurve/begin
index d10da1fde9..2fecf221ef 100644
--- a/tests/geometry/2dbeziecurve/begin
+++ b/tests/geometry/2dbeziecurve/begin
@@ -1,2 +1 @@
-set viewer "v2d"
-set type "finite"
+set viewer "v2d"
\ No newline at end of file
diff --git a/tests/geometry/2dbsplinecurve/A1 b/tests/geometry/2dbsplinecurve/A1
index db8a6cf244..df9cc1e24f 100644
--- a/tests/geometry/2dbsplinecurve/A1
+++ b/tests/geometry/2dbsplinecurve/A1
@@ -1,3 +1,3 @@
 2dbsplinecurve result  3 8 0. 4 0.13 1 0.28 1 0.47 1  0.62 1  0.75 1 0.89 1  1. 4  -19.5 -4.2 1 -18.9 -4.7 1  -17.3 5.0 1  -8.7 10.9  1  -0.018 1.27  1 0.38 -8.0  1 3.4 -16.3 1  11.0 -20.45 1  17.33 -15.42 1  17.7 -15 1
-set length 61.864387478917727
+checklength result -l 61.864387478917727
 
diff --git a/tests/geometry/2dbsplinecurve/A2 b/tests/geometry/2dbsplinecurve/A2
index 1692ff1bb6..dc2817e57c 100644
--- a/tests/geometry/2dbsplinecurve/A2
+++ b/tests/geometry/2dbsplinecurve/A2
@@ -1,4 +1,4 @@
 2dbsplinecurve result 4 2 0 5 1 5 -0.5 -0.5 1 -0.25 0.5 1 0. -0.5 1  0.25 -0.5 1 0.5 -0.5  1
 incdeg result 8
-set length 1.4087044221398224
+checklength result -l 1.4087044221398224
 
diff --git a/tests/geometry/2dbsplinecurve/A3 b/tests/geometry/2dbsplinecurve/A3
index 275409d745..346a7eb92a 100644
--- a/tests/geometry/2dbsplinecurve/A3
+++ b/tests/geometry/2dbsplinecurve/A3
@@ -1,5 +1,5 @@
 2dbsplinecurve result 4 2 0 5 1 5 -0.5 -0.5 1 -0.25 0.5 1 0. -0.5 1  0.25 -0.5 1 0.5 -0.5  1
 insertknot result 0.5 1
 remknot result 2 0 0.01
-set length 1.4087044221396998
+checklength result -l 1.4087044221396998
 
diff --git a/tests/geometry/2dbsplinecurve/A4 b/tests/geometry/2dbsplinecurve/A4
index cde2bc77fc..64ceee8f17 100644
--- a/tests/geometry/2dbsplinecurve/A4
+++ b/tests/geometry/2dbsplinecurve/A4
@@ -1,4 +1,4 @@
 2dbsplinecurve result  3 8 0. 4 0.13 1 0.28 1 0.47 1  0.62 1  0.75 1 0.89 1  1. 4  -19.5 -4.2 1 -18.9 -4.7 1  -17.3 5.0 1  -8.7 10.9  1  -0.018 1.27  1 0.38 -8.0  1 3.4 -16.3 1  11.0 -20.45 1  17.33 -15.42 1  17.7 -15 1
 reverse result
-set length 61.864387478917735
+checklength result -l 61.864387478917735
 
diff --git a/tests/geometry/2dbsplinecurve/A5 b/tests/geometry/2dbsplinecurve/A5
index e7e2f48078..0d12ae6fa4 100644
--- a/tests/geometry/2dbsplinecurve/A5
+++ b/tests/geometry/2dbsplinecurve/A5
@@ -1,4 +1,4 @@
 2dbsplinecurve result  3 8 0. 4 0.13 1 0.28 1 0.47 1  0.62 1  0.75 1 0.89 1  1. 4  -19.5 -4.2 1 -18.9 -4.7 1  -17.3 5.0 1  -8.7 10.9  1  -0.018 1.27  1 0.38 -8.0  1 3.4 -16.3 1  11.0 -20.45 1  17.33 -15.42 1  17.7 -15 1
 insertknot result 0.3 2
-set length 61.864387478971629
+checklength result -l 61.864387478971629
 
diff --git a/tests/geometry/2dbsplinecurve/A6 b/tests/geometry/2dbsplinecurve/A6
index ccd13688af..a62476abde 100644
--- a/tests/geometry/2dbsplinecurve/A6
+++ b/tests/geometry/2dbsplinecurve/A6
@@ -5,5 +5,5 @@ set i 1
 repeat 100 {cmovepoint result 0.3 0. 0.05; incr i 1; repaint}
 set i 1
 repeat 100 {cmovepoint result 0.3 0. -0.05; incr i 1; repaint}
-set length 2.9999999999999996
+checklength result -l 2.9999999999999996
 
diff --git a/tests/geometry/2dbsplinecurve/A7 b/tests/geometry/2dbsplinecurve/A7
index a83dce3825..fb69642596 100644
--- a/tests/geometry/2dbsplinecurve/A7
+++ b/tests/geometry/2dbsplinecurve/A7
@@ -5,5 +5,5 @@ set i 1
 repeat 100 {cmovepoint result 0 0. 0.05; incr i 1;repaint}
 set i 1
 repeat 100 {cmovepoint result 0 0. -0.05; incr i 1;repaint}
-set length 3.0000000000000004
+checklength result -l 3.0000000000000004
 
diff --git a/tests/geometry/2dbsplinecurve/A8 b/tests/geometry/2dbsplinecurve/A8
index 4dd1e60b8d..1a54c256f5 100644
--- a/tests/geometry/2dbsplinecurve/A8
+++ b/tests/geometry/2dbsplinecurve/A8
@@ -2,10 +2,11 @@
 2dcvalue b1 2.0 x y  dx dy 
 set delta 0.01
 set yvalue [dval y] 
-repeat 100  {
-	cmovetangent b1 2.0  x $yvalue  dx dy  1
-        set yvalue [expr $yvalue + $delta ]
-        repaint }
+repeat 100 {
+    cmovetangent b1 2.0  x $yvalue  dx dy  1
+    set yvalue [expr $yvalue + $delta ]
+    repaint
+}
 copy b1 result
-set length 7.7885445456401925
+checklength result -l 7.7885445456401925
 
diff --git a/tests/geometry/2dbsplinecurve/A9 b/tests/geometry/2dbsplinecurve/A9
index 451d3576bc..4719a73cee 100644
--- a/tests/geometry/2dbsplinecurve/A9
+++ b/tests/geometry/2dbsplinecurve/A9
@@ -2,10 +2,10 @@
 2dcvalue b1 2.0 x y  dx dy 
 set delta 0.01
 set yvalue [dval y] 
-repeat 100  {
-	cmovetangent b1 2.0  x $yvalue  dx dy  1
-        set yvalue [expr $yvalue + $delta ]
-        repaint }
+repeat 100 {
+    cmovetangent b1 2.0  x $yvalue  dx dy  1
+    set yvalue [expr $yvalue + $delta ]
+    repaint
+}
 copy b1 result
-set length 6.9832866524628034
-
+checklength result -l 6.9832866524628034
\ No newline at end of file
diff --git a/tests/geometry/2dbsplinecurve/B1 b/tests/geometry/2dbsplinecurve/B1
index def31fa88b..8a5322474c 100644
--- a/tests/geometry/2dbsplinecurve/B1
+++ b/tests/geometry/2dbsplinecurve/B1
@@ -3,10 +3,10 @@
 set delta 0.005
 point p1 x y 
 set dyvalue [dval dy] 
-repeat 100  {
-	cmovetangent b1 2.0  x y dx $dyvalue 1
-        set dyvalue [expr $dyvalue + $delta ]
-        repaint }
+repeat 100 {
+    cmovetangent b1 2.0  x y dx $dyvalue 1
+    set dyvalue [expr $dyvalue + $delta ]
+    repaint
+}
 copy b1 result
-set length 5.9590472422107315
-
+checklength result -l 5.9590472422107315
\ No newline at end of file
diff --git a/tests/geometry/2dbsplinecurve/B2 b/tests/geometry/2dbsplinecurve/B2
index 6bc8ec7e2b..3e4be10e83 100644
--- a/tests/geometry/2dbsplinecurve/B2
+++ b/tests/geometry/2dbsplinecurve/B2
@@ -3,10 +3,10 @@
 set delta 0.01
 point p1 x y 
 set dyvalue [dval dy] 
-repeat 100  {
-	cmovetangent b1 2.0  x y dx $dyvalue 1
-        set dyvalue [expr $dyvalue + $delta ]
-        repaint }
+repeat 100 {
+    cmovetangent b1 2.0  x y dx $dyvalue 1
+    set dyvalue [expr $dyvalue + $delta ]
+    repaint
+}
 copy b1 result
-set length 6.6492776719511806
-
+checklength result -l 6.6492776719511806
\ No newline at end of file
diff --git a/tests/geometry/2dbsplinecurve/B3 b/tests/geometry/2dbsplinecurve/B3
index 11abbbc170..451546b433 100644
--- a/tests/geometry/2dbsplinecurve/B3
+++ b/tests/geometry/2dbsplinecurve/B3
@@ -1,4 +1,4 @@
 2dbsplinecurve result  3 8 0. 4 0.13 1 0.28 1 0.47 1  0.62 1  0.75 1 0.89 1  1. 4  -19.5 -4.2 1 -18.9 -4.7 1  -17.3 5.0 1  -8.7 10.9  1  -0.018 1.27  1 0.38 -8.0  1 3.4 -16.3 1  11.0 -20.45 1  17.33 -15.42 1  17.7 -15 1
 2dlmirror result 0 0 0 1
-set length 61.864387478917727
+checklength result -l 61.864387478917727
 
diff --git a/tests/geometry/2dbsplinecurve/B4 b/tests/geometry/2dbsplinecurve/B4
index 18985a7ba4..9007837b8e 100644
--- a/tests/geometry/2dbsplinecurve/B4
+++ b/tests/geometry/2dbsplinecurve/B4
@@ -1,4 +1,4 @@
 2dbsplinecurve result 3 8 0. 4 0.13 1 0.28 1 0.47 1  0.62 1  0.75 1 0.89 1  1. 4  -19.5 -4.2 1 -18.9 -4.7 1  -17.3 5.0 1  -8.7 10.9  1  -0.018 1.27  1 0.38 -8.0  1 3.4 -16.3 1  11.0 -20.45 1  17.33 -15.42 1  17.7 -15 1
 2dpmirror result 0 0 
-set length 61.864387478917727
+checklength result -l 61.864387478917727
 
diff --git a/tests/geometry/2dbsplinecurve/B5 b/tests/geometry/2dbsplinecurve/B5
index 1247eb5286..531cb48fe5 100644
--- a/tests/geometry/2dbsplinecurve/B5
+++ b/tests/geometry/2dbsplinecurve/B5
@@ -1,4 +1,4 @@
 2dbsplinecurve result  3 8 0. 4 0.13 1 0.28 1 0.47 1  0.62 1  0.75 1 0.89 1  1. 4  -19.5 -4.2 1 -18.9 -4.7 1  -17.3 5.0 1  -8.7 10.9  1  -0.018 1.27  1 0.38 -8.0  1 3.4 -16.3 1  11.0 -20.45 1  17.33 -15.42 1  17.7 -15 1
 2drotate result 0 0 90
-set length 61.864387478917727
+checklength result -l 61.864387478917727
 
diff --git a/tests/geometry/2dbsplinecurve/B6 b/tests/geometry/2dbsplinecurve/B6
index ac34791166..d1ec35fb6e 100644
--- a/tests/geometry/2dbsplinecurve/B6
+++ b/tests/geometry/2dbsplinecurve/B6
@@ -1,4 +1,4 @@
 2dbsplinecurve result  3 8 0. 4 0.13 1 0.28 1 0.47 1  0.62 1  0.75 1 0.89 1  1. 4  -19.5 -4.2 1 -18.9 -4.7 1  -17.3 5.0 1  -8.7 10.9  1  -0.018 1.27  1 0.38 -8.0  1 3.4 -16.3 1  11.0 -20.45 1  17.33 -15.42 1  17.7 -15 1
 2dtranslate result 0 0 9
-set length 61.864387478917727
+checklength result -l 61.864387478917727
 
diff --git a/tests/geometry/2dbsplinecurve/B7 b/tests/geometry/2dbsplinecurve/B7
index 65f4086024..4ede5c3ee1 100644
--- a/tests/geometry/2dbsplinecurve/B7
+++ b/tests/geometry/2dbsplinecurve/B7
@@ -42,5 +42,5 @@ repeat 10 {comparepnt2d rd1_$i d1_$i  $tol; incr i 1}
 set i 1
 puts " --> Test D2"
 repeat 10 {comparepnt2d rd2_$i d2_$i $tol; incr i 1}
-set length 61.864387478917727
+checklength result -l 61.864387478917727
 
diff --git a/tests/geometry/2dbsplinecurve/begin b/tests/geometry/2dbsplinecurve/begin
index d10da1fde9..2fecf221ef 100644
--- a/tests/geometry/2dbsplinecurve/begin
+++ b/tests/geometry/2dbsplinecurve/begin
@@ -1,2 +1 @@
-set viewer "v2d"
-set type "finite"
+set viewer "v2d"
\ No newline at end of file
diff --git a/tests/geometry/beziecurve/A1 b/tests/geometry/beziecurve/A1
index 48399c9459..ae9d57f858 100644
--- a/tests/geometry/beziecurve/A1
+++ b/tests/geometry/beziecurve/A1
@@ -1,5 +1,5 @@
 beziercurve result  3  -2 0 1 0 1 2 2 0 1
 insertpole result 2  1 2 4
 repeat 4 {pd}
-set length 5.8766403018804851
+checklength result -l 5.8766403018804851
 
diff --git a/tests/geometry/beziecurve/A2 b/tests/geometry/beziecurve/A2
index 3799a3a133..eb039219f4 100644
--- a/tests/geometry/beziecurve/A2
+++ b/tests/geometry/beziecurve/A2
@@ -1,4 +1,4 @@
 beziercurve result  8  0 0 1 0 1 2 -2 1 3 -2 -3 4 4 -3 5 4 5 6 -6 5 7 -6 -4 8
 pscale result 0 0 0 1.2
-set length 20.717921417769418
+checklength result -l 20.717921417769418
 
diff --git a/tests/geometry/beziecurve/A3 b/tests/geometry/beziecurve/A3
index cff96e6d40..5c0cd1b498 100644
--- a/tests/geometry/beziecurve/A3
+++ b/tests/geometry/beziecurve/A3
@@ -1,4 +1,4 @@
 beziercurve result  3  0 0 1  4 1 2  6 0 1
 smirror result 0 0 0 1 0 0
-set length 6.2279447493965332
+checklength result -l 6.2279447493965332
 
diff --git a/tests/geometry/beziecurve/A4 b/tests/geometry/beziecurve/A4
index e50abab594..6428768cfd 100644
--- a/tests/geometry/beziecurve/A4
+++ b/tests/geometry/beziecurve/A4
@@ -1,4 +1,4 @@
 beziercurve result  8  0 0 1 0 1 2 -2 1 3 -2 -3 4 4 -3 5 4 5 6 -6 5 7 -6 -4 8
 translate result 4 0 0
-set length 17.264934514807834
+checklength result -l 17.264934514807834
 
diff --git a/tests/geometry/beziecurve/A5 b/tests/geometry/beziecurve/A5
index 2c8aec115d..5c0c039cc1 100644
--- a/tests/geometry/beziecurve/A5
+++ b/tests/geometry/beziecurve/A5
@@ -1,4 +1,4 @@
 beziercurve result  8  0 0 1 0 1 2 -2 1 3 -2 -3 4 4 -3 5 4 5 6 -6 5 7 -6 -4 8
 lmirror result 0 0 0 1 0 0
-set length 17.264934514807834
+checklength result -l 17.264934514807834
 
diff --git a/tests/geometry/beziecurve/A6 b/tests/geometry/beziecurve/A6
index b46ed35b1e..8c1fea346a 100644
--- a/tests/geometry/beziecurve/A6
+++ b/tests/geometry/beziecurve/A6
@@ -1,4 +1,4 @@
 beziercurve result  8  0 0 1 0 1 2 -2 1 3 -2 -3 4 4 -3 5 4 5 6 -6 5 7 -6 -4 8
 pmirror result 0 0 0 
-set length 17.264934514807834
+checklength result -l 17.264934514807834
 
diff --git a/tests/geometry/beziecurve/A7 b/tests/geometry/beziecurve/A7
index 98c448bb3f..6b0bf1aeb9 100644
--- a/tests/geometry/beziecurve/A7
+++ b/tests/geometry/beziecurve/A7
@@ -2,8 +2,8 @@ beziercurve b1  8  0 0 1 0 1 2 -2 1 3 -2 -3 4 4 -3 5 4 5 6 -6 5 7 -6 -4 8
 translate b1 0 0 -3
 copy b1 result
 repeat 10 {
-  rotate result 0 0 0 0 0 1 30
-  copy result .
+    rotate result 0 0 0 0 0 1 30
+    copy result .
 }
-set length 17.264934514807859
+checklength result -l 17.264934514807859
 
diff --git a/tests/geometry/beziecurve/A8 b/tests/geometry/beziecurve/A8
index d2beed7503..b06282269f 100644
--- a/tests/geometry/beziecurve/A8
+++ b/tests/geometry/beziecurve/A8
@@ -1,4 +1,4 @@
 beziercurve result 8  0 0 1 0 1 2 -2 1 3 -2 -3 4 4 -3 5 4 5 6 -6 5 7 -6 -4 8
 pscale result 0 0 0 1.2
-set length 20.717921417769418
+checklength result -l 20.717921417769418
 
diff --git a/tests/geometry/beziecurve/A9 b/tests/geometry/beziecurve/A9
index cff96e6d40..5c0cd1b498 100644
--- a/tests/geometry/beziecurve/A9
+++ b/tests/geometry/beziecurve/A9
@@ -1,4 +1,4 @@
 beziercurve result  3  0 0 1  4 1 2  6 0 1
 smirror result 0 0 0 1 0 0
-set length 6.2279447493965332
+checklength result -l 6.2279447493965332
 
diff --git a/tests/geometry/beziecurve/B1 b/tests/geometry/beziecurve/B1
index e50abab594..6428768cfd 100644
--- a/tests/geometry/beziecurve/B1
+++ b/tests/geometry/beziecurve/B1
@@ -1,4 +1,4 @@
 beziercurve result  8  0 0 1 0 1 2 -2 1 3 -2 -3 4 4 -3 5 4 5 6 -6 5 7 -6 -4 8
 translate result 4 0 0
-set length 17.264934514807834
+checklength result -l 17.264934514807834
 
diff --git a/tests/geometry/beziecurve/B2 b/tests/geometry/beziecurve/B2
index ee73d23fc0..d4fae786e3 100644
--- a/tests/geometry/beziecurve/B2
+++ b/tests/geometry/beziecurve/B2
@@ -1,3 +1,3 @@
 beziercurve result  3  2 0 1 4 1 2 6 0 1
-set length 4.3119494616416141
+checklength result -l 4.3119494616416141
 
diff --git a/tests/geometry/beziecurve/B3 b/tests/geometry/beziecurve/B3
index 29e259ab3b..61a6893195 100644
--- a/tests/geometry/beziecurve/B3
+++ b/tests/geometry/beziecurve/B3
@@ -1,3 +1,3 @@
 beziercurve result  8  0 0 1 0 1 2 -2 1 3 -2 -3 4 4 -3 5 4 5 6 -6 5 7 -6 -4 8
-set length 17.264934514807834
+checklength result -l 17.264934514807834
 
diff --git a/tests/geometry/beziecurve/B4 b/tests/geometry/beziecurve/B4
index 7bcea21b10..c976c210e7 100644
--- a/tests/geometry/beziecurve/B4
+++ b/tests/geometry/beziecurve/B4
@@ -1,4 +1,4 @@
 beziercurve result  3  2 0 1 4 1 2 6 0 1
 val3d result 0 1 20
-set length 4.3119494616416141
+checklength result -l 4.3119494616416141
 
diff --git a/tests/geometry/beziecurve/B5 b/tests/geometry/beziecurve/B5
index 4bf9dcd718..f1d313f1ee 100644
--- a/tests/geometry/beziecurve/B5
+++ b/tests/geometry/beziecurve/B5
@@ -1,4 +1,4 @@
 beziercurve result  8  0 0 1 0 1 2 -2 1 3 -2 -3 4 4 -3 5 4 5 6 -6 5 7 -6 -4 8
 val3d result 0 1 20
-set length 17.264934514807834
+checklength result -l 17.264934514807834
 
diff --git a/tests/geometry/beziecurve/begin b/tests/geometry/beziecurve/begin
index 0053992f8a..f96443c237 100644
--- a/tests/geometry/beziecurve/begin
+++ b/tests/geometry/beziecurve/begin
@@ -1,2 +1 @@
-set viewer "smallview"
-set type "finite"
+set viewer "smallview"
\ No newline at end of file
diff --git a/tests/geometry/bsplinecurve/A1 b/tests/geometry/bsplinecurve/A1
index ca4690757e..d44fe85518 100644
--- a/tests/geometry/bsplinecurve/A1
+++ b/tests/geometry/bsplinecurve/A1
@@ -6,5 +6,5 @@ repeat 100 {cmovepoint bscurv 0 0. 0.05  0.0  ; incr i 1; repaint}
 set i 1
 repeat 100 {cmovepoint bscurv 0 0. -0.05  0.0 ; incr i 1; repaint}
 renamevar bscurv result
-set length 3.0000000000000004
+checklength result -l 3.0000000000000004
 
diff --git a/tests/geometry/bsplinecurve/A2 b/tests/geometry/bsplinecurve/A2
index 0ab3175962..6b86b68d34 100644
--- a/tests/geometry/bsplinecurve/A2
+++ b/tests/geometry/bsplinecurve/A2
@@ -7,5 +7,5 @@ repeat 100 {cmovepoint bscurv 0.3 0. 0.05 0.0e0 ; incr i 1; repaint}
 set i 1
 repeat 100 {cmovepoint bscurv 0.3 0. -0.05 0.0e0 ; incr i 1;repaint}
 renamevar bscurv result
-set length 2.9999999999999996
+checklength result -l 2.9999999999999996
 
diff --git a/tests/geometry/bsplinecurve/A3 b/tests/geometry/bsplinecurve/A3
index 724fa788c0..f011f62d76 100644
--- a/tests/geometry/bsplinecurve/A3
+++ b/tests/geometry/bsplinecurve/A3
@@ -3,11 +3,12 @@ cvalue b1 2.0 x y z dx dy dz
 set delta 0.01
 set yvalue [dval y] 
 set zvalue [dval z] 
-repeat 100  {
-	cmovetangent b1 2.0  x $yvalue $zvalue dx dy dz 1
-        set yvalue [expr $yvalue + $delta ]
-        set zvalue [expr $zvalue + $delta ]
-        repaint }
+repeat 100 {
+    cmovetangent b1 2.0  x $yvalue $zvalue dx dy dz 1
+    set yvalue [expr $yvalue + $delta ]
+    set zvalue [expr $zvalue + $delta ]
+    repaint
+}
 renamevar b1 result
-set length 8.3346946955628098
+checklength result -l 8.3346946955628098
 
diff --git a/tests/geometry/bsplinecurve/A4 b/tests/geometry/bsplinecurve/A4
index a491ca2e87..4918a8a694 100644
--- a/tests/geometry/bsplinecurve/A4
+++ b/tests/geometry/bsplinecurve/A4
@@ -2,5 +2,5 @@ bsplinecurve b1 3 3 0 4 3 1 4 4  0 0 0 1  1 2 0 1   2 3 0 1  3 2 0 1   1 0 0 1
 copy b1 result
 pscale result 0 0 0 1.4
 repeat 5 {pl}
-set length 9.5487985926002157
+checklength result -l 9.5487985926002157
 
diff --git a/tests/geometry/bsplinecurve/A5 b/tests/geometry/bsplinecurve/A5
index 8bc6c0d4e6..ec46231711 100644
--- a/tests/geometry/bsplinecurve/A5
+++ b/tests/geometry/bsplinecurve/A5
@@ -3,11 +3,12 @@ cvalue b1 2.0 x y z dx dy dz
 set delta 0.01
 set yvalue [dval y] 
 set zvalue [dval z] 
-repeat 100  {
-	cmovetangent b1 2.0  x $yvalue $zvalue dx dy dz 1
-        set yvalue [expr $yvalue + $delta ]
-        set zvalue [expr $zvalue + $delta ]
-        repaint }
+repeat 100 {
+    cmovetangent b1 2.0  x $yvalue $zvalue dx dy dz 1
+    set yvalue [expr $yvalue + $delta ]
+    set zvalue [expr $zvalue + $delta ]
+    repaint
+}
 renamevar b1 result
-set length 7.3508406963557418
+checklength result -l 7.3508406963557418
 
diff --git a/tests/geometry/bsplinecurve/A6 b/tests/geometry/bsplinecurve/A6
index 52a3a0e735..ae1f380247 100644
--- a/tests/geometry/bsplinecurve/A6
+++ b/tests/geometry/bsplinecurve/A6
@@ -5,5 +5,5 @@ pl
 pl
 pl
 pl
-set length 6.6067715112002166
+checklength result -l 6.6067715112002166
 
diff --git a/tests/geometry/bsplinecurve/A7 b/tests/geometry/bsplinecurve/A7
index f6d3a083f3..323fc8e29e 100644
--- a/tests/geometry/bsplinecurve/A7
+++ b/tests/geometry/bsplinecurve/A7
@@ -4,11 +4,12 @@ set delta 0.01
 point p1 x y z
 set dyvalue [dval dy] 
 set dzvalue [dval dz] 
-repeat 100  {
-	cmovetangent b1 2.0  x y z dx $dyvalue $dzvalue 1
-        set dyvalue [expr $dyvalue + $delta ]
-        set dzvalue [expr $dzvalue + $delta ]
-        repaint }
+repeat 100 {
+    cmovetangent b1 2.0  x y z dx $dyvalue $dzvalue 1
+    set dyvalue [expr $dyvalue + $delta ]
+    set dzvalue [expr $dzvalue + $delta ]
+    repaint
+}
 renamevar b1 result
-set length 7.238501337474319
+checklength result -l 7.238501337474319
 
diff --git a/tests/geometry/bsplinecurve/A8 b/tests/geometry/bsplinecurve/A8
index 62b4909d7c..bc1a5e52b6 100644
--- a/tests/geometry/bsplinecurve/A8
+++ b/tests/geometry/bsplinecurve/A8
@@ -1,5 +1,5 @@
 bsplinecurve b1 3 3 0 4 3 1 4 4  0 0 0 1  1 2 0 1   2 3 0 1  3 2 0 1 2   0 0 1
 copy b1 result
 translate result -1 -2 3
-set length 6.3759776321287411
+checklength result -l 6.3759776321287411
 
diff --git a/tests/geometry/bsplinecurve/A9 b/tests/geometry/bsplinecurve/A9
index ec7d0c3db7..fd7059f04d 100644
--- a/tests/geometry/bsplinecurve/A9
+++ b/tests/geometry/bsplinecurve/A9
@@ -4,11 +4,12 @@ set delta 0.01
 point p1 x y z
 set dyvalue [dval dy] 
 set dzvalue [dval dz] 
-repeat 100  {
-	cmovetangent b1 2.0  x y z dx $dyvalue $dzvalue 1
-        set dyvalue [expr $dyvalue + $delta ]
-        set dzvalue [expr $dzvalue + $delta ]
-        repaint }
+repeat 100 {
+    cmovetangent b1 2.0  x y z dx $dyvalue $dzvalue 1
+    set dyvalue [expr $dyvalue + $delta ]
+    set dzvalue [expr $dzvalue + $delta ]
+    repaint
+}
 renamevar b1 result
-set length 7.0867664447042955
+checklength result -l 7.0867664447042955
 
diff --git a/tests/geometry/bsplinecurve/B1 b/tests/geometry/bsplinecurve/B1
index 0f1bf5fc28..55db188c42 100644
--- a/tests/geometry/bsplinecurve/B1
+++ b/tests/geometry/bsplinecurve/B1
@@ -1,4 +1,4 @@
 bsplinecurve result 3 3 0 4 3 1 4 4  0 0 0 1  1 2 0 1   2 3 0 1  3 2 0 1   1 0 0 1
 pmirror result 0 0 0
-set length 6.8205704232858686
+checklength result -l 6.8205704232858686
 
diff --git a/tests/geometry/bsplinecurve/B2 b/tests/geometry/bsplinecurve/B2
index 9f00e3654e..c40adfe345 100644
--- a/tests/geometry/bsplinecurve/B2
+++ b/tests/geometry/bsplinecurve/B2
@@ -5,9 +5,9 @@ pl
 pl
 pl
 repeat 10 {
-rotate b2 0 0 0 1 0 0 10
-copy b2 .
+    rotate b2 0 0 0 1 0 0 10
+    copy b2 .
 }
 renamevar b2 result
-set length 6.8205704232858668
+checklength result -l 6.8205704232858668
 
diff --git a/tests/geometry/bsplinecurve/B3 b/tests/geometry/bsplinecurve/B3
index 81db9bf8a7..33b2103d9d 100644
--- a/tests/geometry/bsplinecurve/B3
+++ b/tests/geometry/bsplinecurve/B3
@@ -3,5 +3,5 @@ copy b1 b2
 pscale b2 0 0 0 1.4
 repeat 5 {pl}
 renamevar b2 result
-set length 9.5487985926002157
+checklength result -l 9.5487985926002157
 
diff --git a/tests/geometry/bsplinecurve/B4 b/tests/geometry/bsplinecurve/B4
index 6bcb502c74..b3448c6008 100644
--- a/tests/geometry/bsplinecurve/B4
+++ b/tests/geometry/bsplinecurve/B4
@@ -6,5 +6,5 @@ pl
 pl
 pl
 renamevar b2 result
-set length 6.6067715112002166
+checklength result -l 6.6067715112002166
 
diff --git a/tests/geometry/bsplinecurve/B5 b/tests/geometry/bsplinecurve/B5
index 77d41e0842..b478d8e2d1 100644
--- a/tests/geometry/bsplinecurve/B5
+++ b/tests/geometry/bsplinecurve/B5
@@ -1,5 +1,5 @@
 bsplinecurve b2 3 3 0 4 3 1 4 4  0 0 0 1  1 2 0 1   2 3 0 1  3 2 0 1 2   0 0 1
 copy b2 result
 translate result -1 -2 3
-set length 6.3759776321287411
+checklength result -l 6.3759776321287411
 
diff --git a/tests/geometry/bsplinecurve/B6 b/tests/geometry/bsplinecurve/B6
index 66e4eb0593..ddd5a15059 100644
--- a/tests/geometry/bsplinecurve/B6
+++ b/tests/geometry/bsplinecurve/B6
@@ -5,5 +5,5 @@ pd
 pl
 pl
 pl
-set length 5.5977288617103262
+checklength result -l 5.5977288617103262
 
diff --git a/tests/geometry/bsplinecurve/B7 b/tests/geometry/bsplinecurve/B7
index 8920bb6d3a..494b43213a 100644
--- a/tests/geometry/bsplinecurve/B7
+++ b/tests/geometry/bsplinecurve/B7
@@ -5,5 +5,5 @@ pd
 pl
 pl
 pl
-set length 6.3759776321287411
+checklength result -l 6.3759776321287411
 
diff --git a/tests/geometry/bsplinecurve/B8 b/tests/geometry/bsplinecurve/B8
index ca84de8a7f..502ba54c37 100644
--- a/tests/geometry/bsplinecurve/B8
+++ b/tests/geometry/bsplinecurve/B8
@@ -1,4 +1,4 @@
 bsplinecurve result 3 3 0 4 3 1 4 4  0 0 0 1  1 2 0 1   2 3 0 1  3 2 0 1   1 0 0 1
 lmirror result 0 0 0 0 1 0
-set length 6.8205704232858686
+checklength result -l 6.8205704232858686
 
diff --git a/tests/geometry/bsplinecurve/B9 b/tests/geometry/bsplinecurve/B9
index 8c58276bed..4c606a1f8e 100644
--- a/tests/geometry/bsplinecurve/B9
+++ b/tests/geometry/bsplinecurve/B9
@@ -1,4 +1,4 @@
 bsplinecurve result 3 3 0 4 3 1 4 4  0 0 0 1  1 2 0 1   2 3 0 1  3 2 0 1   1 0 0 1
 lmirror result 0 0 0 1 0 0
-set length 6.8205704232858686
+checklength result -l 6.8205704232858686
 
diff --git a/tests/geometry/bsplinecurve/C1 b/tests/geometry/bsplinecurve/C1
index 582cb4dc9d..baee7641d1 100644
--- a/tests/geometry/bsplinecurve/C1
+++ b/tests/geometry/bsplinecurve/C1
@@ -1,5 +1,5 @@
 bsplinecurve result 3 3 0 4 3 1 4 4  0 0 0 1  1 2 0 1   2 3 0 1  3 2 0 1   1 0 0 1
 lmirror result 0 0 0 0 1 0
 lmirror result 0 0 0 1 0 0
-set length 6.8205704232858686
+checklength result -l 6.8205704232858686
 
diff --git a/tests/geometry/bsplinecurve/C2 b/tests/geometry/bsplinecurve/C2
index ec1debb58b..a7dada8612 100644
--- a/tests/geometry/bsplinecurve/C2
+++ b/tests/geometry/bsplinecurve/C2
@@ -6,5 +6,5 @@ pl
 pl
 pl
 val3d result 0 4 20
-set length 5.5977288617103262
+checklength result -l 5.5977288617103262
 
diff --git a/tests/geometry/bsplinecurve/C3 b/tests/geometry/bsplinecurve/C3
index 1e96dc5059..eb36b92b41 100644
--- a/tests/geometry/bsplinecurve/C3
+++ b/tests/geometry/bsplinecurve/C3
@@ -6,5 +6,5 @@ pl
 pl
 pl
 val3d result 0 4 20
-set length 6.3759776321287411
+checklength result -l 6.3759776321287411
 
diff --git a/tests/geometry/bsplinecurve/begin b/tests/geometry/bsplinecurve/begin
index 0053992f8a..f96443c237 100644
--- a/tests/geometry/bsplinecurve/begin
+++ b/tests/geometry/bsplinecurve/begin
@@ -1,2 +1 @@
-set viewer "smallview"
-set type "finite"
+set viewer "smallview"
\ No newline at end of file
diff --git a/tests/geometry/circle/A1 b/tests/geometry/circle/A1
index b005443025..66668de1ac 100644
--- a/tests/geometry/circle/A1
+++ b/tests/geometry/circle/A1
@@ -1,4 +1,4 @@
 circle c 0 0 0  0 0 1  1
 convert result c 
-set length 6.2831853071795853
+checklength result -l 6.2831853071795853
 
diff --git a/tests/geometry/circle/A2 b/tests/geometry/circle/A2
index 525140486b..6c3ef6026e 100644
--- a/tests/geometry/circle/A2
+++ b/tests/geometry/circle/A2
@@ -1,5 +1,5 @@
 circle cer 0 0 0  0 0 1  1
 trim cer cer 0 pi
 convert result cer c1
-set length 3.1415926535897931
+checklength result -l 3.1415926535897931
 
diff --git a/tests/geometry/circle/A3 b/tests/geometry/circle/A3
index 5f430de207..51728e0c7f 100644
--- a/tests/geometry/circle/A3
+++ b/tests/geometry/circle/A3
@@ -1,4 +1,4 @@
 circle cer 0 0 0  0 0 1  1
 convert result cer c1
-set length 6.2831853071795871
+checklength result -l 6.2831853071795871
 
diff --git a/tests/geometry/circle/A4 b/tests/geometry/circle/A4
index faf56c0b9e..de454448a8 100644
--- a/tests/geometry/circle/A4
+++ b/tests/geometry/circle/A4
@@ -1,5 +1,5 @@
 circle c 0 0 0  0 0 1  1
 trim c c 0 6.28
 convert result c po
-set length 6.2800124075908368
+checklength result -l 6.2800124075908368
 
diff --git a/tests/geometry/circle/A5 b/tests/geometry/circle/A5
index 903e83b013..45c8ba6c50 100644
--- a/tests/geometry/circle/A5
+++ b/tests/geometry/circle/A5
@@ -1,5 +1,5 @@
 circle cer 0 0 0  0 0 1  1
 trim cer cer 0 pi
 convert result cer qa
-set length 3.1415926535897931
+checklength result -l 3.1415926535897931
 
diff --git a/tests/geometry/circle/A6 b/tests/geometry/circle/A6
index 2b943b4713..79bfca88bd 100644
--- a/tests/geometry/circle/A6
+++ b/tests/geometry/circle/A6
@@ -1,5 +1,5 @@
 circle cer 0 0 0  0 0 1  1
 trim cer cer 0 4*pi/3
 convert result cer qa
-set length 4.1887902047863896
+checklength result -l 4.1887902047863896
 
diff --git a/tests/geometry/circle/A7 b/tests/geometry/circle/A7
index b8fe154209..64b2e702d4 100644
--- a/tests/geometry/circle/A7
+++ b/tests/geometry/circle/A7
@@ -1,5 +1,5 @@
 circle cer 0 0 0  0 0 1  1
 trim cer cer 0 pi/3
 convert result cer qa
-set length 1.0471975511965974
+checklength result -l 1.0471975511965974
 
diff --git a/tests/geometry/circle/A8 b/tests/geometry/circle/A8
index 31c7089efd..aa215edde4 100644
--- a/tests/geometry/circle/A8
+++ b/tests/geometry/circle/A8
@@ -1,5 +1,5 @@
 circle cer 0 0 0  0 0 1  1
 trim cer cer 0 2*pi
 convert result cer qa
-set length 6.2831853071795827
+checklength result -l 6.2831853071795827
 
diff --git a/tests/geometry/circle/A9 b/tests/geometry/circle/A9
index 2dc2940e5a..de4cc82202 100644
--- a/tests/geometry/circle/A9
+++ b/tests/geometry/circle/A9
@@ -1,4 +1,4 @@
 circle cer 0 0 0  0 0 1  1
 convert result cer qa
-set length 6.2831853071795845
+checklength result -l 6.2831853071795845
 
diff --git a/tests/geometry/circle/B1 b/tests/geometry/circle/B1
index ea3f544f80..826d21f61f 100644
--- a/tests/geometry/circle/B1
+++ b/tests/geometry/circle/B1
@@ -2,5 +2,5 @@ circle c -40 0 1 0 20
 offset result c 10
 2dlmirror result 0 0 0 1
 set viewer "v2d"
-set length 62.831853071795862
+checklength result -l 62.831853071795862
 
diff --git a/tests/geometry/circle/B2 b/tests/geometry/circle/B2
index c8645a31a9..6a37744796 100644
--- a/tests/geometry/circle/B2
+++ b/tests/geometry/circle/B2
@@ -1,4 +1,4 @@
 circle result 0 0 1 0 0.2
 set viewer "v2d"
-set length 1.2566370614359172
+checklength result -l 1.2566370614359172
 
diff --git a/tests/geometry/circle/B3 b/tests/geometry/circle/B3
index 25ae990629..c0364f25fd 100644
--- a/tests/geometry/circle/B3
+++ b/tests/geometry/circle/B3
@@ -1,4 +1,4 @@
 circle result 0.1 0.2 1 1 0.1
 set viewer "v2d"
-set length 0.62831853071795862
+checklength result -l 0.62831853071795862
 
diff --git a/tests/geometry/circle/B4 b/tests/geometry/circle/B4
index b4f08cfc45..e0f005f7d1 100644
--- a/tests/geometry/circle/B4
+++ b/tests/geometry/circle/B4
@@ -1,3 +1,3 @@
 circle result 0 0 0    0 0 1  1 0 0 0.2
-set length 1.2566370614359172
+checklength result -l 1.2566370614359172
 
diff --git a/tests/geometry/circle/B5 b/tests/geometry/circle/B5
index f5c55e7855..27f8f36abb 100644
--- a/tests/geometry/circle/B5
+++ b/tests/geometry/circle/B5
@@ -1,3 +1,3 @@
 circle result 0 0 0.1  0 1 1  1 0 0 0.3
-set length 1.8849555921538759
+checklength result -l 1.8849555921538759
 
diff --git a/tests/geometry/circle/B6 b/tests/geometry/circle/B6
index 03e92d1c4a..7c4f835f7c 100644
--- a/tests/geometry/circle/B6
+++ b/tests/geometry/circle/B6
@@ -1,5 +1,5 @@
 circle c1 -30 30  1 0 20
 trim result c1 0 pi
 set viewer "v2d"
-set length 62.831853071795862
+checklength result -l 62.831853071795862
 
diff --git a/tests/geometry/circle/B7 b/tests/geometry/circle/B7
index 42a7868279..f336c33736 100644
--- a/tests/geometry/circle/B7
+++ b/tests/geometry/circle/B7
@@ -1,5 +1,5 @@
 circle c2 -30 -30 1 0 20
 trim result c2 pi 2*pi
 set viewer "v2d"
-set length 62.831853071795862
+checklength result -l 62.831853071795862
 
diff --git a/tests/geometry/circle/B8 b/tests/geometry/circle/B8
index d14d8e9044..d88bfb0bde 100644
--- a/tests/geometry/circle/B8
+++ b/tests/geometry/circle/B8
@@ -1,5 +1,5 @@
 circle c3 30  -30 1 0 20
 trim result c3 3*pi/2 5*pi/2
 set viewer "v2d"
-set length 62.831853071795862
+checklength result -l 62.831853071795862
 
diff --git a/tests/geometry/circle/B9 b/tests/geometry/circle/B9
index 425d4239c2..05bcfd2934 100644
--- a/tests/geometry/circle/B9
+++ b/tests/geometry/circle/B9
@@ -1,5 +1,5 @@
 circle c4 30  30 1 0 20
 trim result c4 pi pi/2
 set viewer "v2d"
-set length 94.247779607693786
+checklength result -l 94.247779607693786
 
diff --git a/tests/geometry/circle/C1 b/tests/geometry/circle/C1
index f77b150a1b..7a06e1db6b 100644
--- a/tests/geometry/circle/C1
+++ b/tests/geometry/circle/C1
@@ -1,6 +1,6 @@
 circle result 70 0 1 0 30
 2dtranslate result -200 0
 set viewer "v2d"
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
 
diff --git a/tests/geometry/circle/C2 b/tests/geometry/circle/C2
index 3322a78e51..972feb13d9 100644
--- a/tests/geometry/circle/C2
+++ b/tests/geometry/circle/C2
@@ -1,5 +1,5 @@
 circle result 0 0 1 0 30
 val2d  result 0 [dval 2*pi] 20
 set viewer "v2d"
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/C3 b/tests/geometry/circle/C3
index 4d1c7acabd..4eca7519b8 100644
--- a/tests/geometry/circle/C3
+++ b/tests/geometry/circle/C3
@@ -1,4 +1,4 @@
 circle result 0 0 1 0 0 1 1 0 0 30
 val3d  result 0 [dval 2*pi] 20
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/C4 b/tests/geometry/circle/C4
index 6cb7e289d8..4a86148f82 100644
--- a/tests/geometry/circle/C4
+++ b/tests/geometry/circle/C4
@@ -1,5 +1,5 @@
 circle result 0 0  1 0  200
 reverse result
 set viewer "v2d"
-set length 1256.6370614359173
+checklength result -l 1256.6370614359173
 
diff --git a/tests/geometry/circle/C5 b/tests/geometry/circle/C5
index 607bfeaf80..fdcb01785c 100644
--- a/tests/geometry/circle/C5
+++ b/tests/geometry/circle/C5
@@ -1,4 +1,4 @@
 circle result 70 0 0  0 0 1   1 0 0   30
 smirror result 0 0 0 1 0 -1
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/C6 b/tests/geometry/circle/C6
index 4b7e45d784..7971c4cb32 100644
--- a/tests/geometry/circle/C6
+++ b/tests/geometry/circle/C6
@@ -1,4 +1,4 @@
 circle result 70 0 0  0 0 1   1 0 0   30
 translate result 0 -100 200
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/C7 b/tests/geometry/circle/C7
index 29251f2d47..a993462df5 100644
--- a/tests/geometry/circle/C7
+++ b/tests/geometry/circle/C7
@@ -7,5 +7,5 @@ pl
 pl
 pu
 pu
-set length 6.2831853071795853
+checklength result -l 6.2831853071795853
 
diff --git a/tests/geometry/circle/C8 b/tests/geometry/circle/C8
index e3cee4a9a5..11e561746d 100644
--- a/tests/geometry/circle/C8
+++ b/tests/geometry/circle/C8
@@ -8,5 +8,5 @@ convert result cr
 2dpu
 2dpu
 set viewer "v2d"
-set length 6.2831853071795853
+checklength result -l 6.2831853071795853
 
diff --git a/tests/geometry/circle/C9 b/tests/geometry/circle/C9
index 9879810a23..217480bf29 100644
--- a/tests/geometry/circle/C9
+++ b/tests/geometry/circle/C9
@@ -1,5 +1,5 @@
 circle result 70 0 1 0 30
 2dlmirror result 0 0 0 1
 set viewer "v2d"
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/D1 b/tests/geometry/circle/D1
index 40eb56ebd9..5bee25bb9e 100644
--- a/tests/geometry/circle/D1
+++ b/tests/geometry/circle/D1
@@ -1,5 +1,5 @@
 circle result 70 0 1 0 30
 2dpmirror result 0 0
 set viewer "v2d"
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/D2 b/tests/geometry/circle/D2
index d3971879aa..20d5366b3d 100644
--- a/tests/geometry/circle/D2
+++ b/tests/geometry/circle/D2
@@ -1,9 +1,9 @@
 circle result 0  0 1 0 30
 dset ech 1.1
 repeat 20 { 
-	2dpscale result 0 0 0 ech; 
-	copy result .; 
+    2dpscale result 0 0 0 ech; 
+    copy result .; 
 }
 set viewer "v2d"
-set length 1268.1038650696225
+checklength result -l 1268.1038650696225
 
diff --git a/tests/geometry/circle/D3 b/tests/geometry/circle/D3
index b4e86486a2..e1ae2bc957 100644
--- a/tests/geometry/circle/D3
+++ b/tests/geometry/circle/D3
@@ -1,5 +1,5 @@
 circle result 70 0 1 0 30
 2drotate result 0 0 90
 set viewer "v2d"
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/D4 b/tests/geometry/circle/D4
index 12ca3d0f25..433e08a625 100644
--- a/tests/geometry/circle/D4
+++ b/tests/geometry/circle/D4
@@ -1,5 +1,5 @@
 circle result 70 0 1 0 30
 2dtranslate result -200 0
 set viewer "v2d"
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/D5 b/tests/geometry/circle/D5
index a28e9c607c..06ef2003a3 100644
--- a/tests/geometry/circle/D5
+++ b/tests/geometry/circle/D5
@@ -1,4 +1,4 @@
 circle result 70 0 0  0 0 1   1 0 0   30
 lmirror result 0 0 0  0 1  0
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/D6 b/tests/geometry/circle/D6
index 098279c9ea..96e831e0a1 100644
--- a/tests/geometry/circle/D6
+++ b/tests/geometry/circle/D6
@@ -1,4 +1,4 @@
 circle result 70 0 0  0 0 1   1 0 0   30
 pmirror result 0 0 0
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/D7 b/tests/geometry/circle/D7
index 0aac53be1d..900539a806 100644
--- a/tests/geometry/circle/D7
+++ b/tests/geometry/circle/D7
@@ -1,6 +1,6 @@
 circle result 70 0 0  0 0 1   1 0 0   30
 repeat 7 {rotate result 0 0 0 0 0 1 45;
-	copy result .;
+    copy result .;
 }
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/D8 b/tests/geometry/circle/D8
index 7b0c420397..dcc8aeab7a 100644
--- a/tests/geometry/circle/D8
+++ b/tests/geometry/circle/D8
@@ -2,5 +2,5 @@ circle result 70 0 0  0 0 1   1 0 0   30
 pscale result 0 0 0 5
 repeat 4 {pl}
 dmode result U
-set length 942.47779607693792
+checklength result -l 942.47779607693792
 
diff --git a/tests/geometry/circle/D9 b/tests/geometry/circle/D9
index 607bfeaf80..fdcb01785c 100644
--- a/tests/geometry/circle/D9
+++ b/tests/geometry/circle/D9
@@ -1,4 +1,4 @@
 circle result 70 0 0  0 0 1   1 0 0   30
 smirror result 0 0 0 1 0 -1
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/E1 b/tests/geometry/circle/E1
index 4b7e45d784..7971c4cb32 100644
--- a/tests/geometry/circle/E1
+++ b/tests/geometry/circle/E1
@@ -1,4 +1,4 @@
 circle result 70 0 0  0 0 1   1 0 0   30
 translate result 0 -100 200
-set length 188.49555921538757
+checklength result -l 188.49555921538757
 
diff --git a/tests/geometry/circle/begin b/tests/geometry/circle/begin
index 0053992f8a..f96443c237 100644
--- a/tests/geometry/circle/begin
+++ b/tests/geometry/circle/begin
@@ -1,2 +1 @@
-set viewer "smallview"
-set type "finite"
+set viewer "smallview"
\ No newline at end of file
diff --git a/tests/geometry/ellipse/A1 b/tests/geometry/ellipse/A1
index 594c314066..e44293de00 100644
--- a/tests/geometry/ellipse/A1
+++ b/tests/geometry/ellipse/A1
@@ -1,5 +1,5 @@
 ellipse  cer 0 0 0  0 0 1  2 1
 trim cer cer 0 pi
 convert result cer c1
-set length 4.8442241102738386
+checklength result -l 4.8442241102738386
 
diff --git a/tests/geometry/ellipse/A2 b/tests/geometry/ellipse/A2
index 2a1a185c38..2fbc1687d8 100644
--- a/tests/geometry/ellipse/A2
+++ b/tests/geometry/ellipse/A2
@@ -1,4 +1,4 @@
 ellipse  cer 0 0 0  0 0 1  2 1
 convert result cer c1
-set length 9.6884482205476772
+checklength result -l 9.6884482205476772
 
diff --git a/tests/geometry/ellipse/A3 b/tests/geometry/ellipse/A3
index 18711b8e68..3c9d7da55a 100644
--- a/tests/geometry/ellipse/A3
+++ b/tests/geometry/ellipse/A3
@@ -1,5 +1,5 @@
 ellipse cer 0 0 0  0 0 1  2 1
 trim cer cer 0 pi
 convert result cer qa
-set length 4.8442241102733714
+checklength result -l 4.8442241102733714
 
diff --git a/tests/geometry/ellipse/A4 b/tests/geometry/ellipse/A4
index 0b815fb061..754aff6b85 100644
--- a/tests/geometry/ellipse/A4
+++ b/tests/geometry/ellipse/A4
@@ -1,5 +1,5 @@
 ellipse  cer 0 0 0  0 0 1  2 1 
 trim cer cer 0 4*pi/3
 convert result cer qa
-set length 6.2541520204793155
+checklength result -l 6.2541520204793155
 
diff --git a/tests/geometry/ellipse/A5 b/tests/geometry/ellipse/A5
index 194a4b18e7..b4569772bc 100644
--- a/tests/geometry/ellipse/A5
+++ b/tests/geometry/ellipse/A5
@@ -1,5 +1,5 @@
 ellipse  cer 0 0 0  0 0 1  2 1 
 trim cer cer 0 pi/3
 convert result cer qa
-set length 1.4099279102054671
+checklength result -l 1.4099279102054671
 
diff --git a/tests/geometry/ellipse/A6 b/tests/geometry/ellipse/A6
index dfd298130d..9d5ee3b0f9 100644
--- a/tests/geometry/ellipse/A6
+++ b/tests/geometry/ellipse/A6
@@ -1,4 +1,4 @@
 ellipse result 0 0 1 0 0.2 0.1
 set viewer "v2d"
-set length 0.96884482174527109
+checklength result -l 0.96884482174527109
 
diff --git a/tests/geometry/ellipse/A7 b/tests/geometry/ellipse/A7
index d29c5384ca..600890b99f 100644
--- a/tests/geometry/ellipse/A7
+++ b/tests/geometry/ellipse/A7
@@ -1,4 +1,4 @@
 ellipse result 0 0 1 1 0.25 0.15
 set viewer "v2d"
-set length 1.2763499431763086
+checklength result -l 1.2763499431763086
 
diff --git a/tests/geometry/ellipse/A8 b/tests/geometry/ellipse/A8
index 37c5aaf038..18ef5f8771 100644
--- a/tests/geometry/ellipse/A8
+++ b/tests/geometry/ellipse/A8
@@ -1,3 +1,3 @@
 ellipse result 0 0 0 0 0 1 1 0 0 20 10
-set length 96.884482205475521
+checklength result -l 96.884482205475521
 
diff --git a/tests/geometry/ellipse/A9 b/tests/geometry/ellipse/A9
index 2b2d924969..6337d20d8b 100644
--- a/tests/geometry/ellipse/A9
+++ b/tests/geometry/ellipse/A9
@@ -1,3 +1,3 @@
 ellipse result 0 0 0 1 0 0 0 0 1 25 15
-set length 127.63499431699034
+checklength result -l 127.63499431699034
 
diff --git a/tests/geometry/ellipse/B1 b/tests/geometry/ellipse/B1
index b77b636d41..abdb75f1b1 100644
--- a/tests/geometry/ellipse/B1
+++ b/tests/geometry/ellipse/B1
@@ -1,5 +1,5 @@
 ellipse   result 70 0 1 0 40 20
 2dtranslate result -200 0
 set viewer "v2d"
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/B2 b/tests/geometry/ellipse/B2
index 95b55a5ee6..56f7c219cd 100644
--- a/tests/geometry/ellipse/B2
+++ b/tests/geometry/ellipse/B2
@@ -1,5 +1,5 @@
 ellipse result 0 0 1 0 40 20
 val2d result 0 [dval 2*pi] 20
 set viewer "v2d"
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/B3 b/tests/geometry/ellipse/B3
index f68bf85bd3..4199591bbb 100644
--- a/tests/geometry/ellipse/B3
+++ b/tests/geometry/ellipse/B3
@@ -1,4 +1,4 @@
 ellipse result 0 0 0 0 0 1 1 0 0 40 20
 val3d result 0 [dval 2*pi] 20
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/B4 b/tests/geometry/ellipse/B4
index c7168367a9..ab73f5457c 100644
--- a/tests/geometry/ellipse/B4
+++ b/tests/geometry/ellipse/B4
@@ -1,5 +1,5 @@
 ellipse result 0 0  1 0  400 300
 reverse result
 set viewer "v2d"
-set length 2210.3492160709502
+checklength result -l 2210.3492160709502
 
diff --git a/tests/geometry/ellipse/B5 b/tests/geometry/ellipse/B5
index 18aadc8ffb..cf69162f0d 100644
--- a/tests/geometry/ellipse/B5
+++ b/tests/geometry/ellipse/B5
@@ -1,4 +1,4 @@
 ellipse result 70 0 0  0 0 1   1 0 0   40 20
 smirror result 0 0 0 1 0 -1
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/B6 b/tests/geometry/ellipse/B6
index 2a3611e310..ef8437dd20 100644
--- a/tests/geometry/ellipse/B6
+++ b/tests/geometry/ellipse/B6
@@ -1,4 +1,4 @@
 ellipse result 70 0 0  0 0 1   1 0 0   40 20
 translate result 0 -100 200
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/B7 b/tests/geometry/ellipse/B7
index 27c1a3a95a..ec84dd98b1 100644
--- a/tests/geometry/ellipse/B7
+++ b/tests/geometry/ellipse/B7
@@ -7,5 +7,5 @@ pl
 pl
 pu
 pu
-set length 4.844224110274018
+checklength result -l 4.844224110274018
 
diff --git a/tests/geometry/ellipse/B8 b/tests/geometry/ellipse/B8
index 50a5cdd608..e6f85a4d24 100644
--- a/tests/geometry/ellipse/B8
+++ b/tests/geometry/ellipse/B8
@@ -8,5 +8,5 @@ convert result er
 2dpu
 2dpu
 set viewer "v2d"
-set length 4.844224110274018
+checklength result -l 4.844224110274018
 
diff --git a/tests/geometry/ellipse/B9 b/tests/geometry/ellipse/B9
index c74e1b98ee..1efbfabc32 100644
--- a/tests/geometry/ellipse/B9
+++ b/tests/geometry/ellipse/B9
@@ -1,5 +1,5 @@
 ellipse result 70 0 1 0 40 20
 2dlmirror result 0 0 0 1
 set viewer "v2d"
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/C1 b/tests/geometry/ellipse/C1
index fae58cf7b3..427a84639c 100644
--- a/tests/geometry/ellipse/C1
+++ b/tests/geometry/ellipse/C1
@@ -1,5 +1,5 @@
 ellipse result 70 0 1 0 40 20
 2dpmirror result 0 0
 set viewer "v2d"
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/C2 b/tests/geometry/ellipse/C2
index 64c42e1218..d01a73d4f0 100644
--- a/tests/geometry/ellipse/C2
+++ b/tests/geometry/ellipse/C2
@@ -1,9 +1,9 @@
 ellipse result 0  0 1 0 40 20
 dset ech 1.1
 repeat 20 { 
-	2dpscale result 0 0 0 ech; 
-	copy result .; 
+    2dpscale result 0 0 0 ech; 
+    copy result .; 
 }
 set viewer "v2d"
-set length 1303.5806982555659
+checklength result -l 1303.5806982555659
 
diff --git a/tests/geometry/ellipse/C3 b/tests/geometry/ellipse/C3
index ee7b7d7dd9..ee7a46edd6 100644
--- a/tests/geometry/ellipse/C3
+++ b/tests/geometry/ellipse/C3
@@ -1,5 +1,5 @@
 ellipse result 70 0 1 0 40 20
 2drotate result 0 0 90
 set viewer "v2d"
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/C4 b/tests/geometry/ellipse/C4
index bb12681b0b..7edae4b6b5 100644
--- a/tests/geometry/ellipse/C4
+++ b/tests/geometry/ellipse/C4
@@ -1,5 +1,5 @@
 ellipse result 70 0 1 0 40 20
 2dtranslate result -200 0
 set viewer "v2d"
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/C5 b/tests/geometry/ellipse/C5
index 29782695ad..76215b670c 100644
--- a/tests/geometry/ellipse/C5
+++ b/tests/geometry/ellipse/C5
@@ -1,4 +1,4 @@
 ellipse result 70 0 0  0 0 1   1 0 0   40 20
 lmirror result 0 0 0  0 1  0
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/C6 b/tests/geometry/ellipse/C6
index c381d4c350..35cdb62fdb 100644
--- a/tests/geometry/ellipse/C6
+++ b/tests/geometry/ellipse/C6
@@ -1,4 +1,4 @@
 ellipse result 70 0 0  0 0 1   1 0 0   40 20
 pmirror result 0 0 0
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/C7 b/tests/geometry/ellipse/C7
index 4279051785..d0fea2a872 100644
--- a/tests/geometry/ellipse/C7
+++ b/tests/geometry/ellipse/C7
@@ -1,6 +1,6 @@
 ellipse result 70 0 0  0 0 1   1 0 0   40 20
 repeat 7 {rotate result 0 0 0 0 0 1 45;
-	copy result .;
+    copy result .;
 }
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/C8 b/tests/geometry/ellipse/C8
index da2ad23314..2152b142f0 100644
--- a/tests/geometry/ellipse/C8
+++ b/tests/geometry/ellipse/C8
@@ -2,5 +2,5 @@ ellipse result 70 0 0  0 0 1   1 0 0   40 20
 pscale result 0 0 0 5
 repeat 4 {pl}
 dmode result U
-set length 968.84482205476752
+checklength result -l 968.84482205476752
 
diff --git a/tests/geometry/ellipse/C9 b/tests/geometry/ellipse/C9
index 18aadc8ffb..cf69162f0d 100644
--- a/tests/geometry/ellipse/C9
+++ b/tests/geometry/ellipse/C9
@@ -1,4 +1,4 @@
 ellipse result 70 0 0  0 0 1   1 0 0   40 20
 smirror result 0 0 0 1 0 -1
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/D1 b/tests/geometry/ellipse/D1
index 2a3611e310..ef8437dd20 100644
--- a/tests/geometry/ellipse/D1
+++ b/tests/geometry/ellipse/D1
@@ -1,4 +1,4 @@
 ellipse result 70 0 0  0 0 1   1 0 0   40 20
 translate result 0 -100 200
-set length 193.76896441095104
+checklength result -l 193.76896441095104
 
diff --git a/tests/geometry/ellipse/begin b/tests/geometry/ellipse/begin
index 0053992f8a..f96443c237 100644
--- a/tests/geometry/ellipse/begin
+++ b/tests/geometry/ellipse/begin
@@ -1,2 +1 @@
-set viewer "smallview"
-set type "finite"
+set viewer "smallview"
\ No newline at end of file
diff --git a/tests/geometry/end b/tests/geometry/end
index 460b470442..d400c0d7a5 100755
--- a/tests/geometry/end
+++ b/tests/geometry/end
@@ -1,88 +1,3 @@
-proc comparison { x1 x1_o prop } {
-    set precision 0.0000001
-    if { ( abs($x1) > $precision ) || ( abs($x1_o) > $precision ) } {
-        if { ($x1_o != 0 && [expr 1.*abs($x1_o - $x1)/$x1_o] > 0.01) || ($x1_o == 0 && $x1 != 0) } {
-            puts "Error : The $prop of the resulting shape is $x1 and the expected $prop is $x1_o"
-        }
-    }
-}
-
-if { [isdraw result] } {
-    if { [info exists type] && [string compare "$type" "infinite"] == 0 && ![info exists length] } {
-        set ddump [dump result]
-        regexp {Axis   *: *([-0-9.+eE]+), *([-0-9.+eE]+),* *([-0-9.+eE]*) *} $ddump full Axis_1 Axis_2 Axis_3 
-        comparison $Axis_1 $Axis_o_1 "Axis_1"
-        comparison $Axis_2 $Axis_o_2 "Axis_2"
-        if { [info exists Axis_o_3] } {
-            comparison $Axis_3 $Axis_o_3 "Axis_3"
-        }
-        if { [regexp {Line} $ddump] } {
-            regexp {Origin *: *([-0-9.+eE]+), *([-0-9.+eE]+),* *([-0-9.+eE]*) *} $ddump full Origin_1 Origin_2 Origin_3 
-            comparison $Origin_1 $Origin_o_1 "Origin_1"
-            comparison $Origin_2 $Origin_o_2 "Origin_2"
-            if { [info exists Origin_o_3] } {
-                comparison $Origin_3 $Origin_o_3 "Origin_3"
-            }
-        } elseif { [regexp {Parabola} $ddump] || [regexp {Hyperbola} $ddump] } { 
-            regexp {Center *: *([-0-9.+eE]+), *([-0-9.+eE]+),* *([-0-9.+eE]*) *} $ddump full Center_1 Center_2 Center_3 
-            comparison $Center_1 $Center_o_1 "Center_1"
-            comparison $Center_2 $Center_o_2 "Center_2"
-            if { [info exists Center_o_3] } {
-                comparison $Center_3 $Center_o_3 "Center_3"
-            }
-            regexp {XAxis  *: *([-0-9.+eE]+), *([-0-9.+eE]+),* *([-0-9.+eE]*) *} $ddump full XAxis_1 XAxis_2 XAxis_3
-            comparison $XAxis_1 $XAxis_o_1 "XAxis_1"
-            comparison $XAxis_2 $XAxis_o_2 "XAxis_2"
-            if { [info exists XAxis_o_3] } {
-                comparison $XAxis_3 $XAxis_o_3 "XAxis_3"
-            }
-            regexp {YAxis  *: *([-0-9.+eE]+), *([-0-9.+eE]+),* *([-0-9.+eE]*) *} $ddump full YAxis_1 YAxis_2 YAxis_3
-            comparison $YAxis_1 $YAxis_o_1 "YAxis_1"
-            comparison $YAxis_2 $YAxis_o_2 "YAxis_2"
-            if { [info exists YAxis_o_3] } {
-                comparison $YAxis_3 $YAxis_o_3 "YAxis_3"
-            }
-            if { [regexp {Hyperbola} $ddump] } {
-                regexp {Radii  *: *([-0-9.+eE]+), *([-0-9.+eE]+) *} $ddump full LastParam_1 LastParam_2
-            } else {
-                regexp {Focal  *: *([-0-9.+eE]+) *} $ddump full LastParam_1
-            }
-            comparison $LastParam_1 $LastParam_o_1 "LastParam_1"
-            if { [info exists LastParam_o_2] } {
-                comparison $LastParam_2 $LastParam_o_2 "LastParam_2"
-            }
-        } else {
-            puts "Error : undefined type" 
-        }
-    } else {
-        if { [info exists length] } {
-            set prop "length"
-            set mass $length
-            regexp {The +length +result +is +([-0-9.+eE]+)} [length result] full m
-        }
-        if { [info exists mass] } {
-            if { [string compare "$mass" "empty"] != 0 } {
-                if { $m == 0 } {
-                    puts "Error : The $command is not valid. The $prop is 0."
-                }
-                if { $mass > 0 } {
-                    puts "The expected $prop is $mass"
-                }
-                #check of change of length is < 1%
-                if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
-                    puts "Error : The $prop of the resulting shape is $m"
-                }
-            } else {
-                if { $m != 0 } {
-                    puts "Error : The $command is not valid. The $prop is $m"
-                }
-            }
-        }
-    }
-} else {
-    puts "Error : The $command cannot be built."
-}
-
 $viewer
 if { [string compare "$viewer" "v2d"] == 0 } {
     2dclear
diff --git a/tests/geometry/hyperbola/A1 b/tests/geometry/hyperbola/A1
index 6798522625..4946c9cdb2 100644
--- a/tests/geometry/hyperbola/A1
+++ b/tests/geometry/hyperbola/A1
@@ -1,8 +1,2 @@
 hyperbola result 0 0 0 0 0 1 1 0 0 20 10
-
-set Center_o_1 0; set Center_o_2 0; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 1; 
-set XAxis_o_1 1; set XAxis_o_2 0; set XAxis_o_3 -0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; set YAxis_o_3 0; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{0 0 0} {0 0 1} {1 0 -0} {-0 1 0} {20 10}} -eps 0.01
diff --git a/tests/geometry/hyperbola/A2 b/tests/geometry/hyperbola/A2
index dd57e6550f..3d7cf8cc0d 100644
--- a/tests/geometry/hyperbola/A2
+++ b/tests/geometry/hyperbola/A2
@@ -1,5 +1,5 @@
 hyperbola hyper 0 0 0 0 0 1 2 1
 trim hyper hyper -1 1
 convert result hyper
-set length 3.3078924645283738
+checklength result -l 3.3078924645283738
 
diff --git a/tests/geometry/hyperbola/A3 b/tests/geometry/hyperbola/A3
index 3cb699c301..6fbd90a3bc 100644
--- a/tests/geometry/hyperbola/A3
+++ b/tests/geometry/hyperbola/A3
@@ -1,9 +1,3 @@
 hyperbola result 0 0 1 0 20 10
-set viewer "v2d"
-
-set Center_o_1 0; set Center_o_2 0; 
-set Axis_o_1 1; set Axis_o_2 0; 
-set XAxis_o_1 1; set XAxis_o_2 0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{0 0} {1 0} {1 0} {-0 1} {20 10}} -eps 0.01
+set viewer "v2d"
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/A4 b/tests/geometry/hyperbola/A4
index 4b38a109e0..a6ab6a7564 100644
--- a/tests/geometry/hyperbola/A4
+++ b/tests/geometry/hyperbola/A4
@@ -1,9 +1,3 @@
 hyperbola result 0 0 0 1 10 8
-set viewer "v2d"
-
-set Center_o_1 0; set Center_o_2 0; 
-set Axis_o_1 0; set Axis_o_2 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; 
-set YAxis_o_1 -1; set YAxis_o_2 0; 
-set LastParam_o_1 10; set LastParam_o_2 8; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{0 0} {0 1} {0 1} {-1 0} {10 8}} -eps 0.01
+set viewer "v2d"
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/A5 b/tests/geometry/hyperbola/A5
index 8a1489180b..f880d34844 100644
--- a/tests/geometry/hyperbola/A5
+++ b/tests/geometry/hyperbola/A5
@@ -1,9 +1,3 @@
 hyperbola result 70 0 1 0 20 10
 2dtranslate result -200 0
-
-set Center_o_1 -130; set Center_o_2 0; 
-set Axis_o_1 1; set Axis_o_2 0; 
-set XAxis_o_1 1; set XAxis_o_2 0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{-130 0} {1 0} {1 0} {-0 1} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/A6 b/tests/geometry/hyperbola/A6
index 4a7bb5305d..4927c62def 100644
--- a/tests/geometry/hyperbola/A6
+++ b/tests/geometry/hyperbola/A6
@@ -1,9 +1,3 @@
 hyperbola result 0 0 1 0 20 10
 val2d result -5 5 40
-
-set Center_o_1 0; set Center_o_2 0; 
-set Axis_o_1 1; set Axis_o_2 0; 
-set XAxis_o_1 1; set XAxis_o_2 0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{0 0} {1 0} {1 0} {-0 1} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/A7 b/tests/geometry/hyperbola/A7
index 53fffb2f96..f1ed37528c 100644
--- a/tests/geometry/hyperbola/A7
+++ b/tests/geometry/hyperbola/A7
@@ -1,9 +1,3 @@
 hyperbola result 0 0 0 0 0 1 1 0 0  20 10
 val3d result -5 5 40
-
-set Center_o_1 0; set Center_o_2 0; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 1; 
-set XAxis_o_1 1; set XAxis_o_2 0; set XAxis_o_3 -0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; set YAxis_o_3 0; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{0 0 0} {0 0 1} {1 0 -0} {-0 1 0} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/A8 b/tests/geometry/hyperbola/A8
index b5f63a5613..fc7bb7dbe5 100644
--- a/tests/geometry/hyperbola/A8
+++ b/tests/geometry/hyperbola/A8
@@ -1,9 +1,3 @@
 hyperbola result 0 0  -1 0  30 20
 reverse result
-
-set Center_o_1 0; set Center_o_2 0; 
-set Axis_o_1 -1; set Axis_o_2 0; 
-set XAxis_o_1 -1; set XAxis_o_2 0; 
-set YAxis_o_1 0; set YAxis_o_2 1; 
-set LastParam_o_1 30; set LastParam_o_2 20; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{0 0} {-1 0} {-1 0} {0 1} {30 20}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/A9 b/tests/geometry/hyperbola/A9
index f6d817bb94..6d78f10e91 100644
--- a/tests/geometry/hyperbola/A9
+++ b/tests/geometry/hyperbola/A9
@@ -1,9 +1,3 @@
 hyperbola result 70 0 0  0 0 1   1 0 0   20 10
 smirror result 0 0 0 1 0 -1
-
-set Center_o_1 -1.55431223447522e-14; set Center_o_2 0; set Center_o_3 70; 
-set Axis_o_1 -1; set Axis_o_2 -0; set Axis_o_3 -2.22044604925031e-16; 
-set XAxis_o_1 -2.22044604925031e-16; set XAxis_o_2 -0; set XAxis_o_3 1; 
-set YAxis_o_1 -0; set YAxis_o_2 1; set YAxis_o_3 -0; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{-1.55431223447522e-14 0 70} {-1 -0 -2.22044604925031e-16} {-2.22044604925031e-16 -0 1} {-0 1 -0} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/B1 b/tests/geometry/hyperbola/B1
index 71357334b7..a7afe59e1b 100644
--- a/tests/geometry/hyperbola/B1
+++ b/tests/geometry/hyperbola/B1
@@ -1,9 +1,3 @@
 hyperbola result 70 0 0  0 0 1   1 0 0   20 10
 translate result 0 -100 200
-
-set Center_o_1 70; set Center_o_2 -100; set Center_o_3 200; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 1; 
-set XAxis_o_1 1; set XAxis_o_2 0; set XAxis_o_3 -0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; set YAxis_o_3 0; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{70 -100 200} {0 0 1} {1 0 -0} {-0 1 0} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/B2 b/tests/geometry/hyperbola/B2
index 86dea15e50..de6eea856b 100644
--- a/tests/geometry/hyperbola/B2
+++ b/tests/geometry/hyperbola/B2
@@ -8,5 +8,4 @@ pl
 pl
 pu
 pu
-set length 1.6539462322641865
-
+checklength result -l 1.6539462322641865
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/B3 b/tests/geometry/hyperbola/B3
index e1405318cd..0fc9bf0ae1 100644
--- a/tests/geometry/hyperbola/B3
+++ b/tests/geometry/hyperbola/B3
@@ -8,5 +8,4 @@ convert result hr
 2dpl
 2dpu
 2dpu
-set length 1.6539462322641865
-
+checklength result -l 1.6539462322641865
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/B4 b/tests/geometry/hyperbola/B4
index 87cc225ffe..b0f071efa9 100644
--- a/tests/geometry/hyperbola/B4
+++ b/tests/geometry/hyperbola/B4
@@ -1,9 +1,3 @@
 hyperbola result 70 0 1 0 20 10
 2dlmirror result 0 0 0 1
-
-set Center_o_1 -70; set Center_o_2 0; 
-set Axis_o_1 -1; set Axis_o_2 0; 
-set XAxis_o_1 -1; set XAxis_o_2 0; 
-set YAxis_o_1 0; set YAxis_o_2 1; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{-70 0} {-1 0} {-1 0} {0 1} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/B5 b/tests/geometry/hyperbola/B5
index e38f9c5436..00641436ab 100644
--- a/tests/geometry/hyperbola/B5
+++ b/tests/geometry/hyperbola/B5
@@ -1,9 +1,3 @@
 hyperbola result 70 0 1 0 20 10
 2dpmirror result 0 0
-
-set Center_o_1 -70; set Center_o_2 0; 
-set Axis_o_1 -1; set Axis_o_2 -0; 
-set XAxis_o_1 -1; set XAxis_o_2 -0; 
-set YAxis_o_1 0; set YAxis_o_2 -1; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{-70 0} {-1 -0} {-1 -0} {0 -1} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/B6 b/tests/geometry/hyperbola/B6
index 625253fe22..ca7a81b050 100644
--- a/tests/geometry/hyperbola/B6
+++ b/tests/geometry/hyperbola/B6
@@ -1,13 +1,7 @@
 hyperbola result 0  0 1 0 20 10
 dset ech 1.1
 repeat 20 { 
-	2dpscale result 0 0 0 ech; 
-	copy result .; 
+    2dpscale result 0 0 0 ech; 
+    copy result .; 
 }
-
-set Center_o_1 0; set Center_o_2 0; 
-set Axis_o_1 1; set Axis_o_2 0; 
-set XAxis_o_1 1; set XAxis_o_2 0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; 
-set LastParam_o_1 134.549998986512; set LastParam_o_2 67.2749994932561; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{0 0} {1 0} {1 0} {-0 1} {134.549998986512 67.2749994932561}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/B7 b/tests/geometry/hyperbola/B7
index 421063dc10..360a8f6c6d 100644
--- a/tests/geometry/hyperbola/B7
+++ b/tests/geometry/hyperbola/B7
@@ -1,9 +1,3 @@
 hyperbola result 70 0 1 0 20 10
 2drotate result 0 0 90
-
-set Center_o_1 4.28612223837832e-15; set Center_o_2 70; 
-set Axis_o_1 6.12303176911189e-17; set Axis_o_2 1; 
-set XAxis_o_1 6.12303176911189e-17; set XAxis_o_2 1; 
-set YAxis_o_1 -1; set YAxis_o_2 6.12303176911189e-17; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{4.28612223837832e-15 70} {6.12303176911189e-17 1} {6.12303176911189e-17 1} {-1 6.12303176911189e-17} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/B8 b/tests/geometry/hyperbola/B8
index 8a1489180b..f880d34844 100644
--- a/tests/geometry/hyperbola/B8
+++ b/tests/geometry/hyperbola/B8
@@ -1,9 +1,3 @@
 hyperbola result 70 0 1 0 20 10
 2dtranslate result -200 0
-
-set Center_o_1 -130; set Center_o_2 0; 
-set Axis_o_1 1; set Axis_o_2 0; 
-set XAxis_o_1 1; set XAxis_o_2 0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{-130 0} {1 0} {1 0} {-0 1} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/B9 b/tests/geometry/hyperbola/B9
index 7ccbefb265..12d4a4c368 100644
--- a/tests/geometry/hyperbola/B9
+++ b/tests/geometry/hyperbola/B9
@@ -1,9 +1,3 @@
 hyperbola result 70 0 0  0 0 1   1 0 0   20 10
 lmirror result 0 0 0  0 1  0
-
-set Center_o_1 -70; set Center_o_2 0; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 -1; 
-set XAxis_o_1 -1; set XAxis_o_2 0; set XAxis_o_3 0; 
-set YAxis_o_1 0; set YAxis_o_2 1; set YAxis_o_3 0; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{-70 0 0} {0 0 -1} {-1 0 0} {0 1 0} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/C1 b/tests/geometry/hyperbola/C1
index 937645c734..97e1953330 100644
--- a/tests/geometry/hyperbola/C1
+++ b/tests/geometry/hyperbola/C1
@@ -1,9 +1,3 @@
 hyperbola result 70 0 0  0 0 1   1 0 0   20 10
 pmirror result 0 0 0
-
-set Center_o_1 -70; set Center_o_2 0; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 1; 
-set XAxis_o_1 -1; set XAxis_o_2 -0; set XAxis_o_3 0; 
-set YAxis_o_1 0; set YAxis_o_2 -1; set YAxis_o_3 -0; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{-70 0 0} {0 0 1} {-1 -0 0} {0 -1 -0} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/C2 b/tests/geometry/hyperbola/C2
index c4c510ae4c..bb356e603b 100644
--- a/tests/geometry/hyperbola/C2
+++ b/tests/geometry/hyperbola/C2
@@ -1,11 +1,5 @@
 hyperbola result 70 0 0  0 0 1   1 0 0   20 10
 repeat 7 {rotate result 0 0 0 0 0 1 45;
-	copy result .;
+    copy result .;
 }
-
-set Center_o_1 49.4974746830583; set Center_o_2 -49.4974746830583; set Center_o_3 0; 
-set Axis_o_1 -0; set Axis_o_2 0; set Axis_o_3 1; 
-set XAxis_o_1 0.707106781186547; set XAxis_o_2 -0.707106781186548; set XAxis_o_3 0; 
-set YAxis_o_1 0.707106781186548; set YAxis_o_2 0.707106781186547; set YAxis_o_3 0; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{49.4974746830583 -49.4974746830583 0} {-0 0 1} {0.707106781186547 -0.707106781186548 0} {0.707106781186548 0.707106781186547 0} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/C3 b/tests/geometry/hyperbola/C3
index b275266a3d..235ccff6e1 100644
--- a/tests/geometry/hyperbola/C3
+++ b/tests/geometry/hyperbola/C3
@@ -2,10 +2,4 @@ hyperbola result 70 0 0  0 0 1   1 0 0   20 10
 pscale result 0 0 0 5
 repeat 4 {pl}
 dmode result U
-
-set Center_o_1 350; set Center_o_2 0; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 1; 
-set XAxis_o_1 1; set XAxis_o_2 0; set XAxis_o_3 -0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; set YAxis_o_3 0; 
-set LastParam_o_1 100; set LastParam_o_2 50; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{350 0 0} {0 0 1} {1 0 -0} {-0 1 0} {100 50}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/C4 b/tests/geometry/hyperbola/C4
index f6d817bb94..6d78f10e91 100644
--- a/tests/geometry/hyperbola/C4
+++ b/tests/geometry/hyperbola/C4
@@ -1,9 +1,3 @@
 hyperbola result 70 0 0  0 0 1   1 0 0   20 10
 smirror result 0 0 0 1 0 -1
-
-set Center_o_1 -1.55431223447522e-14; set Center_o_2 0; set Center_o_3 70; 
-set Axis_o_1 -1; set Axis_o_2 -0; set Axis_o_3 -2.22044604925031e-16; 
-set XAxis_o_1 -2.22044604925031e-16; set XAxis_o_2 -0; set XAxis_o_3 1; 
-set YAxis_o_1 -0; set YAxis_o_2 1; set YAxis_o_3 -0; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{-1.55431223447522e-14 0 70} {-1 -0 -2.22044604925031e-16} {-2.22044604925031e-16 -0 1} {-0 1 -0} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/C5 b/tests/geometry/hyperbola/C5
index 71357334b7..a7afe59e1b 100644
--- a/tests/geometry/hyperbola/C5
+++ b/tests/geometry/hyperbola/C5
@@ -1,9 +1,3 @@
 hyperbola result 70 0 0  0 0 1   1 0 0   20 10
 translate result 0 -100 200
-
-set Center_o_1 70; set Center_o_2 -100; set Center_o_3 200; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 1; 
-set XAxis_o_1 1; set XAxis_o_2 0; set XAxis_o_3 -0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; set YAxis_o_3 0; 
-set LastParam_o_1 20; set LastParam_o_2 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Radii} -ref {{70 -100 200} {0 0 1} {1 0 -0} {-0 1 0} {20 10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/hyperbola/begin b/tests/geometry/hyperbola/begin
index 8c9b4bfc36..f96443c237 100644
--- a/tests/geometry/hyperbola/begin
+++ b/tests/geometry/hyperbola/begin
@@ -1,2 +1 @@
-set viewer "smallview"
-set type "infinite"
\ No newline at end of file
+set viewer "smallview"
\ No newline at end of file
diff --git a/tests/geometry/iso/A1 b/tests/geometry/iso/A1
index 661d0814e8..d486193e4d 100644
--- a/tests/geometry/iso/A1
+++ b/tests/geometry/iso/A1
@@ -9,5 +9,5 @@ offset offs1 p 0.3
 viso curv_v2 offs1 0.2
 copy curv_v2 result
 set viewer "smallview"
-set length 1.3447354805936929
+checklength result -l 1.3447354805936929
 
diff --git a/tests/geometry/iso/A2 b/tests/geometry/iso/A2
index f504b0cacd..8141bdd669 100644
--- a/tests/geometry/iso/A2
+++ b/tests/geometry/iso/A2
@@ -9,5 +9,5 @@ offset offs1 p 0.3
 uiso curv_u2 offs1 0.2
 copy curv_u2 result
 set viewer "smallview"
-set length 1.3447354805936929
+checklength result -l 1.3447354805936929
 
diff --git a/tests/geometry/iso/A3 b/tests/geometry/iso/A3
index d23e706465..2e21eac7e4 100644
--- a/tests/geometry/iso/A3
+++ b/tests/geometry/iso/A3
@@ -9,7 +9,7 @@ offset offs1 p 0.3
 uiso curv_u2 offs1 0.2
 copy curv_u2 result
 set viewer "smallview"
-set length 1.3447354805936931
+checklength result -l 1.3447354805936931
 
 
 
diff --git a/tests/geometry/iso/A4 b/tests/geometry/iso/A4
index 904d84eb26..48b667a5e9 100644
--- a/tests/geometry/iso/A4
+++ b/tests/geometry/iso/A4
@@ -9,6 +9,4 @@ offset offs1 p 0.3
 viso curv_v2 offs1 0.2
 copy curv_v2 result
 set viewer "smallview"
-set length 1.3447354805936929
-
-
+checklength result -l 1.3447354805936929
\ No newline at end of file
diff --git a/tests/geometry/iso/begin b/tests/geometry/iso/begin
index 0053992f8a..f96443c237 100644
--- a/tests/geometry/iso/begin
+++ b/tests/geometry/iso/begin
@@ -1,2 +1 @@
-set viewer "smallview"
-set type "finite"
+set viewer "smallview"
\ No newline at end of file
diff --git a/tests/geometry/law/A1 b/tests/geometry/law/A1
index 0cf914447b..ed519dbe68 100644
--- a/tests/geometry/law/A1
+++ b/tests/geometry/law/A1
@@ -3,9 +3,10 @@ set delta 0.01
 2dcvalue law1 1.5 x y dx dy
 set value [dval y]
 repeat 50 { 
-	movelaw law1 1.5 $value dy  0  
-	set value [expr $value + $delta] 
-	repaint }
+    movelaw law1 1.5 $value dy  0  
+    set value [expr $value + $delta] 
+    repaint
+}
 copy law1 result
-set length 3.3374712943009293
+checklength result -l 3.3374712943009293
 
diff --git a/tests/geometry/law/A2 b/tests/geometry/law/A2
index c47543c4bc..618e29e4bf 100644
--- a/tests/geometry/law/A2
+++ b/tests/geometry/law/A2
@@ -3,9 +3,10 @@ set delta 0.007
 2dcvalue law1 1.5 x y  dx dy
 set tvalue [dval dy] 
 repeat 100 { 
-	movelaw law1 1.5  y $tvalue  1  
-	set tvalue [expr $tvalue + $delta] 
-	repaint }
+    movelaw law1 1.5  y $tvalue  1  
+    set tvalue [expr $tvalue + $delta] 
+    repaint
+}
 copy law1 result
-set length 3.3254491241005475
+checklength result -l 3.3254491241005475
 
diff --git a/tests/geometry/law/A3 b/tests/geometry/law/A3
index 0cf914447b..ed519dbe68 100644
--- a/tests/geometry/law/A3
+++ b/tests/geometry/law/A3
@@ -3,9 +3,10 @@ set delta 0.01
 2dcvalue law1 1.5 x y dx dy
 set value [dval y]
 repeat 50 { 
-	movelaw law1 1.5 $value dy  0  
-	set value [expr $value + $delta] 
-	repaint }
+    movelaw law1 1.5 $value dy  0  
+    set value [expr $value + $delta] 
+    repaint
+}
 copy law1 result
-set length 3.3374712943009293
+checklength result -l 3.3374712943009293
 
diff --git a/tests/geometry/law/A4 b/tests/geometry/law/A4
index c47543c4bc..618e29e4bf 100644
--- a/tests/geometry/law/A4
+++ b/tests/geometry/law/A4
@@ -3,9 +3,10 @@ set delta 0.007
 2dcvalue law1 1.5 x y  dx dy
 set tvalue [dval dy] 
 repeat 100 { 
-	movelaw law1 1.5  y $tvalue  1  
-	set tvalue [expr $tvalue + $delta] 
-	repaint }
+    movelaw law1 1.5  y $tvalue  1  
+    set tvalue [expr $tvalue + $delta] 
+    repaint
+}
 copy law1 result
-set length 3.3254491241005475
+checklength result -l 3.3254491241005475
 
diff --git a/tests/geometry/law/begin b/tests/geometry/law/begin
index d10da1fde9..2fecf221ef 100644
--- a/tests/geometry/law/begin
+++ b/tests/geometry/law/begin
@@ -1,2 +1 @@
-set viewer "v2d"
-set type "finite"
+set viewer "v2d"
\ No newline at end of file
diff --git a/tests/geometry/line/A1 b/tests/geometry/line/A1
index 7e6b29e7ec..b225028457 100644
--- a/tests/geometry/line/A1
+++ b/tests/geometry/line/A1
@@ -1,6 +1,3 @@
 line result 0 0 1 1
 set viewer "v2d"
-
-set Origin_o_1 0; set Origin_o_2 0; 
-set Axis_o_1 0.707106781186548; set Axis_o_2 0.707106781186548; 
-
+checkdump result -name {Origin Axis} -ref {{0 0} {0.707106781186548 0.707106781186548}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/line/A2 b/tests/geometry/line/A2
index 1386790fed..4d5096c4f8 100644
--- a/tests/geometry/line/A2
+++ b/tests/geometry/line/A2
@@ -1,6 +1,3 @@
 line result 1 1 2 3
 set viewer "v2d"
-
-set Origin_o_1 1; set Origin_o_2 1; 
-set Axis_o_1 0.554700196225229; set Axis_o_2 0.832050294337844; 
-
+checkdump result -name {Origin Axis} -ref {{1 1} {0.554700196225229 0.832050294337844}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/line/A3 b/tests/geometry/line/A3
index b4b463fcb8..6993bb8113 100644
--- a/tests/geometry/line/A3
+++ b/tests/geometry/line/A3
@@ -1,5 +1,2 @@
 line result 0 0 0 1 1 1
-
-set Origin_o_1 0; set Origin_o_2 0; set Origin_o_3 0; 
-set Axis_o_1 0.577350269189626; set Axis_o_2 0.577350269189626; set Axis_o_3 0.577350269189626; 
-
+checkdump result -name {Origin Axis} -ref {{0 0 0} {0.577350269189626 0.577350269189626 0.577350269189626}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/line/A4 b/tests/geometry/line/A4
index 945d71e1b8..8c3b873a4a 100644
--- a/tests/geometry/line/A4
+++ b/tests/geometry/line/A4
@@ -1,5 +1,2 @@
 line result 1 2 3 4 5 6
-
-set Origin_o_1 1; set Origin_o_2 2; set Origin_o_3 3; 
-set Axis_o_1 0.455842305838552; set Axis_o_2 0.56980288229819; set Axis_o_3 0.683763458757828; 
-
+checkdump result -name {Origin Axis} -ref {{1 2 3} {0.455842305838552 0.56980288229819 0.683763458757828}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/line/A5 b/tests/geometry/line/A5
index 0bb945a104..5fb713d900 100644
--- a/tests/geometry/line/A5
+++ b/tests/geometry/line/A5
@@ -3,5 +3,5 @@ trim lin1 lin1 -1 1
 convert result lin1
 2dcvalue result 0 x y dx dy d2x d2y
 set viewer "v2d"
-set length 2
+checklength result -l 2
 
diff --git a/tests/geometry/line/A6 b/tests/geometry/line/A6
index 0904699787..1bfa60e22d 100644
--- a/tests/geometry/line/A6
+++ b/tests/geometry/line/A6
@@ -1,7 +1,4 @@
 line result 0 0  1 3
 val2d result 0 100 20
 set viewer "v2d"
-
-set Origin_o_1 0; set Origin_o_2 0; 
-set Axis_o_1 0.316227766016838; set Axis_o_2 0.948683298050514; 
-
+checkdump result -name {Origin Axis} -ref {{0 0} {0.316227766016838 0.948683298050514}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/line/A7 b/tests/geometry/line/A7
index 3554791588..9b0360ee57 100644
--- a/tests/geometry/line/A7
+++ b/tests/geometry/line/A7
@@ -1,6 +1,3 @@
 line result 0 0 0 1 3 1
 val3d result 0 100 20
-
-set Origin_o_1 0; set Origin_o_2 0; set Origin_o_3 0; 
-set Axis_o_1 0.301511344577764; set Axis_o_2 0.904534033733291; set Axis_o_3 0.301511344577764; 
-
+checkdump result -name {Origin Axis} -ref {{0 0 0} {0.301511344577764 0.904534033733291 0.301511344577764}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/line/A8 b/tests/geometry/line/A8
index 0f2bd59e54..6e9ce630e1 100644
--- a/tests/geometry/line/A8
+++ b/tests/geometry/line/A8
@@ -8,5 +8,5 @@ pl
 pl
 pu
 pu
-set length 2.9999999999999996
+checklength result -l 2.9999999999999996
 
diff --git a/tests/geometry/line/A9 b/tests/geometry/line/A9
index 4e307ea101..b0f34ea255 100644
--- a/tests/geometry/line/A9
+++ b/tests/geometry/line/A9
@@ -9,5 +9,5 @@ convert result lr
 2dpu
 2dpu
 set viewer "v2d"
-set length 2.9999999999999996
+checklength result -l 2.9999999999999996
 
diff --git a/tests/geometry/line/B1 b/tests/geometry/line/B1
index 8807dfc8c7..2191686f8c 100644
--- a/tests/geometry/line/B1
+++ b/tests/geometry/line/B1
@@ -1,7 +1,4 @@
 line result 70 0 0  1 1 0  
 repeat 4 {pl}
 dmode result U
-
-set Origin_o_1 70; set Origin_o_2 0; set Origin_o_3 0; 
-set Axis_o_1 0.707106781186548; set Axis_o_2 0.707106781186548; set Axis_o_3 0; 
-
+checkdump result -name {Origin Axis} -ref {{70 0 0} {0.707106781186548 0.707106781186548 0}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/line/begin b/tests/geometry/line/begin
index 268981a87d..f96443c237 100644
--- a/tests/geometry/line/begin
+++ b/tests/geometry/line/begin
@@ -1,2 +1 @@
-set viewer "smallview"
-set type "infinite"
+set viewer "smallview"
\ No newline at end of file
diff --git a/tests/geometry/parabola/A1 b/tests/geometry/parabola/A1
index d74543727f..b529125d45 100644
--- a/tests/geometry/parabola/A1
+++ b/tests/geometry/parabola/A1
@@ -1,5 +1,5 @@
 parabola para 0 0 0 0 0 1 2
 trim para para -1 1
 convert result para
-set length 2.0206422525934427
+checklength result -l 2.0206422525934427
 
diff --git a/tests/geometry/parabola/A2 b/tests/geometry/parabola/A2
index 8565913232..782025be99 100644
--- a/tests/geometry/parabola/A2
+++ b/tests/geometry/parabola/A2
@@ -1,10 +1,4 @@
 parabola result  0  1  0  1 10
 dmode result U
 set viewer "v2d"
-
-set Center_o_1 0; set Center_o_2 1; 
-set Axis_o_1 0; set Axis_o_2 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; 
-set YAxis_o_1 -1; set YAxis_o_2 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{0 1} {0 1} {0 1} {-1 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/A3 b/tests/geometry/parabola/A3
index 370b96e72d..81aae8958e 100644
--- a/tests/geometry/parabola/A3
+++ b/tests/geometry/parabola/A3
@@ -1,10 +1,4 @@
 parabola result  0 -1  0 -1 10
 dmode result U 
 set viewer "v2d"
-
-set Center_o_1 0; set Center_o_2 -1; 
-set Axis_o_1 0; set Axis_o_2 -1; 
-set XAxis_o_1 0; set XAxis_o_2 -1; 
-set YAxis_o_1 1; set YAxis_o_2 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{0 -1} {0 -1} {0 -1} {1 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/A4 b/tests/geometry/parabola/A4
index 30b96809af..bcd83bd434 100644
--- a/tests/geometry/parabola/A4
+++ b/tests/geometry/parabola/A4
@@ -1,10 +1,4 @@
 parabola result  1  0  1  0 10
 dmode result U
 set viewer "v2d"
-
-set Center_o_1 1; set Center_o_2 0; 
-set Axis_o_1 1; set Axis_o_2 0; 
-set XAxis_o_1 1; set XAxis_o_2 0; 
-set YAxis_o_1 -0; set YAxis_o_2 1; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{1 0} {1 0} {1 0} {-0 1} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/A5 b/tests/geometry/parabola/A5
index 2501d038c3..797a0d164c 100644
--- a/tests/geometry/parabola/A5
+++ b/tests/geometry/parabola/A5
@@ -1,9 +1,4 @@
 parabola result -1  0 -1  0 10
 dmode result U
 set viewer "v2d"
-set Center_o_1 -1; set Center_o_2 0; 
-set Axis_o_1 -1; set Axis_o_2 0; 
-set XAxis_o_1 -1; set XAxis_o_2 0; 
-set YAxis_o_1 -0; set YAxis_o_2 -1; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-1 0} {-1 0} {-1 0} {-0 -1} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/A6 b/tests/geometry/parabola/A6
index 1f9729859a..b637ed8999 100644
--- a/tests/geometry/parabola/A6
+++ b/tests/geometry/parabola/A6
@@ -1,9 +1,3 @@
 parabola result  0  1  1   0  0  1     0  1  0  10
 dmode result U
-
-set Center_o_1 0; set Center_o_2 1; set Center_o_3 1; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; set XAxis_o_3 0; 
-set YAxis_o_1 -1; set YAxis_o_2 0; set YAxis_o_3 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{0 1 1} {0 0 1} {0 1 0} {-1 0 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/A7 b/tests/geometry/parabola/A7
index f184e8e8fe..e5569e5e45 100644
--- a/tests/geometry/parabola/A7
+++ b/tests/geometry/parabola/A7
@@ -1,8 +1,3 @@
 parabola result  0 -1  1   0  0  1    0 -1  0  10
 dmode result U 
-set Center_o_1 0; set Center_o_2 -1; set Center_o_3 1; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 1; 
-set XAxis_o_1 0; set XAxis_o_2 -1; set XAxis_o_3 0; 
-set YAxis_o_1 1; set YAxis_o_2 0; set YAxis_o_3 -0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{0 -1 1} {0 0 1} {0 -1 0} {1 0 -0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/A8 b/tests/geometry/parabola/A8
index ffe7e4ed43..b929b4c64a 100644
--- a/tests/geometry/parabola/A8
+++ b/tests/geometry/parabola/A8
@@ -1,9 +1,3 @@
 parabola result  1  0  0   0  1  0    1  0  0  10
 dmode result U
-
-set Center_o_1 1; set Center_o_2 0; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 1; set Axis_o_3 0; 
-set XAxis_o_1 1; set XAxis_o_2 0; set XAxis_o_3 0; 
-set YAxis_o_1 0; set YAxis_o_2 0; set YAxis_o_3 -1; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{1 0 0} {0 1 0} {1 0 0} {0 0 -1} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/A9 b/tests/geometry/parabola/A9
index 05de6e2437..e3ed74db8c 100644
--- a/tests/geometry/parabola/A9
+++ b/tests/geometry/parabola/A9
@@ -1,9 +1,3 @@
 parabola result -1  0  0   0  1  0   -1  0  0  10
 dmode result U
-
-set Center_o_1 -1; set Center_o_2 0; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 1; set Axis_o_3 0; 
-set XAxis_o_1 -1; set XAxis_o_2 0; set XAxis_o_3 0; 
-set YAxis_o_1 0; set YAxis_o_2 -0; set YAxis_o_3 1; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-1 0 0} {0 1 0} {-1 0 0} {0 -0 1} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/B1 b/tests/geometry/parabola/B1
index 4a2ca848a3..913870384f 100644
--- a/tests/geometry/parabola/B1
+++ b/tests/geometry/parabola/B1
@@ -1,10 +1,4 @@
 parabola  result 70 1  0  1 10
 2dtranslate result -200 0
 set viewer "v2d"
-
-set Center_o_1 -130; set Center_o_2 1; 
-set Axis_o_1 0; set Axis_o_2 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; 
-set YAxis_o_1 -1; set YAxis_o_2 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-130 1} {0 1} {0 1} {-1 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/B2 b/tests/geometry/parabola/B2
index 0f753043e8..c13bc88d07 100644
--- a/tests/geometry/parabola/B2
+++ b/tests/geometry/parabola/B2
@@ -1,10 +1,4 @@
 parabola result  0  1  0  1 10
 val2d result -50 50 40
 set viewer "v2d"
-
-set Center_o_1 0; set Center_o_2 1; 
-set Axis_o_1 0; set Axis_o_2 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; 
-set YAxis_o_1 -1; set YAxis_o_2 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{0 1} {0 1} {0 1} {-1 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/B3 b/tests/geometry/parabola/B3
index 3df2b9c53f..893deceeac 100644
--- a/tests/geometry/parabola/B3
+++ b/tests/geometry/parabola/B3
@@ -1,9 +1,3 @@
 parabola result  0 0 0 0 0 1  0 1 0 10
 val3d result -50 50 40
-
-set Center_o_1 0; set Center_o_2 0; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; set XAxis_o_3 0; 
-set YAxis_o_1 -1; set YAxis_o_2 0; set YAxis_o_3 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{0 0 0} {0 0 1} {0 1 0} {-1 0 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/B4 b/tests/geometry/parabola/B4
index 7f961d5829..71843ad93a 100644
--- a/tests/geometry/parabola/B4
+++ b/tests/geometry/parabola/B4
@@ -1,11 +1,4 @@
 parabola result 0 0  1 0  30
 reverse result
 set viewer "v2d"
-
-
-set Center_o_1 0; set Center_o_2 0; 
-set Axis_o_1 1; set Axis_o_2 0; 
-set XAxis_o_1 1; set XAxis_o_2 0; 
-set YAxis_o_1 0; set YAxis_o_2 -1; 
-set LastParam_o_1 30; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{0 0} {1 0} {1 0} {0 -1} {30}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/B5 b/tests/geometry/parabola/B5
index 3c47f4b67e..82b0a6e63c 100644
--- a/tests/geometry/parabola/B5
+++ b/tests/geometry/parabola/B5
@@ -1,9 +1,3 @@
 parabola result 70 1 0  0 0 1   0 1 0   10
 smirror result 0 0 0 1 0 -1
-
-set Center_o_1 -1.55431223447522e-14; set Center_o_2 1; set Center_o_3 70; 
-set Axis_o_1 -1; set Axis_o_2 -0; set Axis_o_3 -2.22044604925031e-16; 
-set XAxis_o_1 -0; set XAxis_o_2 1; set XAxis_o_3 -0; 
-set YAxis_o_1 2.22044604925031e-16; set YAxis_o_2 0; set YAxis_o_3 -1; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-1.55431223447522e-14 1 70} {-1 -0 -2.22044604925031e-16} {-0 1 -0} {.22044604925031e-16 0 -1} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/B6 b/tests/geometry/parabola/B6
index 1d0c261b94..931672c0c5 100644
--- a/tests/geometry/parabola/B6
+++ b/tests/geometry/parabola/B6
@@ -1,9 +1,3 @@
 parabola result 70 1 0  0 0 1   0 1 0   10
 translate result 0 -100 200
-
-set Center_o_1 70; set Center_o_2 -99; set Center_o_3 200; 
-set Axis_o_1 0; set Axis_o_2 -0; set Axis_o_3 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; set XAxis_o_3 0; 
-set YAxis_o_1 -1; set YAxis_o_2 0; set YAxis_o_3 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{70 -99 200} {0 -0 1} {0 1 0} {-1 0 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/B7 b/tests/geometry/parabola/B7
index 1455a28eb1..f3d518b472 100644
--- a/tests/geometry/parabola/B7
+++ b/tests/geometry/parabola/B7
@@ -8,5 +8,5 @@ pl
 pl
 pu
 pu
-set length 3.3514748622014476
+checklength result -l 3.3514748622014476
 
diff --git a/tests/geometry/parabola/B8 b/tests/geometry/parabola/B8
index 8b9b0c0e37..0afe38473a 100644
--- a/tests/geometry/parabola/B8
+++ b/tests/geometry/parabola/B8
@@ -9,5 +9,5 @@ convert result pr
 2dpu
 2dpu
 set viewer "v2d"
-set length 3.3514748622014476
+checklength result -l 3.3514748622014476
 
diff --git a/tests/geometry/parabola/B9 b/tests/geometry/parabola/B9
index 5d7559f947..2bd607ed7d 100644
--- a/tests/geometry/parabola/B9
+++ b/tests/geometry/parabola/B9
@@ -1,10 +1,4 @@
 parabola result 70 1  0  1 10
 2dlmirror result 0 0 0 1
 set viewer "v2d"
-
-set Center_o_1 -70; set Center_o_2 1; 
-set Axis_o_1 -0; set Axis_o_2 1; 
-set XAxis_o_1 -0; set XAxis_o_2 1; 
-set YAxis_o_1 1; set YAxis_o_2 -0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-70 1} {-0 1} {-0 1} {1 -0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/C1 b/tests/geometry/parabola/C1
index 726853e0b5..3d170bf411 100644
--- a/tests/geometry/parabola/C1
+++ b/tests/geometry/parabola/C1
@@ -1,10 +1,4 @@
 parabola result 70 1  0  1 10
 2dpmirror result 0 0
 set viewer "v2d"
-
-set Center_o_1 -70; set Center_o_2 -1; 
-set Axis_o_1 -0; set Axis_o_2 -1; 
-set XAxis_o_1 -0; set XAxis_o_2 -1; 
-set YAxis_o_1 1; set YAxis_o_2 -0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-70 -1} {-0 -1} {-0 -1} {1 -0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/C2 b/tests/geometry/parabola/C2
index afa88aa08f..98d8d4b17a 100644
--- a/tests/geometry/parabola/C2
+++ b/tests/geometry/parabola/C2
@@ -1,14 +1,8 @@
 parabola result 0  0  0  10 10
 dset ech 1.1
 repeat 20 { 
-	2dpscale result 0 0 0 ech; 
-	copy result .; 
+    2dpscale result 0 0 0 ech; 
+    copy result .; 
 }
 set viewer "v2d"
-
-set Center_o_1 0; set Center_o_2 0; 
-set Axis_o_1 0; set Axis_o_2 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; 
-set YAxis_o_1 -1; set YAxis_o_2 0; 
-set LastParam_o_1 67.2749994932561; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{0 0} {0 1} {0 1} {-1 0} {67.2749994932561}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/C3 b/tests/geometry/parabola/C3
index 9b4d042002..0c6ab8a3d6 100644
--- a/tests/geometry/parabola/C3
+++ b/tests/geometry/parabola/C3
@@ -1,10 +1,4 @@
 parabola result 70 1  0  1 10
 2drotate result 0 0 90
 set viewer "v2d"
-
-set Center_o_1 -0.999999999999996; set Center_o_2 70; 
-set Axis_o_1 -1; set Axis_o_2 6.12303176911189e-17; 
-set XAxis_o_1 -1; set XAxis_o_2 6.12303176911189e-17; 
-set YAxis_o_1 -6.12303176911189e-17; set YAxis_o_2 -1; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-0.999999999999996 70} {-1 6.12303176911189e-17} {-1 6.12303176911189e-17} {-6.12303176911189e-17 -1} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/C4 b/tests/geometry/parabola/C4
index f3d03f5124..e9748eee9a 100644
--- a/tests/geometry/parabola/C4
+++ b/tests/geometry/parabola/C4
@@ -1,10 +1,4 @@
 parabola result 70 1  0  1 10
 2dtranslate result -200 0
 set viewer "v2d"
-
-set Center_o_1 -130; set Center_o_2 1; 
-set Axis_o_1 0; set Axis_o_2 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; 
-set YAxis_o_1 -1; set YAxis_o_2 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-130 1} {0 1} {0 1} {-1 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/C5 b/tests/geometry/parabola/C5
index f2f406dc9a..45ecc5f0ee 100644
--- a/tests/geometry/parabola/C5
+++ b/tests/geometry/parabola/C5
@@ -1,9 +1,3 @@
 parabola result 70 1 0  0 0 1   0 1 0   10
 lmirror result 0 0 0  0 1  0
-
-set Center_o_1 -70; set Center_o_2 1; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 0; set Axis_o_3 -1; 
-set XAxis_o_1 0; set XAxis_o_2 1; set XAxis_o_3 0; 
-set YAxis_o_1 1; set YAxis_o_2 0; set YAxis_o_3 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-70 1 0} {0 0 -1} {0 1 0} {1 0 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/C6 b/tests/geometry/parabola/C6
index 2fb770b40d..fb80fc9284 100644
--- a/tests/geometry/parabola/C6
+++ b/tests/geometry/parabola/C6
@@ -1,9 +1,3 @@
 parabola result 70 1 0  0 0 1   0 1 0   10
 pmirror result 0 0 0
-
-set Center_o_1 -70; set Center_o_2 -1; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 -0; set Axis_o_3 1; 
-set XAxis_o_1 -0; set XAxis_o_2 -1; set XAxis_o_3 -0; 
-set YAxis_o_1 1; set YAxis_o_2 -0; set YAxis_o_3 -0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-70 -1 0} {0 -0 1} {-0 -1 -0} {1 -0 -0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/C7 b/tests/geometry/parabola/C7
index 9c56046fcc..44f461d61d 100644
--- a/tests/geometry/parabola/C7
+++ b/tests/geometry/parabola/C7
@@ -1,11 +1,5 @@
 parabola result 70 1 0  0 0 1   0 1 0   10
 repeat 7 {rotate result 0 0 0 0 0 1 45;
-	copy result .;
+    copy result .;
 }
-
-set Center_o_1 50.2045814642448; set Center_o_2 -48.7903679018718; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 -0; set Axis_o_3 1; 
-set XAxis_o_1 0.707106781186548; set XAxis_o_2 0.707106781186547; set XAxis_o_3 0; 
-set YAxis_o_1 -0.707106781186547; set YAxis_o_2 0.707106781186548; set YAxis_o_3 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{50.2045814642448 -48.7903679018718 0} {0 -0 1} {0.707106781186548 0.707106781186547 0} {-0.707106781186547 0.707106781186548 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/C8 b/tests/geometry/parabola/C8
index 9709191a2e..da532ced70 100644
--- a/tests/geometry/parabola/C8
+++ b/tests/geometry/parabola/C8
@@ -2,10 +2,4 @@ parabola result 70 1 0  0 0 1   0 1 0   10
 pscale result 0 0 0 5
 repeat 4 {pl}
 dmode result U
-
-set Center_o_1 350; set Center_o_2 5; set Center_o_3 0; 
-set Axis_o_1 0; set Axis_o_2 -0; set Axis_o_3 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; set XAxis_o_3 0; 
-set YAxis_o_1 -1; set YAxis_o_2 0; set YAxis_o_3 0; 
-set LastParam_o_1 50; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{350 5 0} {0 -0 1} {0 1 0} {-1 0 0} {50}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/C9 b/tests/geometry/parabola/C9
index 3c47f4b67e..48337cc1cd 100644
--- a/tests/geometry/parabola/C9
+++ b/tests/geometry/parabola/C9
@@ -1,9 +1,3 @@
 parabola result 70 1 0  0 0 1   0 1 0   10
 smirror result 0 0 0 1 0 -1
-
-set Center_o_1 -1.55431223447522e-14; set Center_o_2 1; set Center_o_3 70; 
-set Axis_o_1 -1; set Axis_o_2 -0; set Axis_o_3 -2.22044604925031e-16; 
-set XAxis_o_1 -0; set XAxis_o_2 1; set XAxis_o_3 -0; 
-set YAxis_o_1 2.22044604925031e-16; set YAxis_o_2 0; set YAxis_o_3 -1; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{-1.55431223447522e-14 1 70} {-1 -0 -2.22044604925031e-16} {-0 1 -0} {2.22044604925031e-16 0 -1} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/D1 b/tests/geometry/parabola/D1
index 1d0c261b94..931672c0c5 100644
--- a/tests/geometry/parabola/D1
+++ b/tests/geometry/parabola/D1
@@ -1,9 +1,3 @@
 parabola result 70 1 0  0 0 1   0 1 0   10
 translate result 0 -100 200
-
-set Center_o_1 70; set Center_o_2 -99; set Center_o_3 200; 
-set Axis_o_1 0; set Axis_o_2 -0; set Axis_o_3 1; 
-set XAxis_o_1 0; set XAxis_o_2 1; set XAxis_o_3 0; 
-set YAxis_o_1 -1; set YAxis_o_2 0; set YAxis_o_3 0; 
-set LastParam_o_1 10; 
-
+checkdump result -name {Center Axis XAxis YAxis Focal} -ref {{70 -99 200} {0 -0 1} {0 1 0} {-1 0 0} {10}} -eps 0.01
\ No newline at end of file
diff --git a/tests/geometry/parabola/begin b/tests/geometry/parabola/begin
index 268981a87d..f96443c237 100644
--- a/tests/geometry/parabola/begin
+++ b/tests/geometry/parabola/begin
@@ -1,2 +1 @@
-set viewer "smallview"
-set type "infinite"
+set viewer "smallview"
\ No newline at end of file
diff --git a/tests/geometry/project/A1 b/tests/geometry/project/A1
index f897912399..9964abfb46 100644
--- a/tests/geometry/project/A1
+++ b/tests/geometry/project/A1
@@ -1,5 +1,5 @@
 restore [locate_data_file pro5075_bug-proj4-curve1.rle] curv1
 restore [locate_data_file pro5075_bug-proj4-surface.rle] surf1
 project result curv1 surf1 -v 50
-set length 0.062450996195736283
+checklength result -l 0.062450996195736283
 
diff --git a/tests/geometry/project/A2 b/tests/geometry/project/A2
index 11b4f21b10..e17260e70f 100644
--- a/tests/geometry/project/A2
+++ b/tests/geometry/project/A2
@@ -1,5 +1,5 @@
 restore [locate_data_file pro5075_bug-proj4-curve2.rle] curv1
 restore [locate_data_file pro5075_bug-proj4-surface.rle] surf1
 project result curv1 surf1 -v 50
-set length 1.2463576545507855
+checklength result -l 1.2463576545507855
 
diff --git a/tests/geometry/project/A3 b/tests/geometry/project/A3
index b4b0c2ee16..7a42284083 100644
--- a/tests/geometry/project/A3
+++ b/tests/geometry/project/A3
@@ -1,5 +1,5 @@
 restore [locate_data_file pro5102_bug-proj5-curve.rle] curv1
 restore [locate_data_file pro5102_bug-proj5-surface.rle] surf1
 project result curv1 surf1 -v 50
-set length 3.1415926535897993
+checklength result -l 3.1415926535897993
 
diff --git a/tests/geometry/project/A4 b/tests/geometry/project/A4
index afaa4801af..f8130a865f 100644
--- a/tests/geometry/project/A4
+++ b/tests/geometry/project/A4
@@ -1,5 +1,5 @@
 restore [locate_data_file pro5103_bug-proj6-curve.rle] curv1
 restore [locate_data_file pro5103_bug-proj6-surface.rle] surf1
 project result curv1 surf1 -v 50
-set length 0.0074999999675910405
+checklength result -l 0.0074999999675910405
 
diff --git a/tests/geometry/project/A5 b/tests/geometry/project/A5
index f897912399..9964abfb46 100644
--- a/tests/geometry/project/A5
+++ b/tests/geometry/project/A5
@@ -1,5 +1,5 @@
 restore [locate_data_file pro5075_bug-proj4-curve1.rle] curv1
 restore [locate_data_file pro5075_bug-proj4-surface.rle] surf1
 project result curv1 surf1 -v 50
-set length 0.062450996195736283
+checklength result -l 0.062450996195736283
 
diff --git a/tests/geometry/project/A6 b/tests/geometry/project/A6
index 11b4f21b10..e17260e70f 100644
--- a/tests/geometry/project/A6
+++ b/tests/geometry/project/A6
@@ -1,5 +1,5 @@
 restore [locate_data_file pro5075_bug-proj4-curve2.rle] curv1
 restore [locate_data_file pro5075_bug-proj4-surface.rle] surf1
 project result curv1 surf1 -v 50
-set length 1.2463576545507855
+checklength result -l 1.2463576545507855
 
diff --git a/tests/geometry/project/A7 b/tests/geometry/project/A7
index b4b0c2ee16..7a42284083 100644
--- a/tests/geometry/project/A7
+++ b/tests/geometry/project/A7
@@ -1,5 +1,5 @@
 restore [locate_data_file pro5102_bug-proj5-curve.rle] curv1
 restore [locate_data_file pro5102_bug-proj5-surface.rle] surf1
 project result curv1 surf1 -v 50
-set length 3.1415926535897993
+checklength result -l 3.1415926535897993
 
diff --git a/tests/geometry/project/A8 b/tests/geometry/project/A8
index afaa4801af..f8130a865f 100644
--- a/tests/geometry/project/A8
+++ b/tests/geometry/project/A8
@@ -1,5 +1,5 @@
 restore [locate_data_file pro5103_bug-proj6-curve.rle] curv1
 restore [locate_data_file pro5103_bug-proj6-surface.rle] surf1
 project result curv1 surf1 -v 50
-set length 0.0074999999675910405
+checklength result -l 0.0074999999675910405
 
diff --git a/tests/geometry/project/begin b/tests/geometry/project/begin
index d10da1fde9..2fecf221ef 100644
--- a/tests/geometry/project/begin
+++ b/tests/geometry/project/begin
@@ -1,2 +1 @@
-set viewer "v2d"
-set type "finite"
+set viewer "v2d"
\ No newline at end of file
diff --git a/tests/geometry/revsurf/begin b/tests/geometry/revsurf/begin
index 0053992f8a..f96443c237 100644
--- a/tests/geometry/revsurf/begin
+++ b/tests/geometry/revsurf/begin
@@ -1,2 +1 @@
-set viewer "smallview"
-set type "finite"
+set viewer "smallview"
\ No newline at end of file