diff --git a/tests/boolean/bcut_simple/L9 b/tests/boolean/bcut_simple/L9
index e9b2ac045d..002d18f033 100644
--- a/tests/boolean/bcut_simple/L9
+++ b/tests/boolean/bcut_simple/L9
@@ -25,6 +25,5 @@ add se Solid1
 shape result CS
 add b2 result
 add Solid1 result
-nbshapes result
 
 set square 750
diff --git a/tests/boolean/bcut_simple/M1 b/tests/boolean/bcut_simple/M1
index e079a3e377..1a933b1120 100644
--- a/tests/boolean/bcut_simple/M1
+++ b/tests/boolean/bcut_simple/M1
@@ -21,6 +21,5 @@ add se_1 Solid1
 shape result CS 
 add b2 result
 add Solid1 result
-nbshapes result
 
 set square 750
diff --git a/tests/bugs/caf/bug21707 b/tests/bugs/caf/bug21707
index dc0d4642df..6b7d5ccedd 100644
--- a/tests/bugs/caf/bug21707
+++ b/tests/bugs/caf/bug21707
@@ -75,6 +75,7 @@ set Sel11 [AttachShape D Pr_10 ${Prism} ${Prism} 0]
 
 GetShape D $Cut1:2 result
 
-set nb_v_good 10
+checknbshapes result -vertex 10
+
 set 2dviewer 0
 
diff --git a/tests/bugs/demo/bug23562_1 b/tests/bugs/demo/bug23562_1
index bb24693a9a..3eac8ad94c 100755
--- a/tests/bugs/demo/bug23562_1
+++ b/tests/bugs/demo/bug23562_1
@@ -8,12 +8,4 @@ puts ""
 
 restore [locate_data_file bug23562_V3.brep] result
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 15
-set nb_f_good 15
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 103
+checknbshapes result -vertex 25 -edge 45 -wire 15 -face 15 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 103
diff --git a/tests/bugs/demo/bug23562_2 b/tests/bugs/demo/bug23562_2
index e950216515..f1c72109d3 100755
--- a/tests/bugs/demo/bug23562_2
+++ b/tests/bugs/demo/bug23562_2
@@ -8,12 +8,4 @@ puts ""
 
 restore [locate_data_file bug23562_V4.brep] result
 
-set nb_v_good 24
-set nb_e_good 43
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 110
+checknbshapes result -vertex 24 -edge 43 -wire 20 -face 20 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 110
diff --git a/tests/bugs/demo/bug23562_3 b/tests/bugs/demo/bug23562_3
index 067b07232d..af807b201e 100755
--- a/tests/bugs/demo/bug23562_3
+++ b/tests/bugs/demo/bug23562_3
@@ -8,13 +8,4 @@ puts ""
 
 restore [locate_data_file bug23562_V3.brep] result
 
-set nbsh_t 1
-set nb_v_good 31
-set nb_e_good 51
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 117
+checknbshapes result -t -vertex 31 -edge 51 -wire 16 -face 16 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 117
diff --git a/tests/bugs/demo/bug23562_4 b/tests/bugs/demo/bug23562_4
index b31dc7d416..3375a3696a 100755
--- a/tests/bugs/demo/bug23562_4
+++ b/tests/bugs/demo/bug23562_4
@@ -8,13 +8,4 @@ puts ""
 
 restore [locate_data_file bug23562_V4.brep] result
 
-set nbsh_t 1
-set nb_v_good 30
-set nb_e_good 49
-set nb_w_good 21
-set nb_f_good 21
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 124
+checknbshapes result -t -vertex 30 -edge 49 -wire 21 -face 21 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 124
diff --git a/tests/bugs/demo/bug23562_5 b/tests/bugs/demo/bug23562_5
index e53dcd54c0..4a862bbd0b 100755
--- a/tests/bugs/demo/bug23562_5
+++ b/tests/bugs/demo/bug23562_5
@@ -10,12 +10,4 @@ restore [locate_data_file bug23562_V3.brep] a
 explode a f
 compound a_1 a_16 result
 
-set nb_v_good 6
-set nb_e_good 6
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 15
+checknbshapes result -vertex 6 -edge 6 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 15
diff --git a/tests/bugs/demo/bug23562_6 b/tests/bugs/demo/bug23562_6
index 76aaf77a3d..b99477bf63 100755
--- a/tests/bugs/demo/bug23562_6
+++ b/tests/bugs/demo/bug23562_6
@@ -10,13 +10,4 @@ restore [locate_data_file bug23562_V3.brep] a
 explode a f
 compound a_1 a_16 result
 
-set nbsh_t 1
-set nb_v_good 12
-set nb_e_good 12
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 29
+checknbshapes result -t -vertex 12 -edge 12 -wire 2 -face 2 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 29
diff --git a/tests/bugs/end b/tests/bugs/end
index d225ba8a38..0feb1f5705 100755
--- a/tests/bugs/end
+++ b/tests/bugs/end
@@ -42,104 +42,6 @@ if { [info exists mass] } {
     }
 }
 
-set glob_inf [info global nb_*_good]
-if { [regexp "nb_.*_good" $glob_inf] == 1 } {
-    if { [info exists nbsh_t] } {
-      set nb_info [nbshapes result -t]
-    } else {
-      set nb_info [nbshapes result]
-    }
-}
-
-if { [info exists nb_v_good] } {
-    regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v
-    if { ${nb_v} != ${nb_v_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_v_good} vertices instead of ${nb_v}"
-    } else {
-        puts "Result shape contains ${nb_v} vertices"
-    }
-}
-
-if { [info exists nb_e_good] } {
-    regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full nb_e
-    if { ${nb_e} != ${nb_e_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_e_good} edges instead of ${nb_e}"
-    } else {
-        puts "Result shape contains ${nb_e} edges"
-    }
-}
-
-if { [info exists nb_w_good] } {
-    regexp {WIRE +: +([-0-9.+eE]+)} $nb_info full nb_w
-    if { ${nb_w} != ${nb_w_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_w_good} wires instead of ${nb_w}"
-    } else {
-        puts "Result shape contains ${nb_w} wires"
-    }
-}
-
-if { [info exists nb_f_good] } {
-    regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_f
-    if { ${nb_f} != ${nb_f_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_f_good} faces instead of ${nb_f}"
-    } else {
-        puts "Result shape contains ${nb_f} faces"
-    }
-}
-
-if { [info exists nb_sh_good] } {
-    regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_sh
-    if { ${nb_sh} != ${nb_sh_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_sh_good} shells instead of ${nb_sh}"
-    } else {
-        puts "Result shape contains ${nb_sh} shells"
-    }
-}
-
-if { [info exists nb_sol_good] } {
-    regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_sol
-    if { ${nb_sol} != ${nb_sol_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_sol_good} solids instead of ${nb_sol}"
-    } else {
-        puts "Result shape contains ${nb_sol} solids"
-    }
-}
-
-if { [info exists nb_compsol_good] } {
-    regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nb_compsol
-    if { ${nb_compsol} != ${nb_compsol_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_compsol_good} compsolids instead of ${nb_compsol}"
-    } else {
-        puts "Result shape contains ${nb_compsol} compsolids"
-    }
-}
-
-if { [info exists nb_compound_good] } {
-    regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound
-    if { ${nb_compound} != ${nb_compound_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_compound_good} compounds instead of ${nb_compound}"
-    } else {
-        puts "Result shape contains ${nb_compound} compounds"
-    }
-}
-
-if { [info exists nb_shape_good] } {
-    regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_shape
-    if { ${nb_shape} != ${nb_shape_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_shape_good} shapes instead of ${nb_shape}"
-    } else {
-        puts "Result shape contains ${nb_shape} shapes"
-    }
-}
-
-if { [info exists nb_fe_good] && [info exists nb_fe] } {
-    if { ${nb_fe} != ${nb_fe_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_shape_good} shapes instead of ${nb_shape}"
-    } else {
-        puts "Result shape contains ${nb_fe} free edges"
-    }
-}
-
 if { [info exists rel_tol] } {
    puts "\nChecking triangulation area (triarea command)..."
    set rel_err [expr abs([CheckTriArea result $area_eps])]
diff --git a/tests/bugs/fclasses/bug23192_1 b/tests/bugs/fclasses/bug23192_1
index 6b250902f5..9ff684a281 100755
--- a/tests/bugs/fclasses/bug23192_1
+++ b/tests/bugs/fclasses/bug23192_1
@@ -24,16 +24,7 @@ catch {exec chmod 777 ${aFile}}
 if { [file exists ${aFile}] } {
   readstl result ${aFile}
 
-set nb_v_good 8
-set nb_e_good 18
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 51
-
+checknbshapes result -vertex 8 -edge 18 -wire 12 -face 12 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 51
   # Check file size
   set size_status 0
   set filesize [ file size ${aFile} ]
diff --git a/tests/bugs/fclasses/bug23192_2 b/tests/bugs/fclasses/bug23192_2
index 158cd5e356..c9c2ac8b73 100755
--- a/tests/bugs/fclasses/bug23192_2
+++ b/tests/bugs/fclasses/bug23192_2
@@ -24,16 +24,7 @@ catch {exec chmod 777 ${aFile}}
 if { [file exists ${aFile}] } {
   readstl result ${aFile}
 
-set nb_v_good 8
-set nb_e_good 18
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 51
-
+checknbshapes result -vertex 8 -edge 18 -wire 12 -face 12 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 51
   # Check file size
   set size_status 0
   set filesize [ file size ${aFile} ]
diff --git a/tests/bugs/fclasses/bug25367_brep b/tests/bugs/fclasses/bug25367_brep
index fccfa75a3b..3119cdd8c1 100644
--- a/tests/bugs/fclasses/bug25367_brep
+++ b/tests/bugs/fclasses/bug25367_brep
@@ -18,16 +18,7 @@ brestore ${NameFile} result
 
 set square 6
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 34
-
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 34
 file delete -force [glob -nocomplain ${NameFile}]
 
 set 2dviewer 1
diff --git a/tests/bugs/fclasses/bug25367_igs b/tests/bugs/fclasses/bug25367_igs
index c7c27037f3..802e11131b 100644
--- a/tests/bugs/fclasses/bug25367_igs
+++ b/tests/bugs/fclasses/bug25367_igs
@@ -22,16 +22,7 @@ igesbrep ${NameFile} result *
 
 set square 6
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 34
-
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 34
 file delete -force [glob -nocomplain ${NameFile}]
 
 set 2dviewer 1
diff --git a/tests/bugs/heal/bug24105_1 b/tests/bugs/heal/bug24105_1
index d77be6d7c6..2f784324de 100755
--- a/tests/bugs/heal/bug24105_1
+++ b/tests/bugs/heal/bug24105_1
@@ -17,14 +17,5 @@ fixshape result s
 
 set square 313292
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 52
-
+checknbshapes result -vertex 12 -edge 20 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 52
 set 2dviewer 1
diff --git a/tests/bugs/heal/bug24105_2 b/tests/bugs/heal/bug24105_2
index fcb2067ba4..8cab42f61c 100755
--- a/tests/bugs/heal/bug24105_2
+++ b/tests/bugs/heal/bug24105_2
@@ -17,14 +17,5 @@ fixshape result s
 
 set square 123446
 
-set nb_v_good 33
-set nb_e_good 52
-set nb_w_good 23
-set nb_f_good 21
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 132
-
+checknbshapes result -vertex 33 -edge 52 -wire 23 -face 21 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 132
 set 2dviewer 1
diff --git a/tests/bugs/heal/bug24111 b/tests/bugs/heal/bug24111
index e9de63c42b..613c1e5e0c 100755
--- a/tests/bugs/heal/bug24111
+++ b/tests/bugs/heal/bug24111
@@ -14,14 +14,5 @@ fixshape result a
 
 set square 15902.8
 
-set nb_v_good 14
-set nb_e_good 15
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 31
-
+checknbshapes result -vertex 14 -edge 15 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 31
 set 2dviewer 1
diff --git a/tests/bugs/heal/bug25424 b/tests/bugs/heal/bug25424
index d69b7285e9..93aa502371 100755
--- a/tests/bugs/heal/bug25424
+++ b/tests/bugs/heal/bug25424
@@ -38,14 +38,5 @@ if { $z > ${max_time} } {
 
 set square 6998.53
 
-set nb_v_good 4482
-set nb_e_good 6781
-set nb_w_good 2309
-set nb_f_good 2305
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 15879
-
+checknbshapes result -vertex 4482 -edge 6781 -wire 2309 -face 2305 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 15879
 set 3dviewer 1
diff --git a/tests/bugs/heal/bug26572 b/tests/bugs/heal/bug26572
index 65d21dd16d..e77326df1e 100644
--- a/tests/bugs/heal/bug26572
+++ b/tests/bugs/heal/bug26572
@@ -8,8 +8,6 @@ puts ""
 
 restore [locate_data_file bug26572_issue_12_new_input.brep] s
 
-nbshapes s -t
-
 smallview
 donly s
 fit
diff --git a/tests/bugs/heal/bug26644 b/tests/bugs/heal/bug26644
index bd6400f26b..30f7a01d58 100644
--- a/tests/bugs/heal/bug26644
+++ b/tests/bugs/heal/bug26644
@@ -11,8 +11,6 @@ restore [locate_data_file bug26644_input.brep] a
 # 1
 checkarea a 158.466 1e-1 0.01
 
-nbshapes a -t
-
 vinit
 vsetdispmode 1
 vclear
diff --git a/tests/bugs/iges/bug17026_1 b/tests/bugs/iges/bug17026_1
index f680c37b7f..dd259fe0fc 100755
--- a/tests/bugs/iges/bug17026_1
+++ b/tests/bugs/iges/bug17026_1
@@ -10,15 +10,6 @@ igesread [locate_data_file OCC17026-1.igs] a *
 tpcompound result
 
 set square 8.76948e+09
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 30
-
+checknbshapes result -vertex 8 -edge 12 -wire 4 -face 4 -shell 0 -solid 0 -compsolid 0 -compound 2 -shape 30
 set 2dviewer 0
 
diff --git a/tests/bugs/iges/bug17026_2 b/tests/bugs/iges/bug17026_2
index 98f7f9bc1f..2538f147a3 100755
--- a/tests/bugs/iges/bug17026_2
+++ b/tests/bugs/iges/bug17026_2
@@ -10,15 +10,6 @@ igesread [locate_data_file OCC17026-2.igs] a *
 tpcompound result
 
 set square 8.80533e+09
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 30
-
+checknbshapes result -vertex 8 -edge 12 -wire 4 -face 4 -shell 0 -solid 0 -compsolid 0 -compound 2 -shape 30
 set 2dviewer 0
 
diff --git a/tests/bugs/iges/bug17026_3 b/tests/bugs/iges/bug17026_3
index afa4a8c051..e7ce109d8f 100755
--- a/tests/bugs/iges/bug17026_3
+++ b/tests/bugs/iges/bug17026_3
@@ -11,14 +11,5 @@ igesread [locate_data_file OCC17026-3.iges] a *
 tpcompound result
 
 set square 7.72668e+08
-set nb_v_good 175
-set nb_e_good 175
-set nb_w_good 38
-set nb_f_good 38
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 428
-
+checknbshapes result -vertex 175 -edge 175 -wire 38 -face 38 -shell 0 -solid 0 -compsolid 0 -compound 2 -shape 428
 set 2dviewer 0
diff --git a/tests/bugs/iges/bug17026_4 b/tests/bugs/iges/bug17026_4
index c37c7aac62..ccc65f1be1 100755
--- a/tests/bugs/iges/bug17026_4
+++ b/tests/bugs/iges/bug17026_4
@@ -10,14 +10,5 @@ igesread [locate_data_file OCC17026-4.iges] a *
 tpcompound result
 
 set square 7.72668e+08
-set nb_v_good 175
-set nb_e_good 175
-set nb_w_good 38
-set nb_f_good 38
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 428
-
+checknbshapes result -vertex 175 -edge 175 -wire 38 -face 38 -shell 0 -solid 0 -compsolid 0 -compound 2 -shape 428
 set 2dviewer 0
diff --git a/tests/bugs/iges/bug23622_1 b/tests/bugs/iges/bug23622_1
index dacbcf010b..e124057afa 100755
--- a/tests/bugs/iges/bug23622_1
+++ b/tests/bugs/iges/bug23622_1
@@ -10,18 +10,7 @@ igesbrep [locate_data_file bug23622_seatmotor2.igs] s1 397
 
 renamevar s1_1 result
 
-nbshapes result
-
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 7
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7
 set tol [tolerance result ]
 regexp { *Tolerance +MAX=([-0-9.+eE]+)} ${tol} full max_tol
 puts "max_tol=${max_tol}"
diff --git a/tests/bugs/iges/bug23622_2 b/tests/bugs/iges/bug23622_2
index 1fc0c58989..f16e095dac 100755
--- a/tests/bugs/iges/bug23622_2
+++ b/tests/bugs/iges/bug23622_2
@@ -12,18 +12,7 @@ igesbrep [locate_data_file bug23622_seatmotor2.igs] s1 397
 
 renamevar s1_1 result
 
-nbshapes result
-
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 7
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7
 set tol [tolerance result ]
 regexp { *Tolerance +MAX=([-0-9.+eE]+)} ${tol} full max_tol
 puts "max_tol=${max_tol}"
diff --git a/tests/bugs/iges/bug5027_1 b/tests/bugs/iges/bug5027_1
index 2c13fa4446..8cd0e208d4 100755
--- a/tests/bugs/iges/bug5027_1
+++ b/tests/bugs/iges/bug5027_1
@@ -15,16 +15,7 @@ if [catch { igesread $filepath a * } res] {
     tpcompound result
     
     set square 159588
-    set nb_v_good 140
-    set nb_e_good 144
-    set nb_w_good 36
-    set nb_f_good 31
-    set nb_sh_good 0
-    set nb_sol_good 0
-    set nb_compsol_good 0
-    set nb_compound_good 1
-    set nb_shape_good 352
-    
+    checknbshapes result -vertex 140 -edge 144 -wire 36 -face 31 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 352
     set 2dviewer 0
 }
 
diff --git a/tests/bugs/iges/bug6508 b/tests/bugs/iges/bug6508
index 15e3f18dc1..0dc3c86d5a 100644
--- a/tests/bugs/iges/bug6508
+++ b/tests/bugs/iges/bug6508
@@ -11,6 +11,6 @@ tpcompound result
 
 checkshape result
 
-set nb_f_good 192
+checknbshapes result -face 192
 
 set 2dviewer 0
diff --git a/tests/bugs/mesh/bug23512_1 b/tests/bugs/mesh/bug23512_1
index 4bc65ddfbc..a3f86a4310 100644
--- a/tests/bugs/mesh/bug23512_1
+++ b/tests/bugs/mesh/bug23512_1
@@ -18,16 +18,7 @@ vdisplay result
 vaxo
 vfit
 
-set nb_v_good 6
-set nb_e_good 14
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 37
-
+checknbshapes result -vertex 6 -edge 14 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 37
 # relative tolerance (%)
 set rel_tol 1
 set area_eps 0
diff --git a/tests/bugs/mesh/bug23512_2 b/tests/bugs/mesh/bug23512_2
index 55f1fcde20..8ba2486d53 100644
--- a/tests/bugs/mesh/bug23512_2
+++ b/tests/bugs/mesh/bug23512_2
@@ -20,16 +20,7 @@ vdisplay result
 vaxo
 vfit
 
-set nb_v_good 6
-set nb_e_good 14
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 37
-
+checknbshapes result -vertex 6 -edge 14 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 37
 # relative tolerance (%)
 set rel_tol 1
 set area_eps 0
diff --git a/tests/bugs/mesh/bug25142 b/tests/bugs/mesh/bug25142
index 462f19ac81..83fbef514a 100644
--- a/tests/bugs/mesh/bug25142
+++ b/tests/bugs/mesh/bug25142
@@ -16,8 +16,6 @@ bfillds
 bbuild r
 explode r
 
-nbshapes r
-
 # do all possible checks of validity
 tolerance r
 checkshape r
diff --git a/tests/bugs/modalg_1/buc60787_1 b/tests/bugs/modalg_1/buc60787_1
index d9acffa6ee..a253a6a3ee 100755
--- a/tests/bugs/modalg_1/buc60787_1
+++ b/tests/bugs/modalg_1/buc60787_1
@@ -13,15 +13,7 @@ checkshape S1
 
 bcommon result S1 S2
 
-set nb_info [nbshapes result]
-regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full err
-regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full err1
-
-if { $err != 1 || $err1 != 1} {
-    puts "Faulty : result should be a shell, but not a compound of faces"
-} else {
-    puts "BUC60787 - OK"
-}
+checknbshapes result -shell 1 -compound 1 -m "result should be a shell, but not a compound of faces"
 
 set square 45000
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/buc60787_2 b/tests/bugs/modalg_1/buc60787_2
index f82ffd6404..5618ac3c1d 100755
--- a/tests/bugs/modalg_1/buc60787_2
+++ b/tests/bugs/modalg_1/buc60787_2
@@ -13,14 +13,7 @@ checkshape S2
 
 bcut result S1 S2
 
-set nb_info [nbshapes result]
-regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full err
-regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full err1
+checknbshapes result -shell 1 -compound 1 -m "result should be a shell, but not a compound of faces"
 
-if { $err != 1 || $err1 != 1} {
-    puts "Faulty : result should be a shell, but not a compound of faces"
-} else {
-    puts "BUC60787 - OK"
-}
 set square 150200
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/buc60788_2 b/tests/bugs/modalg_1/buc60788_2
index ba1aba774a..d89edcd8eb 100755
--- a/tests/bugs/modalg_1/buc60788_2
+++ b/tests/bugs/modalg_1/buc60788_2
@@ -13,14 +13,7 @@ checkshape S2
 
 bcut result S1 S2
 
-set nb_info [nbshapes result]
-regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full err
-regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full err1
+checknbshapes result -shell 1 -compound 1 -m "result should be a shell, but not a compound of faces"
 
-if { $err != 1 || $err1 != 1} {
-  puts "Faulty : result should be a shell, but not a compound of faces"
-} else {
-  puts "BUC60788 - OK"
-}
 set square 150200
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/buc60788_3 b/tests/bugs/modalg_1/buc60788_3
index c6468d0135..7774d150a6 100755
--- a/tests/bugs/modalg_1/buc60788_3
+++ b/tests/bugs/modalg_1/buc60788_3
@@ -13,14 +13,7 @@ checkshape S1
 
 bcommon result S1 S2
 
-set nb_info [nbshapes result]
-regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full err
-regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full err1
+checknbshapes result -shell 1 -compound 1 -m "result should be a shell, but not a compound of faces"
 
-if { $err != 1 || $err1 != 1} {
-    puts "Faulty : result should be a shell, but not a compound of faces"
-} else {
-    puts "BUC60788 - OK"
-}
 set square 45000
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/buc60865 b/tests/bugs/modalg_1/buc60865
index 0b3f61ac12..1cc8f1ab7e 100755
--- a/tests/bugs/modalg_1/buc60865
+++ b/tests/bugs/modalg_1/buc60865
@@ -15,14 +15,8 @@ plane pl 1.1 0.99999 1 0 1 0
 mkface f pl
 bsection result sh f
 
-set nb_info [nbshapes result]
-regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full ed
+checknbshapes result -edge 5 -m "SECTION operation"
 
-if {  $ed == 5 } {
-    puts  " BUC60865 : SECTION operation was made properly"
-} else {
-    puts "Faulty BUC60865: SECTION operation was made wrongly"
-}
 set length 4.5
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/buc60899_2 b/tests/bugs/modalg_1/buc60899_2
index 09757b8361..e8f726f592 100755
--- a/tests/bugs/modalg_1/buc60899_2
+++ b/tests/bugs/modalg_1/buc60899_2
@@ -44,12 +44,6 @@ bsection result crg cyl
 
 set nb_info [nbshapes result]
 regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full edgeness
-
-    #set fullness [ nbshapes res ]
-    #puts "$fullness"
-    #set qq [ lindex $fullness 0 ]
-    #set edgeness [ lindex $fullness 10 ]
-    # puts "$edgeness"
     
 if { $edgeness == 1  } {                                         
     puts "Shape is empty, it is Faulty result"                                                                               
diff --git a/tests/bugs/modalg_1/bug10160_1 b/tests/bugs/modalg_1/bug10160_1
index 98e2c133f6..a342807910 100755
--- a/tests/bugs/modalg_1/bug10160_1
+++ b/tests/bugs/modalg_1/bug10160_1
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10160"
@@ -46,14 +46,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 1.30062e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 20
-set nb_e_good 28
-set nb_w_good 16
-set nb_f_good 15
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 86
-
+checknbshapes result -vertex 20 -edge 28 -wire 16 -face 15 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 86
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10160_10 b/tests/bugs/modalg_1/bug10160_10
index a6f967858b..aefe58324f 100755
--- a/tests/bugs/modalg_1/bug10160_10
+++ b/tests/bugs/modalg_1/bug10160_10
@@ -41,14 +41,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 3.20326e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 116
-set nb_e_good 173
-set nb_w_good 67
-set nb_f_good 63
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 422
-
+checknbshapes result -vertex 116 -edge 173 -wire 67 -face 63 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 422
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10160_11 b/tests/bugs/modalg_1/bug10160_11
index 8172a4166e..64433bd4d2 100755
--- a/tests/bugs/modalg_1/bug10160_11
+++ b/tests/bugs/modalg_1/bug10160_11
@@ -41,14 +41,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 3.05154e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 96
-set nb_e_good 143
-set nb_w_good 51
-set nb_f_good 48
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 341
-
+checknbshapes result -vertex 96 -edge 143 -wire 51 -face 48 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 341
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10160_12 b/tests/bugs/modalg_1/bug10160_12
index e4c0243320..0d43964093 100755
--- a/tests/bugs/modalg_1/bug10160_12
+++ b/tests/bugs/modalg_1/bug10160_12
@@ -41,14 +41,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 6.38359e+06
 
 # Analysis of "nbshapes res"
-set nb_v_good 108
-set nb_e_good 161
-set nb_w_good 61
-set nb_f_good 60
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 397
-
+checknbshapes result -vertex 108 -edge 161 -wire 61 -face 60 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 397
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10160_2 b/tests/bugs/modalg_1/bug10160_2
index e85072e0ef..57f877cab2 100755
--- a/tests/bugs/modalg_1/bug10160_2
+++ b/tests/bugs/modalg_1/bug10160_2
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10160"
@@ -43,15 +43,6 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 4.75218e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 32
-set nb_e_good 60
-set nb_w_good 32
-set nb_f_good 29
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 156
-
+checknbshapes result -vertex 32 -edge 60 -wire 32 -face 29 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 156
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug10160_3 b/tests/bugs/modalg_1/bug10160_3
index bba4743bb5..2b123caf0b 100755
--- a/tests/bugs/modalg_1/bug10160_3
+++ b/tests/bugs/modalg_1/bug10160_3
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 puts "TODO OCC11111 ALL: Error : The square of result shape is"
 puts "============"
 puts "OCC10160"
@@ -43,14 +43,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 2.36194e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 24
-set nb_e_good 34
-set nb_w_good 20
-set nb_f_good 19
-set nb_sh_good 4
-set nb_sol_good 4
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 106
-
+checknbshapes result -vertex 24 -edge 34 -wire 20 -face 19 -shell 4 -solid 4 -compsolid 0 -compound 1 -shape 106
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10160_4 b/tests/bugs/modalg_1/bug10160_4
index c9f61a6334..ff66fff651 100755
--- a/tests/bugs/modalg_1/bug10160_4
+++ b/tests/bugs/modalg_1/bug10160_4
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC10160"
 puts "============"
@@ -43,14 +43,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 3.52471e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 24
-set nb_e_good 34
-set nb_w_good 20
-set nb_f_good 17
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 102
-
+checknbshapes result -vertex 24 -edge 34 -wire 20 -face 17 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 102
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10160_5 b/tests/bugs/modalg_1/bug10160_5
index cc01ffda6a..4fcada75af 100755
--- a/tests/bugs/modalg_1/bug10160_5
+++ b/tests/bugs/modalg_1/bug10160_5
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC10160"
 puts "============"
@@ -43,14 +43,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 784833
 
 # Analysis of "nbshapes res"
-set nb_v_good 53
-set nb_e_good 75
-set nb_w_good 38
-set nb_f_good 34
-set nb_sh_good 6
-set nb_sol_good 6
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 213
-
+checknbshapes result -vertex 53 -edge 75 -wire 38 -face 34 -shell 6 -solid 6 -compsolid 0 -compound 1 -shape 213
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10160_6 b/tests/bugs/modalg_1/bug10160_6
index 9613a54374..b56f3fc380 100755
--- a/tests/bugs/modalg_1/bug10160_6
+++ b/tests/bugs/modalg_1/bug10160_6
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC10160"
 puts "============"
@@ -42,16 +42,7 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 3.65961e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 121
-set nb_e_good 178
-set nb_w_good 65
-set nb_f_good 59
-set nb_sh_good 3
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 429
-
+checknbshapes result -vertex 121 -edge 178 -wire 65 -face 59 -shell 3 -solid 2 -compsolid 0 -compound 1 -shape 429
 set 2dviewer 0
 
 
diff --git a/tests/bugs/modalg_1/bug10160_7 b/tests/bugs/modalg_1/bug10160_7
index 751c3ed39b..4e4eb6773f 100755
--- a/tests/bugs/modalg_1/bug10160_7
+++ b/tests/bugs/modalg_1/bug10160_7
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10160"
@@ -43,14 +43,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 3.05118e+07
 
 # Analysis of "nbshapes res"
-set nb_v_good 61
-set nb_e_good 87
-set nb_w_good 44
-set nb_f_good 36
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 231
-
+checknbshapes result -vertex 61 -edge 87 -wire 44 -face 36 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 231
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10160_8 b/tests/bugs/modalg_1/bug10160_8
index e2b97189cd..4e230f5cd1 100755
--- a/tests/bugs/modalg_1/bug10160_8
+++ b/tests/bugs/modalg_1/bug10160_8
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC10160"
 puts "============"
@@ -42,14 +42,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 6.87093e+06
 
 # Analysis of "nbshapes res"
-set nb_v_good 113
-set nb_e_good 166
-set nb_w_good 59
-set nb_f_good 57
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 398
-
+checknbshapes result -vertex 113 -edge 166 -wire 59 -face 57 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 398
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10160_9 b/tests/bugs/modalg_1/bug10160_9
index eb5f66f169..f5084b159b 100755
--- a/tests/bugs/modalg_1/bug10160_9
+++ b/tests/bugs/modalg_1/bug10160_9
@@ -41,14 +41,5 @@ puts "CPU_user_time=${CPU_user_time}"
 set square 4.86635e+06
 
 # Analysis of "nbshapes res"
-set nb_v_good 88
-set nb_e_good 131
-set nb_w_good 45
-set nb_f_good 45
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 312
-
+checknbshapes result -vertex 88 -edge 131 -wire 45 -face 45 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 312
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10232 b/tests/bugs/modalg_1/bug10232
index 483de734d0..52144c3a5d 100755
--- a/tests/bugs/modalg_1/bug10232
+++ b/tests/bugs/modalg_1/bug10232
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10232"
@@ -24,15 +24,6 @@ puts "Finish boolean operation ..."
 
 set length 3331.35
 
-set nb_v_good 1197
-set nb_e_good 1182
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 2380
-
+checknbshapes result -vertex 1197 -edge 1182 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2380
 set 2dviewer 1
 
diff --git a/tests/bugs/modalg_1/bug10435_1 b/tests/bugs/modalg_1/bug10435_1
index 4605e60820..56986c2ab2 100755
--- a/tests/bugs/modalg_1/bug10435_1
+++ b/tests/bugs/modalg_1/bug10435_1
@@ -23,15 +23,7 @@ if { [catch {fillet result a ${radius} a_10 ${radius} a_15 ${radius} a_16 } catc
     set square 36455.2
 
     # Analysis of "nbshapes res"
-    set nb_v_good 12
-    set nb_e_good 19
-    set nb_w_good 11
-    set nb_f_good 10
-    set nb_sh_good 1
-    set nb_sol_good 1
-    set nb_compsol_good 0
-    set nb_compound_good 1
-    set nb_shape_good 55
+    checknbshapes result -vertex 12 -edge 19 -wire 11 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 55
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10435_2 b/tests/bugs/modalg_1/bug10435_2
index ae6577a41b..91a176239e 100755
--- a/tests/bugs/modalg_1/bug10435_2
+++ b/tests/bugs/modalg_1/bug10435_2
@@ -20,15 +20,6 @@ puts "Finish fillet ..."
 set square 36455.2
 
 # Analysis of "nbshapes res"
-set nb_v_good 12
-set nb_e_good 19
-set nb_w_good 11
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 55
-
+checknbshapes result -vertex 12 -edge 19 -wire 11 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 55
 set 2dviewer 1
 
diff --git a/tests/bugs/modalg_1/bug10605_1 b/tests/bugs/modalg_1/bug10605_1
index 023a6ecad7..e07abbd3d7 100755
--- a/tests/bugs/modalg_1/bug10605_1
+++ b/tests/bugs/modalg_1/bug10605_1
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 233.798
 
 # Analysis of "nbshapes res"
-set nb_v_good 10
-set nb_e_good 15
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 42
-
+checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 42
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10605_2 b/tests/bugs/modalg_1/bug10605_2
index af3bae240b..0f131c8842 100755
--- a/tests/bugs/modalg_1/bug10605_2
+++ b/tests/bugs/modalg_1/bug10605_2
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 838.752
 
 # Analysis of "nbshapes res"
-set nb_v_good 15
-set nb_e_good 22
-set nb_w_good 10
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 59
-
+checknbshapes result -vertex 15 -edge 22 -wire 10 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 59
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10605_3 b/tests/bugs/modalg_1/bug10605_3
index ed50c6eb71..80bfac3b00 100755
--- a/tests/bugs/modalg_1/bug10605_3
+++ b/tests/bugs/modalg_1/bug10605_3
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 779.887
 
 # Analysis of "nbshapes res"
-set nb_v_good 13
-set nb_e_good 19
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 50
-
+checknbshapes result -vertex 13 -edge 19 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 50
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10605_4 b/tests/bugs/modalg_1/bug10605_4
index eb432e0348..23b46d0bb5 100755
--- a/tests/bugs/modalg_1/bug10605_4
+++ b/tests/bugs/modalg_1/bug10605_4
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 292.663
 
 # Analysis of "nbshapes res"
-set nb_v_good 12
-set nb_e_good 18
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 53
-
+checknbshapes result -vertex 12 -edge 18 -wire 9 -face 9 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 53
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10605_5 b/tests/bugs/modalg_1/bug10605_5
index 3f6d3b4929..c95ecf869f 100755
--- a/tests/bugs/modalg_1/bug10605_5
+++ b/tests/bugs/modalg_1/bug10605_5
@@ -20,14 +20,5 @@ puts "Finish boolean operation ..."
 
 set length 59.8334
 # Analysis of "nbshapes res"
-set nb_v_good 9
-set nb_e_good 9
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 19
-
+checknbshapes result -vertex 9 -edge 9 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 19
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10606_1 b/tests/bugs/modalg_1/bug10606_1
index 2196de4079..718e69d1a2 100755
--- a/tests/bugs/modalg_1/bug10606_1
+++ b/tests/bugs/modalg_1/bug10606_1
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 66.672
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
-set nb_e_good 8
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 21
-
+checknbshapes result -vertex 6 -edge 8 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 21
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10606_2 b/tests/bugs/modalg_1/bug10606_2
index b2e880752c..3badf3f4af 100755
--- a/tests/bugs/modalg_1/bug10606_2
+++ b/tests/bugs/modalg_1/bug10606_2
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 1450.22
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 25
-
+checknbshapes result -vertex 6 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 25
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10606_3 b/tests/bugs/modalg_1/bug10606_3
index ca14f2ea3c..909dd78539 100755
--- a/tests/bugs/modalg_1/bug10606_3
+++ b/tests/bugs/modalg_1/bug10606_3
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 761.355
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
-set nb_e_good 8
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 23
-
+checknbshapes result -vertex 6 -edge 8 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 23
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10606_4 b/tests/bugs/modalg_1/bug10606_4
index 144937b15e..a2f533c782 100755
--- a/tests/bugs/modalg_1/bug10606_4
+++ b/tests/bugs/modalg_1/bug10606_4
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 755.54
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
-set nb_e_good 8
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 23
-
+checknbshapes result -vertex 6 -edge 8 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 23
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10606_5 b/tests/bugs/modalg_1/bug10606_5
index 46e467e4a7..737ba2921b 100755
--- a/tests/bugs/modalg_1/bug10606_5
+++ b/tests/bugs/modalg_1/bug10606_5
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set length 18.3861
 
 # Analysis of "nbshapes res"
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 9
-
+checknbshapes result -vertex 4 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10842_1 b/tests/bugs/modalg_1/bug10842_1
index a269905008..0b94791701 100755
--- a/tests/bugs/modalg_1/bug10842_1
+++ b/tests/bugs/modalg_1/bug10842_1
@@ -1,4 +1,4 @@
-puts "TODO OCC111111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC111111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10842"
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 set square 2312.93
 
 # Analysis of "nbshapes res"
-set nb_v_good 7
-set nb_e_good 9
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 27
-
+checknbshapes result -vertex 7 -edge 9 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 27
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10842_2 b/tests/bugs/modalg_1/bug10842_2
index 85e0e6fd46..636099095f 100755
--- a/tests/bugs/modalg_1/bug10842_2
+++ b/tests/bugs/modalg_1/bug10842_2
@@ -1,4 +1,4 @@
-puts "TODO OCC111111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC111111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10842"
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 set square 27919.7
 
 # Analysis of "nbshapes res"
-set nb_v_good 15
-set nb_e_good 21
-set nb_w_good 7
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 52
-
+checknbshapes result -vertex 15 -edge 21 -wire 7 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 52
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10842_3 b/tests/bugs/modalg_1/bug10842_3
index 0dd94602c8..87ffb08bf6 100755
--- a/tests/bugs/modalg_1/bug10842_3
+++ b/tests/bugs/modalg_1/bug10842_3
@@ -1,4 +1,4 @@
-puts "TODO OCC111111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC111111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10842"
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 set square 18757.7
 
 # Analysis of "nbshapes res"
-set nb_v_good 13
-set nb_e_good 18
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 46
-
+checknbshapes result -vertex 13 -edge 18 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 46
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10842_4 b/tests/bugs/modalg_1/bug10842_4
index df6e78c140..f006e03f72 100755
--- a/tests/bugs/modalg_1/bug10842_4
+++ b/tests/bugs/modalg_1/bug10842_4
@@ -1,4 +1,4 @@
-puts "TODO OCC111111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC111111 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC10842"
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 set square 11475
 
 # Analysis of "nbshapes res"
-set nb_v_good 9
-set nb_e_good 12
-set nb_w_good 5
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 33
-
+checknbshapes result -vertex 9 -edge 12 -wire 5 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 33
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10842_5 b/tests/bugs/modalg_1/bug10842_5
index 87cddb120d..dd9f985038 100755
--- a/tests/bugs/modalg_1/bug10842_5
+++ b/tests/bugs/modalg_1/bug10842_5
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set length 122.816
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
-set nb_e_good 6
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 13
-
+checknbshapes result -vertex 6 -edge 6 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 13
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10846_1 b/tests/bugs/modalg_1/bug10846_1
index 151d20a9aa..9ab9ccc273 100755
--- a/tests/bugs/modalg_1/bug10846_1
+++ b/tests/bugs/modalg_1/bug10846_1
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 183.567
 
 # Analysis of "nbshapes res"
-set nb_v_good 18
-set nb_e_good 31
-set nb_w_good 19
-set nb_f_good 19
-set nb_sh_good 6
-set nb_sol_good 6
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 100
-
+checknbshapes result -vertex 18 -edge 31 -wire 19 -face 19 -shell 6 -solid 6 -compsolid 0 -compound 1 -shape 100
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10846_2 b/tests/bugs/modalg_1/bug10846_2
index 17e59f1ef0..bad7575dba 100755
--- a/tests/bugs/modalg_1/bug10846_2
+++ b/tests/bugs/modalg_1/bug10846_2
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 2309.97
 
 # Analysis of "nbshapes res"
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 15
-set nb_f_good 15
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 103
-
+checknbshapes result -vertex 25 -edge 45 -wire 15 -face 15 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 103
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10846_3 b/tests/bugs/modalg_1/bug10846_3
index c69041bca7..4239f10e0f 100755
--- a/tests/bugs/modalg_1/bug10846_3
+++ b/tests/bugs/modalg_1/bug10846_3
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 510.907
 
 # Analysis of "nbshapes res"
-set nb_v_good 24
-set nb_e_good 43
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 110
-
+checknbshapes result -vertex 24 -edge 43 -wire 20 -face 20 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 110
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug10846_4 b/tests/bugs/modalg_1/bug10846_4
index 0f277e7ddb..a8c3f27022 100755
--- a/tests/bugs/modalg_1/bug10846_4
+++ b/tests/bugs/modalg_1/bug10846_4
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 1982.63
 
 # Analysis of "nbshapes res"
-set nb_v_good 19
-set nb_e_good 33
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 83
-
+checknbshapes result -vertex 19 -edge 33 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 83
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug11565_1 b/tests/bugs/modalg_1/bug11565_1
index 6ca06f77c6..bb3241f0a4 100755
--- a/tests/bugs/modalg_1/bug11565_1
+++ b/tests/bugs/modalg_1/bug11565_1
@@ -13,15 +13,6 @@ bop a_1 a_2
 bopcut result
 
 set square 28.6255
-set nb_v_good 12
-set nb_e_good 12
-set nb_w_good 2
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 28
-
+checknbshapes result -vertex 12 -edge 12 -wire 2 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 28
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug11565_2 b/tests/bugs/modalg_1/bug11565_2
index 01bb884cb4..ee8a01ec08 100755
--- a/tests/bugs/modalg_1/bug11565_2
+++ b/tests/bugs/modalg_1/bug11565_2
@@ -13,15 +13,6 @@ bop a_1 a_3
 bopcut result
 
 set square 28.6438
-set nb_v_good 12
-set nb_e_good 12
-set nb_w_good 2
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 28
-
+checknbshapes result -vertex 12 -edge 12 -wire 2 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 28
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug12213 b/tests/bugs/modalg_1/bug12213
index d52e13b4ad..8ddd4d5f12 100755
--- a/tests/bugs/modalg_1/bug12213
+++ b/tests/bugs/modalg_1/bug12213
@@ -33,15 +33,6 @@ buildsweep result
 set square 15708.8
 
 # Analysis of "nbshapes res"
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 29
-
+checknbshapes result -vertex 8 -edge 12 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 29
 set 2dviewer 1
 
diff --git a/tests/bugs/modalg_1/bug12257 b/tests/bugs/modalg_1/bug12257
index 39214ff550..9cd0976d4b 100755
--- a/tests/bugs/modalg_1/bug12257
+++ b/tests/bugs/modalg_1/bug12257
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 set square 3394.17
 
 # Analysis of "nbshapes res"
-set nb_v_good 72
-set nb_e_good 109
-set nb_w_good 39
-set nb_f_good 39
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 262
-
+checknbshapes result -vertex 72 -edge 109 -wire 39 -face 39 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 262
 set 2dviewer 1
 
diff --git a/tests/bugs/modalg_1/bug12507 b/tests/bugs/modalg_1/bug12507
index bd1213fa47..ab48aae3c2 100755
--- a/tests/bugs/modalg_1/bug12507
+++ b/tests/bugs/modalg_1/bug12507
@@ -17,14 +17,5 @@ ttranslate e3 0 6 0
 bop c_3 e3
 bopfuse result
 
-set nb_v_good 3
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8
-
+checknbshapes result -vertex 3 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 8
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug12627 b/tests/bugs/modalg_1/bug12627
index 073bbadf66..7a54bd157d 100755
--- a/tests/bugs/modalg_1/bug12627
+++ b/tests/bugs/modalg_1/bug12627
@@ -15,16 +15,7 @@ bop b1 b2
 bopfuse result
 
 set square 272295
-set nb_v_good 13
-set nb_e_good 20
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 54
-
+checknbshapes result -vertex 13 -edge 20 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 54
 set 2dviewer 0
 
 
diff --git a/tests/bugs/modalg_1/bug12918 b/tests/bugs/modalg_1/bug12918
index 079b51fba0..2652c80b38 100755
--- a/tests/bugs/modalg_1/bug12918
+++ b/tests/bugs/modalg_1/bug12918
@@ -15,15 +15,6 @@ bop b1 b2
 bopfuse result
 
 set square 0.00240038
-set nb_v_good 24
-set nb_e_good 36
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 91
-
+checknbshapes result -vertex 24 -edge 36 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 91
 set 2dviewer 1
 
diff --git a/tests/bugs/modalg_1/bug13116_1 b/tests/bugs/modalg_1/bug13116_1
index 45a23c3452..e3dc3bb5d1 100755
--- a/tests/bugs/modalg_1/bug13116_1
+++ b/tests/bugs/modalg_1/bug13116_1
@@ -15,15 +15,6 @@ bop b1 b2
 bopfuse result
 
 set square 438194
-set nb_v_good 21
-set nb_e_good 37
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 2
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 94
-
+checknbshapes result -vertex 21 -edge 37 -wire 16 -face 16 -shell 2 -solid 1 -compsolid 0 -compound 1 -shape 94
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13116_2 b/tests/bugs/modalg_1/bug13116_2
index 4cd36f391f..3149a808d6 100755
--- a/tests/bugs/modalg_1/bug13116_2
+++ b/tests/bugs/modalg_1/bug13116_2
@@ -13,15 +13,6 @@ bop b1 b2
 bopcommon result
 
 set square 3769.91
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 15
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 15
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13116_3 b/tests/bugs/modalg_1/bug13116_3
index 5f36a5ea38..f2ff78c7ae 100755
--- a/tests/bugs/modalg_1/bug13116_3
+++ b/tests/bugs/modalg_1/bug13116_3
@@ -13,15 +13,6 @@ bop b1 b2
 bopcut result
 
 set square 438194
-set nb_v_good 21
-set nb_e_good 34
-set nb_w_good 15
-set nb_f_good 15
-set nb_sh_good 2
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 89
-
+checknbshapes result -vertex 21 -edge 34 -wire 15 -face 15 -shell 2 -solid 1 -compsolid 0 -compound 1 -shape 89
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13116_4 b/tests/bugs/modalg_1/bug13116_4
index a4364700b7..34b980da26 100755
--- a/tests/bugs/modalg_1/bug13116_4
+++ b/tests/bugs/modalg_1/bug13116_4
@@ -13,15 +13,6 @@ bop b1 b2
 boptuc result
 
 set square 3769.89
-set nb_v_good 3
-set nb_e_good 8
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 20
-
+checknbshapes result -vertex 3 -edge 8 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 20
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13142 b/tests/bugs/modalg_1/bug13142
index e1563caa66..34f1ad1438 100755
--- a/tests/bugs/modalg_1/bug13142
+++ b/tests/bugs/modalg_1/bug13142
@@ -14,15 +14,6 @@ vfit
 vsetdispmode 1
 
 set square 513.007
-set nb_v_good 34
-set nb_e_good 66
-set nb_w_good 47
-set nb_f_good 42
-set nb_sh_good 9
-set nb_sol_good 9
-set nb_compsol_good 0
-set nb_compound_good 3
-set nb_shape_good 210
-
+checknbshapes result -vertex 34 -edge 66 -wire 47 -face 42 -shell 9 -solid 9 -compsolid 0 -compound 3 -shape 210
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13186_1 b/tests/bugs/modalg_1/bug13186_1
index 1b98aede77..c69a6d00af 100755
--- a/tests/bugs/modalg_1/bug13186_1
+++ b/tests/bugs/modalg_1/bug13186_1
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC13186"
 puts "============"
@@ -15,15 +15,6 @@ bop b1 b2
 bopcut result
 
 set square 42.5841
-set nb_v_good 19
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 66
-
+checknbshapes result -vertex 19 -edge 25 -wire 12 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 66
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13186_2 b/tests/bugs/modalg_1/bug13186_2
index 10c6b3bcc2..c384fda621 100755
--- a/tests/bugs/modalg_1/bug13186_2
+++ b/tests/bugs/modalg_1/bug13186_2
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC13186"
 puts "============"
@@ -15,15 +15,6 @@ bop b1 b2
 bopfuse result
 
 set square 85.6816
-set nb_v_good 21
-set nb_e_good 28
-set nb_w_good 13
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 73
-
+checknbshapes result -vertex 21 -edge 28 -wire 13 -face 8 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 73
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13186_3 b/tests/bugs/modalg_1/bug13186_3
index aa62fa0484..9f7ee38472 100755
--- a/tests/bugs/modalg_1/bug13186_3
+++ b/tests/bugs/modalg_1/bug13186_3
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC13186"
 puts "============"
@@ -15,15 +15,6 @@ bop b1 b2
 bopcommon result
 
 set square 14.9648
-set nb_v_good 8
-set nb_e_good 11
-set nb_w_good 7
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 34
-
+checknbshapes result -vertex 8 -edge 11 -wire 7 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 34
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13186_4 b/tests/bugs/modalg_1/bug13186_4
index ccb5179adb..1354702add 100755
--- a/tests/bugs/modalg_1/bug13186_4
+++ b/tests/bugs/modalg_1/bug13186_4
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC13186"
 puts "============"
@@ -15,15 +15,6 @@ bop b1 b2
 boptuc result
 
 set square 58.0624
-set nb_v_good 10
-set nb_e_good 14
-set nb_w_good 8
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 41
-
+checknbshapes result -vertex 10 -edge 14 -wire 8 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 41
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13209_1 b/tests/bugs/modalg_1/bug13209_1
index e42f64f226..48030cccef 100755
--- a/tests/bugs/modalg_1/bug13209_1
+++ b/tests/bugs/modalg_1/bug13209_1
@@ -13,15 +13,6 @@ bop b1 b2
 bopfuse result
 
 set square 17308.3
-set nb_v_good 13
-set nb_e_good 25
-set nb_w_good 13
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 66
-
+checknbshapes result -vertex 13 -edge 25 -wire 13 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 66
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13209_2 b/tests/bugs/modalg_1/bug13209_2
index fcd4e9ebf2..7a823844c9 100755
--- a/tests/bugs/modalg_1/bug13209_2
+++ b/tests/bugs/modalg_1/bug13209_2
@@ -13,16 +13,7 @@ bop b1 b2
 bopcommon result
 
 set square 2990.42
-set nb_v_good 13
-set nb_e_good 23
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 59
-
+checknbshapes result -vertex 13 -edge 23 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 59
 set 2dviewer 0
 
 
diff --git a/tests/bugs/modalg_1/bug13209_3 b/tests/bugs/modalg_1/bug13209_3
index e9d940df67..c21255182b 100755
--- a/tests/bugs/modalg_1/bug13209_3
+++ b/tests/bugs/modalg_1/bug13209_3
@@ -13,15 +13,6 @@ bop b1 b2
 bopcut result
 
 set square 17292.5
-set nb_v_good 13
-set nb_e_good 26
-set nb_w_good 12
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 65
-
+checknbshapes result -vertex 13 -edge 26 -wire 12 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 65
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13209_4 b/tests/bugs/modalg_1/bug13209_4
index c9de1b5e0f..f449a040ca 100755
--- a/tests/bugs/modalg_1/bug13209_4
+++ b/tests/bugs/modalg_1/bug13209_4
@@ -13,15 +13,6 @@ bop b1 b2
 boptuc result
 
 set square 3006.19
-set nb_v_good 11
-set nb_e_good 18
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 58
-
+checknbshapes result -vertex 11 -edge 18 -wire 11 -face 11 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 58
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13211_1 b/tests/bugs/modalg_1/bug13211_1
index 4413d96d6a..7236db9207 100755
--- a/tests/bugs/modalg_1/bug13211_1
+++ b/tests/bugs/modalg_1/bug13211_1
@@ -13,14 +13,5 @@ bop b1 b2
 bopsection result
 
 set length 37.7057
-set nb_v_good 5
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 10
-
+checknbshapes result -vertex 5 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug13211_10 b/tests/bugs/modalg_1/bug13211_10
index 79e24d1680..be7ccc3be6 100755
--- a/tests/bugs/modalg_1/bug13211_10
+++ b/tests/bugs/modalg_1/bug13211_10
@@ -13,15 +13,6 @@ bop s1 s2
 boptuc result
 
 set square 3006.19
-set nb_v_good 11
-set nb_e_good 18
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 58
-
+checknbshapes result -vertex 11 -edge 18 -wire 11 -face 11 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 58
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug13211_11 b/tests/bugs/modalg_1/bug13211_11
index 5ecd0b9f66..69258dbd88 100755
--- a/tests/bugs/modalg_1/bug13211_11
+++ b/tests/bugs/modalg_1/bug13211_11
@@ -13,14 +13,5 @@ bop s1 s2
 bopsection result
 
 set length 228.699
-set nb_v_good 13
-set nb_e_good 15
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 29
-
+checknbshapes result -vertex 13 -edge 15 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 29
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug13211_2 b/tests/bugs/modalg_1/bug13211_2
index 34ae8b3695..f4040a8ca7 100755
--- a/tests/bugs/modalg_1/bug13211_2
+++ b/tests/bugs/modalg_1/bug13211_2
@@ -32,14 +32,5 @@ bop r1 r2
 bopfuse result
 
 set square 17308.3
-set nb_v_good 13
-set nb_e_good 25
-set nb_w_good 13
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 66
-
+checknbshapes result -vertex 13 -edge 25 -wire 13 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 66
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug13211_3 b/tests/bugs/modalg_1/bug13211_3
index 5f60902008..3357364ead 100755
--- a/tests/bugs/modalg_1/bug13211_3
+++ b/tests/bugs/modalg_1/bug13211_3
@@ -30,14 +30,5 @@ bop r1 r2
 bopcommon result
 
 set square 2990.42
-set nb_v_good 13
-set nb_e_good 23
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 59
-
+checknbshapes result -vertex 13 -edge 23 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 59
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug13211_4 b/tests/bugs/modalg_1/bug13211_4
index 7560ae7d03..e8002ca49e 100755
--- a/tests/bugs/modalg_1/bug13211_4
+++ b/tests/bugs/modalg_1/bug13211_4
@@ -30,14 +30,5 @@ bop r1 r2
 bopcut result
 
 set square 17292.5
-set nb_v_good 13
-set nb_e_good 26
-set nb_w_good 12
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 65
-
+checknbshapes result -vertex 13 -edge 26 -wire 12 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 65
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug13211_5 b/tests/bugs/modalg_1/bug13211_5
index 5d832e4b44..19574b16da 100755
--- a/tests/bugs/modalg_1/bug13211_5
+++ b/tests/bugs/modalg_1/bug13211_5
@@ -30,14 +30,5 @@ bop r1 r2
 boptuc result
 
 set square 3006.19
-set nb_v_good 11
-set nb_e_good 18
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 58
-
+checknbshapes result -vertex 11 -edge 18 -wire 11 -face 11 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 58
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug13211_6 b/tests/bugs/modalg_1/bug13211_6
index 4eb80cc3b9..d9412aed23 100755
--- a/tests/bugs/modalg_1/bug13211_6
+++ b/tests/bugs/modalg_1/bug13211_6
@@ -30,14 +30,7 @@ bop r1 r2
 bopsection result
 
 set length 228.699
-set nb_v_good_vertex 13
-set nb_e_good_edge 15
-set nb_w_good_wire 0
-set nb_f_good_face 0
-set nb_sh_good_shell 0
-set nb_sol_good_solid 0
-set nb_compsol_good_compsolid 0
-set nb_compound_good_compound 1
-set nb_shape_good_shape 29
+
+checknbshapes result -vertex 13 -edge 15 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 29
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug13211_7 b/tests/bugs/modalg_1/bug13211_7
index 0ddedf9843..8c7d003384 100755
--- a/tests/bugs/modalg_1/bug13211_7
+++ b/tests/bugs/modalg_1/bug13211_7
@@ -14,14 +14,5 @@ bop s1 s2
 bopfuse result
 
 set square 17308.3
-set nb_v_good 13
-set nb_e_good 25
-set nb_w_good 13
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 66
-
+checknbshapes result -vertex 13 -edge 25 -wire 13 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 66
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug13211_8 b/tests/bugs/modalg_1/bug13211_8
index 775c689910..923d012bd8 100755
--- a/tests/bugs/modalg_1/bug13211_8
+++ b/tests/bugs/modalg_1/bug13211_8
@@ -13,14 +13,5 @@ bop s1 s2
 bopcommon result
 
 set square 2990.42
-set nb_v_good 13
-set nb_e_good 23
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 59
-
+checknbshapes result -vertex 13 -edge 23 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 59
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug13211_9 b/tests/bugs/modalg_1/bug13211_9
index bd6ce9b78a..009dc18f04 100755
--- a/tests/bugs/modalg_1/bug13211_9
+++ b/tests/bugs/modalg_1/bug13211_9
@@ -14,14 +14,5 @@ bop s1 s2
 bopcut result
 
 set square 17292.5
-set nb_v_good 13
-set nb_e_good 26
-set nb_w_good 12
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 65
-
+checknbshapes result -vertex 13 -edge 26 -wire 12 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 65
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug13538 b/tests/bugs/modalg_1/bug13538
index 817c1bfb5b..5f37a503df 100755
--- a/tests/bugs/modalg_1/bug13538
+++ b/tests/bugs/modalg_1/bug13538
@@ -16,15 +16,6 @@ bop a_1 b_1
 bopcommon result
 
 set square 10000
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 12
-
+checknbshapes result -vertex 4 -edge 4 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 1 -shape 12
 set 2viewer 0
 
diff --git a/tests/bugs/modalg_1/bug14506 b/tests/bugs/modalg_1/bug14506
index f36847847c..67d78ec095 100755
--- a/tests/bugs/modalg_1/bug14506
+++ b/tests/bugs/modalg_1/bug14506
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC14506"
@@ -15,15 +15,6 @@ bop face1 face2
 bopsection result
 
 set length 129.639
-set nb_v_good 2
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 5
-
+checknbshapes result -vertex 2 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 5
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug14536 b/tests/bugs/modalg_1/bug14536
index 11e559b7c9..857d424da1 100755
--- a/tests/bugs/modalg_1/bug14536
+++ b/tests/bugs/modalg_1/bug14536
@@ -13,14 +13,5 @@ bop s1 s2
 bopfuse result
 
 set square 330318
-set nb_v_good 7
-set nb_e_good 13
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 35
-
+checknbshapes result -vertex 7 -edge 13 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 35
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug14643 b/tests/bugs/modalg_1/bug14643
index 61159b278f..84d8ad6a2b 100755
--- a/tests/bugs/modalg_1/bug14643
+++ b/tests/bugs/modalg_1/bug14643
@@ -13,16 +13,7 @@ set BugNumber OCC14643
 restore [locate_data_file OCC14643.brep] result
 
 set square 8.63143e+07
-set nb_v_good 108
-set nb_e_good 282
-set nb_w_good 239
-set nb_f_good 259
-set nb_sh_good 66
-set nb_sol_good 66
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1021
-
+checknbshapes result -vertex 108 -edge 282 -wire 239 -face 259 -shell 66 -solid 66 -compsolid 0 -compound 1 -shape 1021
 puts ""
 puts "Check each solid"
 explode result
diff --git a/tests/bugs/modalg_1/bug14777 b/tests/bugs/modalg_1/bug14777
index 06ccd40c09..7d8dd1e3d5 100755
--- a/tests/bugs/modalg_1/bug14777
+++ b/tests/bugs/modalg_1/bug14777
@@ -13,15 +13,6 @@ bop s1 s2
 bopcut result
 
 set square 10653.3
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 28
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 28
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug15036 b/tests/bugs/modalg_1/bug15036
index ee06151f28..9397cc3d65 100755
--- a/tests/bugs/modalg_1/bug15036
+++ b/tests/bugs/modalg_1/bug15036
@@ -30,14 +30,5 @@ mkplane fr w 1
 revol result fr 0.001428571428572667 640.5285714285715 20 -1.691188905560395E-05 0.9999999998569939 0 360
 
 set square 1.03597e+06
-set nb_v_good 9
-set nb_e_good 14
-set nb_w_good 13
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 47
-
+checknbshapes result -vertex 9 -edge 14 -wire 13 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 47
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug15836 b/tests/bugs/modalg_1/bug15836
index 1d8c34ac9c..304fb7fb7e 100755
--- a/tests/bugs/modalg_1/bug15836
+++ b/tests/bugs/modalg_1/bug15836
@@ -15,14 +15,5 @@ explode f e
 fillet result f 10 f_8 15 f_9 20 f_11 25 f_17 30 f_21 35 f_29
 
 set square 42816.6
-set nb_v_good 31
-set nb_e_good 50
-set nb_w_good 21
-set nb_f_good 21
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 126
-
+checknbshapes result -vertex 31 -edge 50 -wire 21 -face 21 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 126
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug15850 b/tests/bugs/modalg_1/bug15850
index dc41ca7dfc..6e1d2010b6 100755
--- a/tests/bugs/modalg_1/bug15850
+++ b/tests/bugs/modalg_1/bug15850
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC15850"
 puts "============"
@@ -14,15 +14,6 @@ bop bb bc
 bopcut result
 
 set square 732.453
-set nb_v_good 12
-set nb_e_good 17
-set nb_w_good 9
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 48
-
+checknbshapes result -vertex 12 -edge 17 -wire 9 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 48
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug15850_1 b/tests/bugs/modalg_1/bug15850_1
index 6816d4cc73..6d8a780a1a 100755
--- a/tests/bugs/modalg_1/bug15850_1
+++ b/tests/bugs/modalg_1/bug15850_1
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC15850"
 puts "============"
@@ -14,15 +14,6 @@ bop bb bc
 boptuc result
 
 set square 301.996
-set nb_v_good 6
-set nb_e_good 8
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 31
-
+checknbshapes result -vertex 6 -edge 8 -wire 6 -face 6 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 31
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug15850_2 b/tests/bugs/modalg_1/bug15850_2
index 42a2e28cdc..8799aee5a6 100755
--- a/tests/bugs/modalg_1/bug15850_2
+++ b/tests/bugs/modalg_1/bug15850_2
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC15850"
 puts "============"
@@ -14,15 +14,6 @@ bop bb bc
 bopcommon result
 
 set square 245.55
-set nb_v_good 4
-set nb_e_good 5
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 18
-
+checknbshapes result -vertex 4 -edge 5 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 18
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug15850_3 b/tests/bugs/modalg_1/bug15850_3
index 869ab3e3ad..e2da73c7cf 100755
--- a/tests/bugs/modalg_1/bug15850_3
+++ b/tests/bugs/modalg_1/bug15850_3
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC15850"
 puts "============"
@@ -14,15 +14,6 @@ bop bb bc
 bopfuse result
 
 set square 788.9
-set nb_v_good 14
-set nb_e_good 20
-set nb_w_good 12
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 59
-
+checknbshapes result -vertex 14 -edge 20 -wire 12 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 59
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug15850_4 b/tests/bugs/modalg_1/bug15850_4
index 9a7180632b..9d12bdb103 100755
--- a/tests/bugs/modalg_1/bug15850_4
+++ b/tests/bugs/modalg_1/bug15850_4
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC15850"
 puts "============"
@@ -16,16 +16,7 @@ bop bb bc
 bopsection result
 
 set length 37.6991
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 9
-
+checknbshapes result -vertex 4 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9
 regexp {nb alone Vertices +: +([-0-9.+eE]+)} [checksection result] full Vertices
 set good_Vertices 0
 if { ${Vertices} != ${good_Vertices} } {
diff --git a/tests/bugs/modalg_1/bug15943 b/tests/bugs/modalg_1/bug15943
index 11aee304ef..ea7eb89dc0 100755
--- a/tests/bugs/modalg_1/bug15943
+++ b/tests/bugs/modalg_1/bug15943
@@ -13,14 +13,5 @@ bop b1 b2
 bopfuse result
 
 set square 266944
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 55
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 55
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug15968_1 b/tests/bugs/modalg_1/bug15968_1
index aafb8936c4..d16290edc5 100755
--- a/tests/bugs/modalg_1/bug15968_1
+++ b/tests/bugs/modalg_1/bug15968_1
@@ -17,14 +17,5 @@ add s_1 s1
 renamevar s1 result
 
 set square 164
-set nb_v_good 10
-set nb_e_good 11
-set nb_w_good 3
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 10 -edge 11 -wire 3 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 27
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug15968_2 b/tests/bugs/modalg_1/bug15968_2
index 78c3700833..d4f1cdc2b9 100755
--- a/tests/bugs/modalg_1/bug15968_2
+++ b/tests/bugs/modalg_1/bug15968_2
@@ -17,14 +17,5 @@ add s_2 s2
 renamevar s2 result
 
 set square 164
-set nb_v_good 10
-set nb_e_good 11
-set nb_w_good 3
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 10 -edge 11 -wire 3 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 27
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug16517_1 b/tests/bugs/modalg_1/bug16517_1
index 1f38705802..446d03b1ae 100755
--- a/tests/bugs/modalg_1/bug16517_1
+++ b/tests/bugs/modalg_1/bug16517_1
@@ -23,15 +23,7 @@ if { ${Result_Numbers} != 2 } {
 
   set status 0
   set length 110.167
-  set nb_v_good 1
-  set nb_e_good 1
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 3
+  checknbshapes result -vertex 1 -edge 1 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 3
 }
 
 if { ${mistake} != 0 } {
diff --git a/tests/bugs/modalg_1/bug16517_2 b/tests/bugs/modalg_1/bug16517_2
index d09cfe3f74..fc19e0dba9 100755
--- a/tests/bugs/modalg_1/bug16517_2
+++ b/tests/bugs/modalg_1/bug16517_2
@@ -23,15 +23,7 @@ if { ${Result_Numbers} != 2 } {
   set status 0
 
   set length 110.167
-  set nb_v_good 1
-  set nb_e_good 1
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 3
+  checknbshapes result -vertex 1 -edge 1 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 3
 }
 
 # Resume
diff --git a/tests/bugs/modalg_1/bug1665 b/tests/bugs/modalg_1/bug1665
index 811021e144..afab9beb5d 100755
--- a/tests/bugs/modalg_1/bug1665
+++ b/tests/bugs/modalg_1/bug1665
@@ -13,7 +13,7 @@ if {[catch {setvperiodic a} message]} {
     if {[catch {mkface result a} message]} {
 	puts "OCC1665 FAULTY : mkface"
     } else {
-	set nb_e_good 3
+      checknbshapes result -edge 3
     }
 }
 
diff --git a/tests/bugs/modalg_1/bug16667_1 b/tests/bugs/modalg_1/bug16667_1
index 81d8c6305d..419b3afeaf 100755
--- a/tests/bugs/modalg_1/bug16667_1
+++ b/tests/bugs/modalg_1/bug16667_1
@@ -12,15 +12,6 @@ mkoffset resoffset a 1 20
 renamevar resoffset_1 result
 
 set length 1542.3
-set nb_v_good 7
-set nb_e_good 7
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 15
-
+checknbshapes result -vertex 7 -edge 7 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 15
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug16667_2 b/tests/bugs/modalg_1/bug16667_2
index 8871038535..68051797f8 100755
--- a/tests/bugs/modalg_1/bug16667_2
+++ b/tests/bugs/modalg_1/bug16667_2
@@ -12,15 +12,6 @@ mkoffset resoffset a 1 -20
 renamevar resoffset_1 result
 
 set length 1188.62
-set nb_v_good 5
-set nb_e_good 5
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 11
-
+checknbshapes result -vertex 5 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 11
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug16667_3 b/tests/bugs/modalg_1/bug16667_3
index a62593ed51..fb1c672416 100755
--- a/tests/bugs/modalg_1/bug16667_3
+++ b/tests/bugs/modalg_1/bug16667_3
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC16667"
 puts "============"
@@ -13,15 +13,6 @@ mkoffset resoffset a 1 20
 renamevar resoffset_1 result
 
 set length 1451.49
-set nb_v_good 8
-set nb_e_good 8
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 17
-
+checknbshapes result -vertex 8 -edge 8 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 17
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug16667_4 b/tests/bugs/modalg_1/bug16667_4
index 8fd515e2c6..26cdd116ef 100755
--- a/tests/bugs/modalg_1/bug16667_4
+++ b/tests/bugs/modalg_1/bug16667_4
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "============"
 puts "OCC16667"
 puts "============"
@@ -13,16 +13,7 @@ mkoffset resoffset a 1 -20
 renamevar resoffset_1 result
 
 set length 1200.16
-set nb_v_good 8
-set nb_e_good 8
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 17
-
+checknbshapes result -vertex 8 -edge 8 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 17
 set 2dviewer 0
 
 
diff --git a/tests/bugs/modalg_1/bug16781 b/tests/bugs/modalg_1/bug16781
index 68c744440b..d723c87ac6 100755
--- a/tests/bugs/modalg_1/bug16781
+++ b/tests/bugs/modalg_1/bug16781
@@ -13,15 +13,6 @@ bop s1 s2
 bopcut result
 
 set square 3.92094e+07
-set nb_v_good 14
-set nb_e_good 21
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 56
-
+checknbshapes result -vertex 14 -edge 21 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 56
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug17194_1 b/tests/bugs/modalg_1/bug17194_1
index 149c5d3bc3..cc02724471 100755
--- a/tests/bugs/modalg_1/bug17194_1
+++ b/tests/bugs/modalg_1/bug17194_1
@@ -15,15 +15,6 @@ plane pl 10 0 0 1 0 4
 mkface pl pl
 bsection result f pl
 
-set nb_v_good 4
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 7
-
+checknbshapes result -vertex 4 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 7
 set length 15.8064
 set 2dviewer 0
diff --git a/tests/bugs/modalg_1/bug17194_2 b/tests/bugs/modalg_1/bug17194_2
index 618e031935..b9ccb73343 100755
--- a/tests/bugs/modalg_1/bug17194_2
+++ b/tests/bugs/modalg_1/bug17194_2
@@ -15,16 +15,7 @@ plane pl 10 0 10 1 0 4
 mkface pl pl
 bsection result f pl
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set length 54.6122
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug17357_1 b/tests/bugs/modalg_1/bug17357_1
index 1824e6723f..2291d6f390 100755
--- a/tests/bugs/modalg_1/bug17357_1
+++ b/tests/bugs/modalg_1/bug17357_1
@@ -13,15 +13,6 @@ bop b1 b2
 bopcommon result
 
 set square 1.18671
-set nb_v_good 10
-set nb_e_good 18
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 47
-
+checknbshapes result -vertex 10 -edge 18 -wire 8 -face 8 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 47
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug17357_2 b/tests/bugs/modalg_1/bug17357_2
index 7d49291e77..fa5ad2b794 100755
--- a/tests/bugs/modalg_1/bug17357_2
+++ b/tests/bugs/modalg_1/bug17357_2
@@ -13,15 +13,8 @@ bop b1 b2
 bopfuse result
 
 set square 241.111
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 12
-set nb_f_good 10
-set nb_sh_goodl 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 65
+
+checknbshapes result -vertex 16 -edge 24 -wire 12 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 65
 
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug17357_3 b/tests/bugs/modalg_1/bug17357_3
index 3e7b43055b..606cfd3813 100755
--- a/tests/bugs/modalg_1/bug17357_3
+++ b/tests/bugs/modalg_1/bug17357_3
@@ -13,15 +13,6 @@ bop b1 b2
 bopcut result
 
 set square 241.111
-set nb_v_good 18
-set nb_e_good 30
-set nb_w_good 14
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 77
-
+checknbshapes result -vertex 18 -edge 30 -wire 14 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 77
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug17357_4 b/tests/bugs/modalg_1/bug17357_4
index 2083ce5f33..2dd4039807 100755
--- a/tests/bugs/modalg_1/bug17357_4
+++ b/tests/bugs/modalg_1/bug17357_4
@@ -13,15 +13,6 @@ bop b1 b2
 boptuc result
 
 set square 1.18671
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 35
-
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 35
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug18186 b/tests/bugs/modalg_1/bug18186
index 0e20128dd7..6745852aa8 100755
--- a/tests/bugs/modalg_1/bug18186
+++ b/tests/bugs/modalg_1/bug18186
@@ -13,15 +13,6 @@ bop bb bc
 bopcut result
 
 set square 308374
-set nb_v_good 43
-set nb_e_good 68
-set nb_w_good 27
-set nb_f_good 27
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 168
-
+checknbshapes result -vertex 43 -edge 68 -wire 27 -face 27 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 168
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug19071 b/tests/bugs/modalg_1/bug19071
index 32f3ed070f..7b4e4058f6 100755
--- a/tests/bugs/modalg_1/bug19071
+++ b/tests/bugs/modalg_1/bug19071
@@ -22,16 +22,7 @@ puts "Finish boolean operation ..."
 
 set square 177462
 
-set nb_v_good 6
-set nb_e_good 16
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 37
-
+checknbshapes result -vertex 6 -edge 16 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 37
 
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_1/bug19793_2 b/tests/bugs/modalg_1/bug19793_2
index 6bf6819e3c..ac16566d7d 100755
--- a/tests/bugs/modalg_1/bug19793_2
+++ b/tests/bugs/modalg_1/bug19793_2
@@ -26,16 +26,7 @@ puts "Finish boolean operation ..."
 
 set length 17730.1
 
-set nb_e_good 1190
-set nb_v_good 68
-set nb_e_good 70
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 139
+checknbshapes result -vertex 68 -edge 70 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 139
 
 # OCC23753 processing
 # Performance verification of bop operation
diff --git a/tests/bugs/modalg_2/bug19811 b/tests/bugs/modalg_2/bug19811
index 5b4ef22252..74c612e51c 100755
--- a/tests/bugs/modalg_2/bug19811
+++ b/tests/bugs/modalg_2/bug19811
@@ -18,16 +18,7 @@ if [catch { tscale result 0 0 0 0.5 } catch_result] {
 
 set square 1.6949e+06
 
-set nb_v_good 173
-set nb_e_good 285
-set nb_w_good 113
-set nb_f_good 113
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 686
-
+checknbshapes result -vertex 173 -edge 285 -wire 113 -face 113 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 686
 vinit
 vdisplay result
 vfit
diff --git a/tests/bugs/modalg_2/bug20285_1 b/tests/bugs/modalg_2/bug20285_1
index 259b622125..e41df4f044 100755
--- a/tests/bugs/modalg_2/bug20285_1
+++ b/tests/bugs/modalg_2/bug20285_1
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set length 750.952
 
-set nb_v_good 8
-set nb_e_good 7
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 16
-
+checknbshapes result -vertex 8 -edge 7 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 16
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_10 b/tests/bugs/modalg_2/bug20285_10
index 3fb5ca9901..da90f1a278 100755
--- a/tests/bugs/modalg_2/bug20285_10
+++ b/tests/bugs/modalg_2/bug20285_10
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 37981.1
 
-set nb_v_good 13
-set nb_e_good 20
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 54
-
+checknbshapes result -vertex 13 -edge 20 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 54
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_11 b/tests/bugs/modalg_2/bug20285_11
index c506d71e0d..0a474e7d87 100755
--- a/tests/bugs/modalg_2/bug20285_11
+++ b/tests/bugs/modalg_2/bug20285_11
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set length 446.679
 
-set nb_v_good 8
-set nb_e_good 8
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 17
-
+checknbshapes result -vertex 8 -edge 8 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 17
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_12 b/tests/bugs/modalg_2/bug20285_12
index 985760a2eb..74ea4c06ec 100755
--- a/tests/bugs/modalg_2/bug20285_12
+++ b/tests/bugs/modalg_2/bug20285_12
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 17028.5
 
-set nb_v_good 12
-set nb_e_good 18
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 18 -wire 8 -face 8 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 49
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_13 b/tests/bugs/modalg_2/bug20285_13
index ff1ac556ad..bb2618053a 100755
--- a/tests/bugs/modalg_2/bug20285_13
+++ b/tests/bugs/modalg_2/bug20285_13
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 160323
 
-set nb_v_good 26
-set nb_e_good 39
-set nb_w_good 15
-set nb_f_good 15
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 98
-
+checknbshapes result -vertex 26 -edge 39 -wire 15 -face 15 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 98
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_14 b/tests/bugs/modalg_2/bug20285_14
index ccf29dc52a..baaecb29f8 100755
--- a/tests/bugs/modalg_2/bug20285_14
+++ b/tests/bugs/modalg_2/bug20285_14
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 135189
 
-set nb_v_good 20
-set nb_e_good 30
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 77
-
+checknbshapes result -vertex 20 -edge 30 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 77
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_15 b/tests/bugs/modalg_2/bug20285_15
index b05dfffb09..ae435614d3 100755
--- a/tests/bugs/modalg_2/bug20285_15
+++ b/tests/bugs/modalg_2/bug20285_15
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 42162.7
 
-set nb_v_good 18
-set nb_e_good 27
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 70
-
+checknbshapes result -vertex 18 -edge 27 -wire 11 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 70
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_2 b/tests/bugs/modalg_2/bug20285_2
index 23b99f7350..8d57e040a5 100755
--- a/tests/bugs/modalg_2/bug20285_2
+++ b/tests/bugs/modalg_2/bug20285_2
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 17577
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 35
-
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 35
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_3 b/tests/bugs/modalg_2/bug20285_3
index 9c6c908d9b..063a814f5e 100755
--- a/tests/bugs/modalg_2/bug20285_3
+++ b/tests/bugs/modalg_2/bug20285_3
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 113140
 
-set nb_v_good 18
-set nb_e_good 28
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 71
-
+checknbshapes result -vertex 18 -edge 28 -wire 11 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 71
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_4 b/tests/bugs/modalg_2/bug20285_4
index e1736b5f37..51fd855c30 100755
--- a/tests/bugs/modalg_2/bug20285_4
+++ b/tests/bugs/modalg_2/bug20285_4
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 92859.7
 
-set nb_v_good 13
-set nb_e_good 19
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 51
-
+checknbshapes result -vertex 13 -edge 19 -wire 8 -face 8 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 51
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_5 b/tests/bugs/modalg_2/bug20285_5
index 578a72430a..1bea029664 100755
--- a/tests/bugs/modalg_2/bug20285_5
+++ b/tests/bugs/modalg_2/bug20285_5
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 37856.9
 
-set nb_v_good 15
-set nb_e_good 22
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 58
-
+checknbshapes result -vertex 15 -edge 22 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 58
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_6 b/tests/bugs/modalg_2/bug20285_6
index 7ae36c8e39..549bd5f565 100755
--- a/tests/bugs/modalg_2/bug20285_6
+++ b/tests/bugs/modalg_2/bug20285_6
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set length 479.562
 
-set nb_v_good 5
-set nb_e_good 5
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 11
-
+checknbshapes result -vertex 5 -edge 5 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 11
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_7 b/tests/bugs/modalg_2/bug20285_7
index 8073b020b1..1fb6f8a535 100755
--- a/tests/bugs/modalg_2/bug20285_7
+++ b/tests/bugs/modalg_2/bug20285_7
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 14969
 
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 28
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 28
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_8 b/tests/bugs/modalg_2/bug20285_8
index ca6c01ac27..d260bf327d 100755
--- a/tests/bugs/modalg_2/bug20285_8
+++ b/tests/bugs/modalg_2/bug20285_8
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 389776
 
-set nb_v_good 47
-set nb_e_good 71
-set nb_w_good 26
-set nb_f_good 26
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 173
-
+checknbshapes result -vertex 47 -edge 71 -wire 26 -face 26 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 173
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20285_9 b/tests/bugs/modalg_2/bug20285_9
index 46750992cc..cdc0815d4d 100755
--- a/tests/bugs/modalg_2/bug20285_9
+++ b/tests/bugs/modalg_2/bug20285_9
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 366764
 
-set nb_v_good 40
-set nb_e_good 60
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 147
-
+checknbshapes result -vertex 40 -edge 60 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 147
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20297_1 b/tests/bugs/modalg_2/bug20297_1
index e5efb37dce..c1c52fb628 100755
--- a/tests/bugs/modalg_2/bug20297_1
+++ b/tests/bugs/modalg_2/bug20297_1
@@ -24,15 +24,6 @@ puts "Finish boolean operation ..."
 
 set length 389.898
 
-set nb_v_good 64
-set nb_e_good 64
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 129
-
+checknbshapes result -vertex 64 -edge 64 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 129
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20297_2 b/tests/bugs/modalg_2/bug20297_2
index 6bb9e877f3..b8a16857ff 100755
--- a/tests/bugs/modalg_2/bug20297_2
+++ b/tests/bugs/modalg_2/bug20297_2
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 31648.3
 
-set nb_v_good 129
-set nb_e_good 194
-set nb_w_good 71
-set nb_f_good 69
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 466
-
+checknbshapes result -vertex 129 -edge 194 -wire 71 -face 69 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 466
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20297_3 b/tests/bugs/modalg_2/bug20297_3
index dd243dd2e5..c22b1092df 100755
--- a/tests/bugs/modalg_2/bug20297_3
+++ b/tests/bugs/modalg_2/bug20297_3
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 46473.9
 
-set nb_v_good 140
-set nb_e_good 209
-set nb_w_good 83
-set nb_f_good 77
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 512
-
+checknbshapes result -vertex 140 -edge 209 -wire 83 -face 77 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 512
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20297_4 b/tests/bugs/modalg_2/bug20297_4
index ddee861050..e31dba4092 100755
--- a/tests/bugs/modalg_2/bug20297_4
+++ b/tests/bugs/modalg_2/bug20297_4
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 69719.6
 
-set nb_v_good 141
-set nb_e_good 211
-set nb_w_good 86
-set nb_f_good 78
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 519
-
+checknbshapes result -vertex 141 -edge 211 -wire 86 -face 78 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 519
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20297_5 b/tests/bugs/modalg_2/bug20297_5
index 0dc5254d12..c2ac198f8f 100755
--- a/tests/bugs/modalg_2/bug20297_5
+++ b/tests/bugs/modalg_2/bug20297_5
@@ -25,15 +25,6 @@ puts "Finish boolean operation ..."
 
 set square 8402.56
 
-set nb_v_good 128
-set nb_e_good 192
-set nb_w_good 68
-set nb_f_good 68
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 461
-
+checknbshapes result -vertex 128 -edge 192 -wire 68 -face 68 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 461
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20413 b/tests/bugs/modalg_2/bug20413
index 862df55f0d..cdc8c6d81c 100755
--- a/tests/bugs/modalg_2/bug20413
+++ b/tests/bugs/modalg_2/bug20413
@@ -22,15 +22,6 @@ puts "Finish boolean operation ..."
 
 set length 233.024
 
-set nb_v_good 9
-set nb_e_good 9
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 19
-
+checknbshapes result -vertex 9 -edge 9 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 19
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20465 b/tests/bugs/modalg_2/bug20465
index 38c21cee41..316c1aa64e 100755
--- a/tests/bugs/modalg_2/bug20465
+++ b/tests/bugs/modalg_2/bug20465
@@ -16,16 +16,7 @@ compound r_1 r_2 r_3 r_4 r_5 r_6 r_7 r_8 r_9 r_10 r_11 result
 
 set square 900
 
-set nb_v_good 23
-set nb_e_good 33
-set nb_w_good 13
-set nb_f_good 11
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 81
-
+checknbshapes result -vertex 23 -edge 33 -wire 13 -face 11 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 81
 set square 900
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_2/bug20521 b/tests/bugs/modalg_2/bug20521
index 6a6cff91fb..1b61716114 100755
--- a/tests/bugs/modalg_2/bug20521
+++ b/tests/bugs/modalg_2/bug20521
@@ -14,16 +14,7 @@ testreadstep [locate_data_file OCC20521-3DB.stp] result
 
 set square 322688
 
-set nb_v_good 119
-set nb_e_good 199
-set nb_w_good 96
-set nb_f_good 87
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 503
-
+checknbshapes result -vertex 119 -edge 199 -wire 96 -face 87 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 503
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug20785 b/tests/bugs/modalg_2/bug20785
index 562667e8c9..b4d0c352fd 100755
--- a/tests/bugs/modalg_2/bug20785
+++ b/tests/bugs/modalg_2/bug20785
@@ -12,16 +12,7 @@ restore [locate_data_file OCC20785.brep] result
 
 set square 322688
 
-set nb_v_good 119
-set nb_e_good 199
-set nb_w_good 96
-set nb_f_good 87
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 503
-
+checknbshapes result -vertex 119 -edge 199 -wire 96 -face 87 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 503
 vinit
 vdisplay result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug20793 b/tests/bugs/modalg_2/bug20793
index 0d244450e8..77895ee126 100755
--- a/tests/bugs/modalg_2/bug20793
+++ b/tests/bugs/modalg_2/bug20793
@@ -18,16 +18,7 @@ if [catch { mkoffset resoffset a 1 10 } ] {
 
 set length 671.746
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 4 -edge 4 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 9
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20807_1 b/tests/bugs/modalg_2/bug20807_1
index 99b16c7443..baff2d03db 100755
--- a/tests/bugs/modalg_2/bug20807_1
+++ b/tests/bugs/modalg_2/bug20807_1
@@ -21,14 +21,5 @@ buildsweep result
 
 set square 254837
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 29
-
+checknbshapes result -vertex 8 -edge 12 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 29
 set 2dviewer 1
diff --git a/tests/bugs/modalg_2/bug20807_2 b/tests/bugs/modalg_2/bug20807_2
index 8eb2764750..99d93b62a1 100755
--- a/tests/bugs/modalg_2/bug20807_2
+++ b/tests/bugs/modalg_2/bug20807_2
@@ -20,14 +20,5 @@ buildsweep result
 
 set square 44761.1
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_2/bug20807_3 b/tests/bugs/modalg_2/bug20807_3
index 711a6a71ea..a5c39706d4 100755
--- a/tests/bugs/modalg_2/bug20807_3
+++ b/tests/bugs/modalg_2/bug20807_3
@@ -19,14 +19,5 @@ buildsweep result
 
 set square 2933.11
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_2/bug20807_4 b/tests/bugs/modalg_2/bug20807_4
index 6825b32aa3..63c00b9f16 100755
--- a/tests/bugs/modalg_2/bug20807_4
+++ b/tests/bugs/modalg_2/bug20807_4
@@ -21,14 +21,5 @@ buildsweep result
 
 set square 4.78336e+06
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_2/bug20827 b/tests/bugs/modalg_2/bug20827
index aec2ad795e..07423f92fe 100755
--- a/tests/bugs/modalg_2/bug20827
+++ b/tests/bugs/modalg_2/bug20827
@@ -12,14 +12,5 @@ restore [locate_data_file OCC20827-ran24s_a-d_1_f107.brep] result
 
 set square 9707.82
 
-set nb_v_good 93
-set nb_e_good 93
-set nb_w_good 13
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 200
-
+checknbshapes result -vertex 93 -edge 93 -wire 13 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 200
 set 3dviewer 0
diff --git a/tests/bugs/modalg_2/bug20964_1 b/tests/bugs/modalg_2/bug20964_1
index c7d3cfe032..dd4a9e2445 100755
--- a/tests/bugs/modalg_2/bug20964_1
+++ b/tests/bugs/modalg_2/bug20964_1
@@ -22,15 +22,6 @@ puts "Finish boolean operation ..."
 
 set length 323.636
 
-set nb_v_good 6
-set nb_e_good 6
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 13
-
+checknbshapes result -vertex 6 -edge 6 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 13
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20964_2 b/tests/bugs/modalg_2/bug20964_2
index fe3da0924a..1e8bb230c4 100755
--- a/tests/bugs/modalg_2/bug20964_2
+++ b/tests/bugs/modalg_2/bug20964_2
@@ -22,15 +22,6 @@ puts "Finish boolean operation ..."
 
 set square 5164.66
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 34
-
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 34
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20964_3 b/tests/bugs/modalg_2/bug20964_3
index 4b1e8e6f49..c62ecf9cbd 100755
--- a/tests/bugs/modalg_2/bug20964_3
+++ b/tests/bugs/modalg_2/bug20964_3
@@ -22,15 +22,6 @@ puts "Finish boolean operation ..."
 
 set square 828829
 
-set nb_v_good 20
-set nb_e_good 32
-set nb_w_good 18
-set nb_f_good 16
-set nb_sh_good 3
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 91
-
+checknbshapes result -vertex 20 -edge 32 -wire 18 -face 16 -shell 3 -solid 1 -compsolid 0 -compound 1 -shape 91
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20964_4 b/tests/bugs/modalg_2/bug20964_4
index 856e2d15b2..c298fbf570 100755
--- a/tests/bugs/modalg_2/bug20964_4
+++ b/tests/bugs/modalg_2/bug20964_4
@@ -22,15 +22,6 @@ puts "Finish boolean operation ..."
 
 set square 821892
 
-set nb_v_good 22
-set nb_e_good 35
-set nb_w_good 17
-set nb_f_good 14
-set nb_sh_good 2
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 92
-
+checknbshapes result -vertex 22 -edge 35 -wire 17 -face 14 -shell 2 -solid 1 -compsolid 0 -compound 1 -shape 92
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug20964_5 b/tests/bugs/modalg_2/bug20964_5
index 79e8d6d185..121f4a8418 100755
--- a/tests/bugs/modalg_2/bug20964_5
+++ b/tests/bugs/modalg_2/bug20964_5
@@ -22,15 +22,6 @@ puts "Finish boolean operation ..."
 
 set square 12101.2
 
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 34
-
+checknbshapes result -vertex 6 -edge 9 -wire 7 -face 7 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 34
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug21060 b/tests/bugs/modalg_2/bug21060
index bef0a13ec4..e1ac033362 100755
--- a/tests/bugs/modalg_2/bug21060
+++ b/tests/bugs/modalg_2/bug21060
@@ -1,5 +1,5 @@
 puts "TODO OCC11111 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of"
 puts "TODO OCC11111 ALL: Error : The square of result shape is"
 
 puts "================"
@@ -20,14 +20,5 @@ vfit
 
 set square 12
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 4 -edge 4 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug21255 b/tests/bugs/modalg_2/bug21255
index a72cd2ff8a..e59b6a5161 100755
--- a/tests/bugs/modalg_2/bug21255
+++ b/tests/bugs/modalg_2/bug21255
@@ -18,16 +18,7 @@ if [catch { chamf result ss ss_7_2 ss_7 5. 5. } ] {
 } else {
 set square 45382.5
 
-set nb_v_good 15
-set nb_e_good 22
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 58
-
+checknbshapes result -vertex 15 -edge 22 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 58
   set 3dviewer 0
   vdisplay result
   vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug21261_1 b/tests/bugs/modalg_2/bug21261_1
index 7ee67a8830..c3de672cf2 100755
--- a/tests/bugs/modalg_2/bug21261_1
+++ b/tests/bugs/modalg_2/bug21261_1
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 36766
 
-set nb_v_good 4
-set nb_e_good 10
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 24
-
+checknbshapes result -vertex 4 -edge 10 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 24
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_10 b/tests/bugs/modalg_2/bug21261_10
index fc70d13b7e..2f688c09e4 100755
--- a/tests/bugs/modalg_2/bug21261_10
+++ b/tests/bugs/modalg_2/bug21261_10
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 29923.6
 
-set nb_v_good 4
-set nb_e_good 10
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 24
-
+checknbshapes result -vertex 4 -edge 10 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 24
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_11 b/tests/bugs/modalg_2/bug21261_11
index c3f03ac594..c8f4705a2f 100755
--- a/tests/bugs/modalg_2/bug21261_11
+++ b/tests/bugs/modalg_2/bug21261_11
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 11054.2
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_12 b/tests/bugs/modalg_2/bug21261_12
index 1c31e44fc8..1feb69d647 100755
--- a/tests/bugs/modalg_2/bug21261_12
+++ b/tests/bugs/modalg_2/bug21261_12
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 39635.4
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_13 b/tests/bugs/modalg_2/bug21261_13
index c032529645..03bfbe91b3 100755
--- a/tests/bugs/modalg_2/bug21261_13
+++ b/tests/bugs/modalg_2/bug21261_13
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 73788.5
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_14 b/tests/bugs/modalg_2/bug21261_14
index 3fd9069d3a..d75cb9d64b 100755
--- a/tests/bugs/modalg_2/bug21261_14
+++ b/tests/bugs/modalg_2/bug21261_14
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 27432.4
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_15 b/tests/bugs/modalg_2/bug21261_15
index 998fdb19ac..cf5d68d074 100755
--- a/tests/bugs/modalg_2/bug21261_15
+++ b/tests/bugs/modalg_2/bug21261_15
@@ -1,6 +1,5 @@
 puts "TODO OCC25916 ALL: ERROR. C0 continuity of input data."
-puts "TODO OCC26556 ALL: result is not a topological shape!!!"
-puts "TODO OCC26556 ALL: Error: object with name 'result' does not exist!"
+puts "TODO OCC26556 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
 puts "TODO OCC25916 ALL: TEST INCOMPLETE"
 puts "========"
 puts "OCC21261"
@@ -18,16 +17,7 @@ thickshell result s -5
 
 set square 27432.4
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 vinit
 vdisplay result
 vsetdispmode 0
diff --git a/tests/bugs/modalg_2/bug21261_16 b/tests/bugs/modalg_2/bug21261_16
index 55d1c839dc..2cc5a42b53 100755
--- a/tests/bugs/modalg_2/bug21261_16
+++ b/tests/bugs/modalg_2/bug21261_16
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 17592.2
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_17 b/tests/bugs/modalg_2/bug21261_17
index 916e526bee..c6fe6b020c 100755
--- a/tests/bugs/modalg_2/bug21261_17
+++ b/tests/bugs/modalg_2/bug21261_17
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 10250
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_18 b/tests/bugs/modalg_2/bug21261_18
index 1bc951d269..2c9f01d082 100755
--- a/tests/bugs/modalg_2/bug21261_18
+++ b/tests/bugs/modalg_2/bug21261_18
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 30288.5
 
-set nb_v_good 4
-set nb_e_good 10
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 24
-
+checknbshapes result -vertex 4 -edge 10 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 24
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_19 b/tests/bugs/modalg_2/bug21261_19
index 4b7265a209..d4a1df0eb5 100755
--- a/tests/bugs/modalg_2/bug21261_19
+++ b/tests/bugs/modalg_2/bug21261_19
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 47143.4
 
-set nb_v_good 26
-set nb_e_good 47
-set nb_w_good 23
-set nb_f_good 21
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 119
-
+checknbshapes result -vertex 26 -edge 47 -wire 23 -face 21 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 119
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_2 b/tests/bugs/modalg_2/bug21261_2
index d0e2aa33a5..41b0732f4f 100755
--- a/tests/bugs/modalg_2/bug21261_2
+++ b/tests/bugs/modalg_2/bug21261_2
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 30288.5
 
-set nb_v_good 4
-set nb_e_good 10
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 24
-
+checknbshapes result -vertex 4 -edge 10 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 24
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_20 b/tests/bugs/modalg_2/bug21261_20
index 1fbb0ea8cc..d0c84fe692 100755
--- a/tests/bugs/modalg_2/bug21261_20
+++ b/tests/bugs/modalg_2/bug21261_20
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 25639.3
 
-set nb_v_good 18
-set nb_e_good 31
-set nb_w_good 17
-set nb_f_good 15
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 83
-
+checknbshapes result -vertex 18 -edge 31 -wire 17 -face 15 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 83
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_21 b/tests/bugs/modalg_2/bug21261_21
index 248dfeebd5..1b74cb73e3 100755
--- a/tests/bugs/modalg_2/bug21261_21
+++ b/tests/bugs/modalg_2/bug21261_21
@@ -1,6 +1,5 @@
 puts "TODO OCC25916 ALL: ERROR. Incorrect set of faces to remove, the remaining shell is not connected."
-puts "TODO OCC26556 ALL: result is not a topological shape!!!"
-puts "TODO OCC26556 ALL: Error: object with name 'result' does not exist!"
+puts "TODO OCC26556 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
 puts "TODO OCC25916 ALL: TEST INCOMPLETE"
 puts "========"
 puts "OCC21261"
@@ -18,16 +17,7 @@ thickshell result s -5
 
 set square 25639.3
 
-set nb_v_good 18
-set nb_e_good 31
-set nb_w_good 17
-set nb_f_good 15
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 83
-
+checknbshapes result -vertex 18 -edge 31 -wire 17 -face 15 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 83
 vinit
 vdisplay result
 vsetdispmode 0
diff --git a/tests/bugs/modalg_2/bug21261_22 b/tests/bugs/modalg_2/bug21261_22
index 09eb9cd3d8..35d42cc833 100755
--- a/tests/bugs/modalg_2/bug21261_22
+++ b/tests/bugs/modalg_2/bug21261_22
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 66487
 
-set nb_v_good 12
-set nb_e_good 24
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 62
-
+checknbshapes result -vertex 12 -edge 24 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 62
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_23 b/tests/bugs/modalg_2/bug21261_23
index 47eb322056..5261c22bf6 100755
--- a/tests/bugs/modalg_2/bug21261_23
+++ b/tests/bugs/modalg_2/bug21261_23
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 115498
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_24 b/tests/bugs/modalg_2/bug21261_24
index 6008aa03de..9de243f05d 100755
--- a/tests/bugs/modalg_2/bug21261_24
+++ b/tests/bugs/modalg_2/bug21261_24
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 44935.7
 
-set nb_v_good 16
-set nb_e_good 28
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 74
-
+checknbshapes result -vertex 16 -edge 28 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 74
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_25 b/tests/bugs/modalg_2/bug21261_25
index 5de4defa42..ce33212a13 100755
--- a/tests/bugs/modalg_2/bug21261_25
+++ b/tests/bugs/modalg_2/bug21261_25
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 29923.6
 
-set nb_v_good 4
-set nb_e_good 10
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 24
-
+checknbshapes result -vertex 4 -edge 10 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 24
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_26 b/tests/bugs/modalg_2/bug21261_26
index a7dc8f5787..fae03bca91 100755
--- a/tests/bugs/modalg_2/bug21261_26
+++ b/tests/bugs/modalg_2/bug21261_26
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 11054.2
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_27 b/tests/bugs/modalg_2/bug21261_27
index 931992378d..f921d50f82 100755
--- a/tests/bugs/modalg_2/bug21261_27
+++ b/tests/bugs/modalg_2/bug21261_27
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 39635.4
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_28 b/tests/bugs/modalg_2/bug21261_28
index 586fb27b89..5d963079a9 100755
--- a/tests/bugs/modalg_2/bug21261_28
+++ b/tests/bugs/modalg_2/bug21261_28
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 73788.5
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_29 b/tests/bugs/modalg_2/bug21261_29
index 75dd3fd5a7..311b86b24f 100755
--- a/tests/bugs/modalg_2/bug21261_29
+++ b/tests/bugs/modalg_2/bug21261_29
@@ -14,16 +14,7 @@ thickshell result s -2
 
 set square 4087.41
 
-set nb_v_good 30
-set nb_e_good 51
-set nb_w_good 21
-set nb_f_good 21
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 125
-
+checknbshapes result -vertex 30 -edge 51 -wire 21 -face 21 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 125
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_3 b/tests/bugs/modalg_2/bug21261_3
index 3f2b69999d..ef613251dc 100755
--- a/tests/bugs/modalg_2/bug21261_3
+++ b/tests/bugs/modalg_2/bug21261_3
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 61710.5
 
-set nb_v_good 12
-set nb_e_good 24
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 62
-
+checknbshapes result -vertex 12 -edge 24 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 62
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_30 b/tests/bugs/modalg_2/bug21261_30
index 8251213233..c7cf10d304 100755
--- a/tests/bugs/modalg_2/bug21261_30
+++ b/tests/bugs/modalg_2/bug21261_30
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 27432.4
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_31 b/tests/bugs/modalg_2/bug21261_31
index 6c99ac2e10..a3c4b6584e 100755
--- a/tests/bugs/modalg_2/bug21261_31
+++ b/tests/bugs/modalg_2/bug21261_31
@@ -14,16 +14,7 @@ thickshell result s 2
 
 set square 9163.91
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_32 b/tests/bugs/modalg_2/bug21261_32
index d98eec63ed..bc2b69bd61 100755
--- a/tests/bugs/modalg_2/bug21261_32
+++ b/tests/bugs/modalg_2/bug21261_32
@@ -14,16 +14,7 @@ thickshell result s 2
 
 set square 5315.89
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_33 b/tests/bugs/modalg_2/bug21261_33
index 77289f8c00..69217e0ca7 100755
--- a/tests/bugs/modalg_2/bug21261_33
+++ b/tests/bugs/modalg_2/bug21261_33
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 50357.1
 
-set nb_v_good 34
-set nb_e_good 67
-set nb_w_good 35
-set nb_f_good 33
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 171
-
+checknbshapes result -vertex 34 -edge 67 -wire 35 -face 33 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 171
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_34 b/tests/bugs/modalg_2/bug21261_34
index e7e71b5d71..10772fc889 100755
--- a/tests/bugs/modalg_2/bug21261_34
+++ b/tests/bugs/modalg_2/bug21261_34
@@ -14,16 +14,7 @@ thickshell result s 5 i
 
 set square 50743.4
 
-set nb_v_good 26
-set nb_e_good 47
-set nb_w_good 23
-set nb_f_good 21
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 119
-
+checknbshapes result -vertex 26 -edge 47 -wire 23 -face 21 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 119
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_35 b/tests/bugs/modalg_2/bug21261_35
index d57ced8018..3883be652a 100755
--- a/tests/bugs/modalg_2/bug21261_35
+++ b/tests/bugs/modalg_2/bug21261_35
@@ -14,16 +14,7 @@ thickshell result s -5 i
 
 set square 47143.4
 
-set nb_v_good 26
-set nb_e_good 47
-set nb_w_good 23
-set nb_f_good 21
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 119
-
+checknbshapes result -vertex 26 -edge 47 -wire 23 -face 21 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 119
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_36 b/tests/bugs/modalg_2/bug21261_36
index 01f3cf4a77..310796f1d3 100755
--- a/tests/bugs/modalg_2/bug21261_36
+++ b/tests/bugs/modalg_2/bug21261_36
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 24835.8
 
-set nb_v_good 16
-set nb_e_good 26
-set nb_w_good 14
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 70
-
+checknbshapes result -vertex 16 -edge 26 -wire 14 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 70
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_37 b/tests/bugs/modalg_2/bug21261_37
index 35cbd24edb..b276f848e9 100755
--- a/tests/bugs/modalg_2/bug21261_37
+++ b/tests/bugs/modalg_2/bug21261_37
@@ -14,16 +14,7 @@ thickshell result s 5 i
 
 set square 24835.8
 
-set nb_v_good 16
-set nb_e_good 26
-set nb_w_good 14
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 70
-
+checknbshapes result -vertex 16 -edge 26 -wire 14 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 70
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_38 b/tests/bugs/modalg_2/bug21261_38
index c0bdb0cb82..87213a96cb 100755
--- a/tests/bugs/modalg_2/bug21261_38
+++ b/tests/bugs/modalg_2/bug21261_38
@@ -14,16 +14,7 @@ thickshell result s -5 i
 
 set square 25735.8
 
-set nb_v_good 16
-set nb_e_good 26
-set nb_w_good 14
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 70
-
+checknbshapes result -vertex 16 -edge 26 -wire 14 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 70
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_39 b/tests/bugs/modalg_2/bug21261_39
index 6c9166cd16..37bdef3343 100755
--- a/tests/bugs/modalg_2/bug21261_39
+++ b/tests/bugs/modalg_2/bug21261_39
@@ -14,16 +14,7 @@ thickshell result s 2
 
 set square 4435.62
 
-set nb_v_good 30
-set nb_e_good 51
-set nb_w_good 21
-set nb_f_good 21
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 125
-
+checknbshapes result -vertex 30 -edge 51 -wire 21 -face 21 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 125
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_4 b/tests/bugs/modalg_2/bug21261_4
index 383db1529c..fa41df8cb2 100755
--- a/tests/bugs/modalg_2/bug21261_4
+++ b/tests/bugs/modalg_2/bug21261_4
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 66487
 
-set nb_v_good 12
-set nb_e_good 24
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 62
-
+checknbshapes result -vertex 12 -edge 24 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 62
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_40 b/tests/bugs/modalg_2/bug21261_40
index 27ebea0aaf..62ade11c37 100755
--- a/tests/bugs/modalg_2/bug21261_40
+++ b/tests/bugs/modalg_2/bug21261_40
@@ -14,16 +14,7 @@ thickshell result s -5 i
 
 set square 115498
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_41 b/tests/bugs/modalg_2/bug21261_41
index 5e4bec418b..d0f0624b7c 100755
--- a/tests/bugs/modalg_2/bug21261_41
+++ b/tests/bugs/modalg_2/bug21261_41
@@ -14,16 +14,7 @@ thickshell result s 5 i
 
 set square 110064
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_42 b/tests/bugs/modalg_2/bug21261_42
index 4597a3add0..f54285619e 100755
--- a/tests/bugs/modalg_2/bug21261_42
+++ b/tests/bugs/modalg_2/bug21261_42
@@ -14,16 +14,7 @@ thickshell result s -5 i
 
 set square 44935.7
 
-set nb_v_good 16
-set nb_e_good 28
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 74
-
+checknbshapes result -vertex 16 -edge 28 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 74
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_43 b/tests/bugs/modalg_2/bug21261_43
index 6a03d51f80..ee537546a6 100755
--- a/tests/bugs/modalg_2/bug21261_43
+++ b/tests/bugs/modalg_2/bug21261_43
@@ -14,16 +14,7 @@ thickshell result s 5 i
 
 set square 43286.4
 
-set nb_v_good 16
-set nb_e_good 28
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 74
-
+checknbshapes result -vertex 16 -edge 28 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 74
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_44 b/tests/bugs/modalg_2/bug21261_44
index 46f35d0f26..392c446986 100755
--- a/tests/bugs/modalg_2/bug21261_44
+++ b/tests/bugs/modalg_2/bug21261_44
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 14506.6
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_45 b/tests/bugs/modalg_2/bug21261_45
index 7335481849..968d5099b0 100755
--- a/tests/bugs/modalg_2/bug21261_45
+++ b/tests/bugs/modalg_2/bug21261_45
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 48246.4
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_46 b/tests/bugs/modalg_2/bug21261_46
index 9f45d2907a..7ddb26335c 100755
--- a/tests/bugs/modalg_2/bug21261_46
+++ b/tests/bugs/modalg_2/bug21261_46
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 83884.6
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_5 b/tests/bugs/modalg_2/bug21261_5
index 4f0d5261a3..3cf8823591 100755
--- a/tests/bugs/modalg_2/bug21261_5
+++ b/tests/bugs/modalg_2/bug21261_5
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 110064
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_6 b/tests/bugs/modalg_2/bug21261_6
index cb32f22792..84263e9102 100755
--- a/tests/bugs/modalg_2/bug21261_6
+++ b/tests/bugs/modalg_2/bug21261_6
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 115498
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_7 b/tests/bugs/modalg_2/bug21261_7
index 10b4db5827..a2d66ffe35 100755
--- a/tests/bugs/modalg_2/bug21261_7
+++ b/tests/bugs/modalg_2/bug21261_7
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 43286.4
 
-set nb_v_good 16
-set nb_e_good 28
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 74
-
+checknbshapes result -vertex 16 -edge 28 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 74
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_8 b/tests/bugs/modalg_2/bug21261_8
index f9a3650715..99b93d51a6 100755
--- a/tests/bugs/modalg_2/bug21261_8
+++ b/tests/bugs/modalg_2/bug21261_8
@@ -14,16 +14,7 @@ thickshell result s -5
 
 set square 44935.7
 
-set nb_v_good 16
-set nb_e_good 28
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 74
-
+checknbshapes result -vertex 16 -edge 28 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 74
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21261_9 b/tests/bugs/modalg_2/bug21261_9
index 31f0162c0b..0ca859bb9c 100755
--- a/tests/bugs/modalg_2/bug21261_9
+++ b/tests/bugs/modalg_2/bug21261_9
@@ -14,16 +14,7 @@ thickshell result s 5
 
 set square 36363.8
 
-set nb_v_good 4
-set nb_e_good 10
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 24
-
+checknbshapes result -vertex 4 -edge 10 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 24
 
 
 vinit
diff --git a/tests/bugs/modalg_2/bug21415 b/tests/bugs/modalg_2/bug21415
index 076ff40311..9650ba31a9 100755
--- a/tests/bugs/modalg_2/bug21415
+++ b/tests/bugs/modalg_2/bug21415
@@ -42,14 +42,5 @@ set square 400000
 puts "TEMPORARY!!!!!!!!!!!!!!!!!"
 
 # Analysis of "nbshapes res"
-set nb_v_good 1
-set nb_e_good 2
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 5
-
+checknbshapes result -vertex 1 -edge 2 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 5
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug21448 b/tests/bugs/modalg_2/bug21448
index 2fb2f90336..f10a24cc7c 100755
--- a/tests/bugs/modalg_2/bug21448
+++ b/tests/bugs/modalg_2/bug21448
@@ -32,16 +32,7 @@ puts "Finish Make pipe ..."
 
 set square 1040.94
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 15
-
+checknbshapes result -vertex 4 -edge 6 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 15
 vinit
 vsetdispmode 0
 vdisplay result
diff --git a/tests/bugs/modalg_2/bug21460 b/tests/bugs/modalg_2/bug21460
index 3195699117..d8a47eebd2 100755
--- a/tests/bugs/modalg_2/bug21460
+++ b/tests/bugs/modalg_2/bug21460
@@ -25,14 +25,5 @@ set mistake 0
 
 set length 448.285
 
-set nb_v_good 5
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 10
-
+checknbshapes result -vertex 5 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug21540 b/tests/bugs/modalg_2/bug21540
index 489c942251..978f588b03 100755
--- a/tests/bugs/modalg_2/bug21540
+++ b/tests/bugs/modalg_2/bug21540
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set length 462.35
 
-set nb_v_good 58
-set nb_e_good 58
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 117
-
+checknbshapes result -vertex 58 -edge 58 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 117
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug21652_1 b/tests/bugs/modalg_2/bug21652_1
index e274f3f340..bb07f618d1 100755
--- a/tests/bugs/modalg_2/bug21652_1
+++ b/tests/bugs/modalg_2/bug21652_1
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of"
 
 puts "============"
 puts "OCC21652"
@@ -20,16 +20,7 @@ if [catch { mkoffset resoffset a 1 1.0 } ] {
 
 set length 372.531
 
-set nb_v_good 93
-set nb_e_good 93
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 187
-}
+checknbshapes result -vertex 93 -edge 93 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 187}
 
 set 2dviewer 1
 
diff --git a/tests/bugs/modalg_2/bug21652_2 b/tests/bugs/modalg_2/bug21652_2
index 471b37763a..ccb0529bbe 100755
--- a/tests/bugs/modalg_2/bug21652_2
+++ b/tests/bugs/modalg_2/bug21652_2
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of"
 
 puts "============"
 puts "OCC21652"
@@ -20,14 +20,5 @@ if [catch { mkoffset resoffset a 1 0.9 } ] {
 
 set length 371.913
 
-set nb_v_good 93
-set nb_e_good 93
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 187
-}
+checknbshapes result -vertex 93 -edge 93 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 187}
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug21722 b/tests/bugs/modalg_2/bug21722
index 3cc537f316..d683520524 100755
--- a/tests/bugs/modalg_2/bug21722
+++ b/tests/bugs/modalg_2/bug21722
@@ -27,15 +27,6 @@ puts "Finish boolean operation ..."
 
 set length 1.91376
 
-set nb_v_good 4
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 7
-
+checknbshapes result -vertex 4 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 7
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug21754 b/tests/bugs/modalg_2/bug21754
index 0471cf896f..553b246313 100755
--- a/tests/bugs/modalg_2/bug21754
+++ b/tests/bugs/modalg_2/bug21754
@@ -20,16 +20,7 @@ mkface p pl 0 10 -5 5
 
 bsection result f p -na
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set length 0.592137
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22109_1 b/tests/bugs/modalg_2/bug22109_1
index 02896eeb26..7b1f0fee8d 100755
--- a/tests/bugs/modalg_2/bug22109_1
+++ b/tests/bugs/modalg_2/bug22109_1
@@ -21,15 +21,6 @@ puts "Start boolean operation ..."
 bopcommon result
 puts "Finish boolean operation ..."
 
-set nb_v_good 0
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1
-
+checknbshapes result -vertex 0 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 1
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22109_2 b/tests/bugs/modalg_2/bug22109_2
index 5d8b30b602..1f97df0555 100755
--- a/tests/bugs/modalg_2/bug22109_2
+++ b/tests/bugs/modalg_2/bug22109_2
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set square 87449.7
 
-set nb_v_good 17
-set nb_e_good 25
-set nb_w_good 14
-set nb_f_good 10
-set nb_sh_good 2
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 70
-
+checknbshapes result -vertex 17 -edge 25 -wire 14 -face 10 -shell 2 -solid 1 -compsolid 0 -compound 1 -shape 70
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22109_3 b/tests/bugs/modalg_2/bug22109_3
index de4c84fb3a..894dff6cdb 100755
--- a/tests/bugs/modalg_2/bug22109_3
+++ b/tests/bugs/modalg_2/bug22109_3
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set square 87443.6
 
-set nb_v_good 16
-set nb_e_good 23
-set nb_w_good 14
-set nb_f_good 10
-set nb_sh_good 2
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 67
-
+checknbshapes result -vertex 16 -edge 23 -wire 14 -face 10 -shell 2 -solid 1 -compsolid 0 -compound 1 -shape 67
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22109_4 b/tests/bugs/modalg_2/bug22109_4
index 42d9186f4e..7df1db4ddc 100755
--- a/tests/bugs/modalg_2/bug22109_4
+++ b/tests/bugs/modalg_2/bug22109_4
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set square 1140.6
 
-set nb_v_good 5
-set nb_e_good 9
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 25
-
+checknbshapes result -vertex 5 -edge 9 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 25
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22109_5 b/tests/bugs/modalg_2/bug22109_5
index d06800cfd5..3571153992 100755
--- a/tests/bugs/modalg_2/bug22109_5
+++ b/tests/bugs/modalg_2/bug22109_5
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set length 127.699
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 11
-
+checknbshapes result -vertex 4 -edge 6 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 11
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22306_1 b/tests/bugs/modalg_2/bug22306_1
index f693ce32c6..9e411d5f0a 100755
--- a/tests/bugs/modalg_2/bug22306_1
+++ b/tests/bugs/modalg_2/bug22306_1
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 
 set square 655.829
 
-set nb_v_good 5
-set nb_e_good 10
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 26
-
+checknbshapes result -vertex 5 -edge 10 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 26
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug22306_2 b/tests/bugs/modalg_2/bug22306_2
index a30432e7cd..0ccb3ed199 100755
--- a/tests/bugs/modalg_2/bug22306_2
+++ b/tests/bugs/modalg_2/bug22306_2
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set square 458.125
 
-set nb_v_good 4
-set nb_e_good 7
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 7 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 22
 set 3dviewer 1
 
diff --git a/tests/bugs/modalg_2/bug22306_3 b/tests/bugs/modalg_2/bug22306_3
index 32a043eadf..c6a43d1aeb 100755
--- a/tests/bugs/modalg_2/bug22306_3
+++ b/tests/bugs/modalg_2/bug22306_3
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 
 set square 327.269
 
-set nb_v_good 5
-set nb_e_good 10
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 26
-
+checknbshapes result -vertex 5 -edge 10 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 26
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug22306_4 b/tests/bugs/modalg_2/bug22306_4
index e9949b4092..42a9bc8481 100755
--- a/tests/bugs/modalg_2/bug22306_4
+++ b/tests/bugs/modalg_2/bug22306_4
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 
 set length 26.4582
 
-set nb_v_good 3
-set nb_e_good 3
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 7
-
+checknbshapes result -vertex 3 -edge 3 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 7
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug22306_5 b/tests/bugs/modalg_2/bug22306_5
index bb5181f0c6..5323ecf6fc 100755
--- a/tests/bugs/modalg_2/bug22306_5
+++ b/tests/bugs/modalg_2/bug22306_5
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 
 set square 129.564
 
-set nb_v_good 4
-set nb_e_good 7
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 7 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 22
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug22310 b/tests/bugs/modalg_2/bug22310
index 4535479732..eb27904bdd 100755
--- a/tests/bugs/modalg_2/bug22310
+++ b/tests/bugs/modalg_2/bug22310
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set square 0.0457691
 
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 28
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 28
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22356 b/tests/bugs/modalg_2/bug22356
index f8dfc8ff58..42aa323d48 100755
--- a/tests/bugs/modalg_2/bug22356
+++ b/tests/bugs/modalg_2/bug22356
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set length 300
 
-set nb_v_good 3
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 6
-
+checknbshapes result -vertex 3 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 6
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22361 b/tests/bugs/modalg_2/bug22361
index 257be48c33..190b1b58e8 100755
--- a/tests/bugs/modalg_2/bug22361
+++ b/tests/bugs/modalg_2/bug22361
@@ -24,14 +24,5 @@ buildsweep result
 
 set square 2745.88
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 3dviewer 0
diff --git a/tests/bugs/modalg_2/bug22409_1 b/tests/bugs/modalg_2/bug22409_1
index be3f117efd..e3e1f8388c 100755
--- a/tests/bugs/modalg_2/bug22409_1
+++ b/tests/bugs/modalg_2/bug22409_1
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set square 14969
 
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 28
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 28
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22409_2 b/tests/bugs/modalg_2/bug22409_2
index f0141b4088..b5660a41a7 100755
--- a/tests/bugs/modalg_2/bug22409_2
+++ b/tests/bugs/modalg_2/bug22409_2
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set square 366764
 
-set nb_v_good 40
-set nb_e_good 60
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 147
-
+checknbshapes result -vertex 40 -edge 60 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 147
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22436 b/tests/bugs/modalg_2/bug22436
index 3b4e2f3839..f630dae5c5 100755
--- a/tests/bugs/modalg_2/bug22436
+++ b/tests/bugs/modalg_2/bug22436
@@ -17,14 +17,5 @@ renamevar b1_1 result
 
 set square 3.2e+11
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 59
-
+checknbshapes result -vertex 12 -edge 20 -wire 11 -face 11 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 59
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22557 b/tests/bugs/modalg_2/bug22557
index b595e5e313..56892c21fc 100755
--- a/tests/bugs/modalg_2/bug22557
+++ b/tests/bugs/modalg_2/bug22557
@@ -1,5 +1,5 @@
 puts "TODO OCC21564 ALL: The square of result shape is"
-puts "TODO OCC21564 ALL: Result shape is WRONG because it must contains"
+puts "TODO OCC21564 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC22557"
@@ -26,15 +26,6 @@ puts "Finish boolean operation ..."
 
 set square 0.172993
 
-set nb_v_good 192
-set nb_e_good 288
-set nb_w_good 98
-set nb_f_good 98
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 679
-
+checknbshapes result -vertex 192 -edge 288 -wire 98 -face 98 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 679
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22588 b/tests/bugs/modalg_2/bug22588
index c863854414..b21e9e861a 100755
--- a/tests/bugs/modalg_2/bug22588
+++ b/tests/bugs/modalg_2/bug22588
@@ -21,16 +21,7 @@ revol result face2 0 0 0 0 0 1 45
 
 set square 5694.99
 
-set nb_v_good 3
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 3 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 vinit
 vdisplay result
 vfit
diff --git a/tests/bugs/modalg_2/bug22631 b/tests/bugs/modalg_2/bug22631
index 2c53e9d332..0cc6bdbf4e 100755
--- a/tests/bugs/modalg_2/bug22631
+++ b/tests/bugs/modalg_2/bug22631
@@ -14,16 +14,7 @@ testreadstep [locate_data_file OCC22145.stp] result
 
 set square 205444
 
-set nb_v_good 3344
-set nb_e_good 4679
-set nb_w_good 1943
-set nb_f_good 1943
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 11913
-
+checknbshapes result -vertex 3344 -edge 4679 -wire 1943 -face 1943 -shell 1 -solid 1 -compsolid 0 -compound 2 -shape 11913
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug22641 b/tests/bugs/modalg_2/bug22641
index 0ef73b8591..428c41d48f 100755
--- a/tests/bugs/modalg_2/bug22641
+++ b/tests/bugs/modalg_2/bug22641
@@ -1,5 +1,5 @@
 puts "TODO OCC11111 ALL: Error : The square of result shape is"
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of"
 
 puts "================"
 puts "OCC22641"
@@ -17,16 +17,7 @@ testreadstep [locate_data_file OCC22641-RailBosch.stp] result
 
 set square 160133
 
-set nb_v_good 7608
-set nb_e_good 12032
-set nb_w_good 4750
-set nb_f_good 4444
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 28836
-
+checknbshapes result -vertex 7608 -edge 12032 -wire 4750 -face 4444 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 28836
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug22678 b/tests/bugs/modalg_2/bug22678
index c72b144a17..f650595cff 100755
--- a/tests/bugs/modalg_2/bug22678
+++ b/tests/bugs/modalg_2/bug22678
@@ -23,15 +23,6 @@ puts "Finish boolean operation ..."
 
 set square 574348
 
-set nb_v_good 17
-set nb_e_good 29
-set nb_w_good 16
-set nb_f_good 15
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 80
-
+checknbshapes result -vertex 17 -edge 29 -wire 16 -face 15 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 80
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug22725 b/tests/bugs/modalg_2/bug22725
index acf8bd5c86..bd37cb7175 100755
--- a/tests/bugs/modalg_2/bug22725
+++ b/tests/bugs/modalg_2/bug22725
@@ -23,14 +23,5 @@ if { [catch { thrusections result ${issolid} ${isruled} w1 w2 } catch_result] }
 
 set square 11010.6
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug22727 b/tests/bugs/modalg_2/bug22727
index b6dea86a77..0310b021e7 100755
--- a/tests/bugs/modalg_2/bug22727
+++ b/tests/bugs/modalg_2/bug22727
@@ -16,15 +16,6 @@ blend result t 2. t_3
 
 set square 3545.26
 
-set nb_v_good 12
-set nb_e_good 14
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 34
-
+checknbshapes result -vertex 12 -edge 14 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 1 -shape 34
 set 3dviewer 1
 
diff --git a/tests/bugs/modalg_2/bug22770_1 b/tests/bugs/modalg_2/bug22770_1
index 2a5c32360f..71938d1620 100755
--- a/tests/bugs/modalg_2/bug22770_1
+++ b/tests/bugs/modalg_2/bug22770_1
@@ -26,16 +26,7 @@ sewing result +t 0.1 e1 e2 +e
 
 set length 18.99
 
-set nb_v_good 3
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 6
-
+checknbshapes result -vertex 3 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 6
 checkmaxtol result -ref 0.0050001000000007819
 checknbshapes result -shell 0
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_11 b/tests/bugs/modalg_2/bug22770_11
index 07f49368b1..0ae0a64a31 100755
--- a/tests/bugs/modalg_2/bug22770_11
+++ b/tests/bugs/modalg_2/bug22770_11
@@ -14,16 +14,7 @@ sewing result +t 0.01 a b +mint 0.01 +s
 
 set square 1.88469e+07
 
-set nb_v_good 476
-set nb_e_good 748
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1759
-
+checknbshapes result -vertex 476 -edge 748 -wire 273 -face 259 -shell 2 -solid 0 -compsolid 0 -compound 1 -shape 1759
 checkmaxtol result -ref 0.066338232054955981
 checknbshapes result -shell 2
 checkfreebounds result 6
diff --git a/tests/bugs/modalg_2/bug22770_12 b/tests/bugs/modalg_2/bug22770_12
index a8cd985132..eb5f72b6d4 100755
--- a/tests/bugs/modalg_2/bug22770_12
+++ b/tests/bugs/modalg_2/bug22770_12
@@ -14,16 +14,7 @@ sewing result a b -c
 
 set square 1.8847e+07
 
-set nb_v_good 1061
-set nb_e_good 1255
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 22
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 2871
-
+checknbshapes result -vertex 1061 -edge 1255 -wire 273 -face 259 -shell 22 -solid 0 -compsolid 0 -compound 1 -shape 2871
 checkmaxtol result -ref 0.0451323239933289
 checknbshapes result -shell 22
 checkfreebounds result 1031
diff --git a/tests/bugs/modalg_2/bug22770_13 b/tests/bugs/modalg_2/bug22770_13
index 0409d872fe..7dea01754f 100755
--- a/tests/bugs/modalg_2/bug22770_13
+++ b/tests/bugs/modalg_2/bug22770_13
@@ -30,16 +30,7 @@ sewing result a b +c
 
 set square 1.8847e+07
 
-set nb_v_good 964
-set nb_e_good 1222
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 18
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 2737
-
+checknbshapes result -vertex 964 -edge 1222 -wire 273 -face 259 -shell 18 -solid 0 -compsolid 0 -compound 1 -shape 2737
 checkmaxtol result -ref 0.046734236640099257
 checknbshapes result -shell 18
 checkfreebounds result 926
diff --git a/tests/bugs/modalg_2/bug22770_14 b/tests/bugs/modalg_2/bug22770_14
index e61febf77a..a7eda5d17e 100755
--- a/tests/bugs/modalg_2/bug22770_14
+++ b/tests/bugs/modalg_2/bug22770_14
@@ -14,16 +14,7 @@ sewing result a b +c -f
 
 set square 1.8847e+07
 
-set nb_v_good 1469
-set nb_e_good 1474
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 3476
-
+checknbshapes result -vertex 1469 -edge 1474 -wire 273 -face 259 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 3476
 checkmaxtol result -ref 0.0451323239933289
 checknbshapes result -shell 0
 checkfreebounds result 1469
diff --git a/tests/bugs/modalg_2/bug22770_15 b/tests/bugs/modalg_2/bug22770_15
index 04ab6633d6..2f32a8df33 100755
--- a/tests/bugs/modalg_2/bug22770_15
+++ b/tests/bugs/modalg_2/bug22770_15
@@ -30,16 +30,7 @@ sewing result a b -p
 
 set square 1.8847e+07
 
-set nb_v_good 964
-set nb_e_good 1222
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 18
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 2737
-
+checknbshapes result -vertex 964 -edge 1222 -wire 273 -face 259 -shell 18 -solid 0 -compsolid 0 -compound 1 -shape 2737
 checkmaxtol result -ref 0.046734236640099257
 checknbshapes result -shell 18
 checkfreebounds result 926
diff --git a/tests/bugs/modalg_2/bug22770_16 b/tests/bugs/modalg_2/bug22770_16
index 441e8ba1c4..e24bff9e41 100755
--- a/tests/bugs/modalg_2/bug22770_16
+++ b/tests/bugs/modalg_2/bug22770_16
@@ -18,16 +18,7 @@ sewing result 0.1 e1 e2 +e
 
 set length 18.99
 
-set nb_v_good 3
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 6
-
+checknbshapes result -vertex 3 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 6
 checkmaxtol result -ref 0.0050001000000007819
 checknbshapes result -shell 0
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_17 b/tests/bugs/modalg_2/bug22770_17
index 09ba68c2a3..0e234bb2c8 100755
--- a/tests/bugs/modalg_2/bug22770_17
+++ b/tests/bugs/modalg_2/bug22770_17
@@ -18,16 +18,7 @@ sewing result 0.1 e1 e2 -e
 
 set length 18.99
 
-set nb_v_good 4
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 7
-
+checknbshapes result -vertex 4 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 7
 checkmaxtol result -ref 9.9999999999999995e-008
 checknbshapes result -shell 0
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_18 b/tests/bugs/modalg_2/bug22770_18
index 02fb639e0a..5467c7e631 100755
--- a/tests/bugs/modalg_2/bug22770_18
+++ b/tests/bugs/modalg_2/bug22770_18
@@ -17,16 +17,7 @@ sewing result 1.1 a_2 b_1
 
 set square 12
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 4 -edge 4 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 checkmaxtol result -ref 1.5
 checknbshapes result -shell 1
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_19 b/tests/bugs/modalg_2/bug22770_19
index 15d02450d4..cc0896892c 100755
--- a/tests/bugs/modalg_2/bug22770_19
+++ b/tests/bugs/modalg_2/bug22770_19
@@ -17,16 +17,7 @@ sewing result 1.1 a_2 b_1 -f
 
 set square 12
 
-set nb_v_good 8
-set nb_e_good 8
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 21
-
+checknbshapes result -vertex 8 -edge 8 -wire 2 -face 2 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 21
 checkmaxtol result -ref 9.9999999999999995e-008
 checknbshapes result -shell 0
 checkfreebounds result 8
diff --git a/tests/bugs/modalg_2/bug22770_2 b/tests/bugs/modalg_2/bug22770_2
index c485ecb4f9..a542f730b5 100755
--- a/tests/bugs/modalg_2/bug22770_2
+++ b/tests/bugs/modalg_2/bug22770_2
@@ -26,16 +26,7 @@ sewing result +t 0.1 e1 e2 -e
 
 set length 18.99
 
-set nb_v_good 4
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 7
-
+checknbshapes result -vertex 4 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 7
 checkmaxtol result -ref 9.9999999999999995e-008
 checknbshapes result -shell 0
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_20 b/tests/bugs/modalg_2/bug22770_20
index e33b67d660..ce71ef2a3c 100755
--- a/tests/bugs/modalg_2/bug22770_20
+++ b/tests/bugs/modalg_2/bug22770_20
@@ -17,16 +17,7 @@ sewing result 1.1 a_2 b_1 +f
 
 set square 12
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 4 -edge 4 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 checkmaxtol result -ref 1.5
 checknbshapes result -shell 1
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_21 b/tests/bugs/modalg_2/bug22770_21
index 386a9f01a6..cbaebe195d 100755
--- a/tests/bugs/modalg_2/bug22770_21
+++ b/tests/bugs/modalg_2/bug22770_21
@@ -17,16 +17,7 @@ sewing result a_2 a_3 b_3
 
 set square 3
 
-set nb_v_good 10
-set nb_e_good 11
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 29
-
+checknbshapes result -vertex 10 -edge 11 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 1 -shape 29
 checkmaxtol result -ref 9.9999999999999995e-008
 checknbshapes result -shell 1
 checkfreebounds result 10
diff --git a/tests/bugs/modalg_2/bug22770_22 b/tests/bugs/modalg_2/bug22770_22
index b1670748b0..cbc7c2077f 100755
--- a/tests/bugs/modalg_2/bug22770_22
+++ b/tests/bugs/modalg_2/bug22770_22
@@ -17,16 +17,7 @@ sewing result a_2 a_3 b_3 +n
 
 set square 3
 
-set nb_v_good 8
-set nb_e_good 10
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 25
-
+checknbshapes result -vertex 8 -edge 10 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 25
 checkmaxtol result -ref 9.9999999999999995e-008
 checknbshapes result -shell 1
 checkfreebounds result 6
diff --git a/tests/bugs/modalg_2/bug22770_23 b/tests/bugs/modalg_2/bug22770_23
index 234e5efb51..d1a0611914 100755
--- a/tests/bugs/modalg_2/bug22770_23
+++ b/tests/bugs/modalg_2/bug22770_23
@@ -15,16 +15,7 @@ sewing result 0.1 a b
 
 set square 1.8847e+07
 
-set nb_v_good 480
-set nb_e_good 741
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1756
-
+checknbshapes result -vertex 480 -edge 741 -wire 273 -face 259 -shell 2 -solid 0 -compsolid 0 -compound 1 -shape 1756
 checkmaxtol result -ref 0.080878557461246572
 checknbshapes result -shell 2
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_24 b/tests/bugs/modalg_2/bug22770_24
index 8aa1987491..193b3a430e 100755
--- a/tests/bugs/modalg_2/bug22770_24
+++ b/tests/bugs/modalg_2/bug22770_24
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "================"
 puts "OCC22770"
@@ -17,16 +17,7 @@ sewing result 0.1 a b +mint 0.01
 
 set square 1.88469e+07
 
-set nb_v_good 476
-set nb_e_good 748
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1759
-
+checknbshapes result -vertex 476 -edge 748 -wire 273 -face 259 -shell 2 -solid 0 -compsolid 0 -compound 1 -shape 1759
 checkmaxtol result -ref 0.080878557461246572
 checknbshapes result -shell 2
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_25 b/tests/bugs/modalg_2/bug22770_25
index 9e449ac87a..efb69db74c 100755
--- a/tests/bugs/modalg_2/bug22770_25
+++ b/tests/bugs/modalg_2/bug22770_25
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "================"
 puts "OCC22770"
@@ -17,16 +17,7 @@ sewing result 0.1 a b +mint 0.01 -a
 
 set square 1.88469e+07
 
-set nb_v_good 478
-set nb_e_good 748
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1761
-
+checknbshapes result -vertex 478 -edge 748 -wire 273 -face 259 -shell 2 -solid 0 -compsolid 0 -compound 1 -shape 1761
 checkmaxtol result -ref 0.080878557461246572
 checknbshapes result -shell 2
 checkfreebounds result 6
diff --git a/tests/bugs/modalg_2/bug22770_26 b/tests/bugs/modalg_2/bug22770_26
index c9d22bbdef..06d6f8bcb0 100755
--- a/tests/bugs/modalg_2/bug22770_26
+++ b/tests/bugs/modalg_2/bug22770_26
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "================"
 puts "OCC22770"
@@ -17,16 +17,7 @@ sewing result 0.1 a b +mint 0.01 +s
 
 set square 1.88469e+07
 
-set nb_v_good 476
-set nb_e_good 748
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1759
-
+checknbshapes result -vertex 476 -edge 748 -wire 273 -face 259 -shell 2 -solid 0 -compsolid 0 -compound 1 -shape 1759
 checkmaxtol result -ref 0.080878557461246572
 checknbshapes result -shell 2
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_27 b/tests/bugs/modalg_2/bug22770_27
index 2fae19537f..e4260eea77 100755
--- a/tests/bugs/modalg_2/bug22770_27
+++ b/tests/bugs/modalg_2/bug22770_27
@@ -15,16 +15,7 @@ sewing result 0.1 a b -c
 
 set square 1.8847e+07
 
-set nb_v_good 483
-set nb_e_good 744
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1762
-
+checknbshapes result -vertex 483 -edge 744 -wire 273 -face 259 -shell 2 -solid 0 -compsolid 0 -compound 1 -shape 1762
 checkmaxtol result -ref 0.080645000662448688
 checknbshapes result -shell 2
 checkfreebounds result 9
diff --git a/tests/bugs/modalg_2/bug22770_28 b/tests/bugs/modalg_2/bug22770_28
index 7801eac050..01e0053993 100755
--- a/tests/bugs/modalg_2/bug22770_28
+++ b/tests/bugs/modalg_2/bug22770_28
@@ -15,16 +15,7 @@ sewing result 0.1 a b +c
 
 set square 1.8847e+07
 
-set nb_v_good 480
-set nb_e_good 741
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1756
-
+checknbshapes result -vertex 480 -edge 741 -wire 273 -face 259 -shell 2 -solid 0 -compsolid 0 -compound 1 -shape 1756
 checkmaxtol result -ref 0.080878557461246572
 checknbshapes result -shell 2
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_29 b/tests/bugs/modalg_2/bug22770_29
index b25fbd2250..fd5e9809e4 100755
--- a/tests/bugs/modalg_2/bug22770_29
+++ b/tests/bugs/modalg_2/bug22770_29
@@ -15,16 +15,7 @@ sewing result 0.1 a b +c -f
 
 set square 1.8847e+07
 
-set nb_v_good 1469
-set nb_e_good 1474
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 3476
-
+checknbshapes result -vertex 1469 -edge 1474 -wire 273 -face 259 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 3476
 checkmaxtol result -ref 0.0451323239933289
 checknbshapes result -shell 0
 checkfreebounds result 1469
diff --git a/tests/bugs/modalg_2/bug22770_3 b/tests/bugs/modalg_2/bug22770_3
index 71ea3bb01a..1dc444d1ff 100755
--- a/tests/bugs/modalg_2/bug22770_3
+++ b/tests/bugs/modalg_2/bug22770_3
@@ -23,16 +23,7 @@ explode b f
 sewing result +t 1.1 a_2 b_1
 
 set square 12
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 4 -edge 4 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 checkmaxtol result -ref 1.5
 checknbshapes result -shell 1
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_30 b/tests/bugs/modalg_2/bug22770_30
index bb7b14d905..57f46889e8 100755
--- a/tests/bugs/modalg_2/bug22770_30
+++ b/tests/bugs/modalg_2/bug22770_30
@@ -15,16 +15,7 @@ sewing result 0.1 a b -p
 
 set square 1.8847e+07
 
-set nb_v_good 480
-set nb_e_good 741
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1756
-
+checknbshapes result -vertex 480 -edge 741 -wire 273 -face 259 -shell 2 -solid 0 -compsolid 0 -compound 1 -shape 1756
 checkmaxtol result -ref 0.080878557461246572
 checknbshapes result -shell 2
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_4 b/tests/bugs/modalg_2/bug22770_4
index 1dca813407..6191108112 100755
--- a/tests/bugs/modalg_2/bug22770_4
+++ b/tests/bugs/modalg_2/bug22770_4
@@ -15,16 +15,7 @@ explode b f
 sewing result +t 1.1 a_2 b_1 -f
 
 set square 12
-set nb_v_good 8
-set nb_e_good 8
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 21
-
+checknbshapes result -vertex 8 -edge 8 -wire 2 -face 2 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 21
 checkmaxtol result -ref 9.9999999999999995e-008
 checknbshapes result -shell 0
 checkfreebounds result 8
diff --git a/tests/bugs/modalg_2/bug22770_5 b/tests/bugs/modalg_2/bug22770_5
index 8bfb84aaa3..25d81da668 100755
--- a/tests/bugs/modalg_2/bug22770_5
+++ b/tests/bugs/modalg_2/bug22770_5
@@ -15,16 +15,7 @@ explode b f
 sewing result +t 1.1 a_2 b_1 +f
 
 set square 12
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 4 -edge 4 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 checkmaxtol result -ref 1.5
 checknbshapes result -shell 1
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22770_6 b/tests/bugs/modalg_2/bug22770_6
index ce982de4e2..621dd49654 100755
--- a/tests/bugs/modalg_2/bug22770_6
+++ b/tests/bugs/modalg_2/bug22770_6
@@ -15,16 +15,7 @@ explode b f
 sewing result a_2 a_3 b_3
 
 set square 3
-set nb_v_good 10
-set nb_e_good 11
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 29
-
+checknbshapes result -vertex 10 -edge 11 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 1 -shape 29
 checkmaxtol result -ref 9.9999999999999995e-008
 checknbshapes result -shell 1
 checkfreebounds result 10
diff --git a/tests/bugs/modalg_2/bug22770_7 b/tests/bugs/modalg_2/bug22770_7
index e9a86d1d85..40de6ea321 100755
--- a/tests/bugs/modalg_2/bug22770_7
+++ b/tests/bugs/modalg_2/bug22770_7
@@ -15,16 +15,7 @@ explode b f
 sewing result a_2 a_3 b_3 +n
 
 set square 3
-set nb_v_good 8
-set nb_e_good 10
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 25
-
+checknbshapes result -vertex 8 -edge 10 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 25
 checkmaxtol result -ref 9.9999999999999995e-008
 checknbshapes result -shell 1
 checkfreebounds result 6
diff --git a/tests/bugs/modalg_2/bug22770_8 b/tests/bugs/modalg_2/bug22770_8
index 9356ae57d1..e5a1361378 100755
--- a/tests/bugs/modalg_2/bug22770_8
+++ b/tests/bugs/modalg_2/bug22770_8
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of "
 
 puts "================"
 puts "OCC22770"
@@ -16,16 +16,7 @@ sewing result +t 0.01 a b
 
 set square 1.88469e+07
 
-set nb_v_good 482
-set nb_e_good 744
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1761
-
+checknbshapes result -vertex 482 -edge 744 -wire 273 -face 259 -shell 2 -solid 0 -compsolid 0 -compound 1 -shape 1761
 checkmaxtol result -ref 0.066338232054955981
 checknbshapes result -shell 2
 checkfreebounds result 6
diff --git a/tests/bugs/modalg_2/bug22770_9 b/tests/bugs/modalg_2/bug22770_9
index 1483719976..8d3fe03907 100755
--- a/tests/bugs/modalg_2/bug22770_9
+++ b/tests/bugs/modalg_2/bug22770_9
@@ -14,16 +14,7 @@ sewing result +t 0.01 a b +mint 0.01
 
 set square 1.88469e+07
 
-set nb_v_good 476
-set nb_e_good 748
-set nb_w_good 273
-set nb_f_good 259
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1759
-
+checknbshapes result -vertex 476 -edge 748 -wire 273 -face 259 -shell 2 -solid 0 -compsolid 0 -compound 1 -shape 1759
 checkmaxtol result -ref 0.066338232054955981
 checknbshapes result -shell 2
 checkfreebounds result 6
diff --git a/tests/bugs/modalg_2/bug22771 b/tests/bugs/modalg_2/bug22771
index ec60b79ad5..5e180038ae 100755
--- a/tests/bugs/modalg_2/bug22771
+++ b/tests/bugs/modalg_2/bug22771
@@ -27,14 +27,5 @@ puts "Finish boolean operation ..."
 
 set length 314.159
 
-set nb_v_good 1
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 3
-
+checknbshapes result -vertex 1 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 3
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug22786 b/tests/bugs/modalg_2/bug22786
index 14d2be34bc..3c4e56f20e 100755
--- a/tests/bugs/modalg_2/bug22786
+++ b/tests/bugs/modalg_2/bug22786
@@ -20,16 +20,7 @@ gplate result 5 0 c_1 0 c_2 0 c_3 0 c_4 0 c_5 0
 
 set square 2.92409
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 10
-
+checknbshapes result -vertex 4 -edge 4 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 10
 
 vinit
 vdisplay c_1 c_2 c_3 c_4 c_5
diff --git a/tests/bugs/modalg_2/bug22790 b/tests/bugs/modalg_2/bug22790
index bf6ed2951d..c935845ea4 100755
--- a/tests/bugs/modalg_2/bug22790
+++ b/tests/bugs/modalg_2/bug22790
@@ -21,15 +21,6 @@ bopfuse result
 
 set square 1.21408e+09
 
-set nb_v_good 11
-set nb_e_good 12
-set nb_w_good 4
-set nb_f_good 2
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 30
-
+checknbshapes result -vertex 11 -edge 12 -wire 4 -face 2 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 30
 set 3dviewer 1
 
diff --git a/tests/bugs/modalg_2/bug22798_1 b/tests/bugs/modalg_2/bug22798_1
index aaee325b0b..1c836b213d 100755
--- a/tests/bugs/modalg_2/bug22798_1
+++ b/tests/bugs/modalg_2/bug22798_1
@@ -13,14 +13,5 @@ nurbsconvert result a
 
 set square 126261
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug22798_2 b/tests/bugs/modalg_2/bug22798_2
index 94d907594f..6a3a77c0ac 100755
--- a/tests/bugs/modalg_2/bug22798_2
+++ b/tests/bugs/modalg_2/bug22798_2
@@ -13,15 +13,6 @@ scalexyz result a 2 3 4
 
 set square 1.12112e+06
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 set 3dviewer 1
 
diff --git a/tests/bugs/modalg_2/bug22801 b/tests/bugs/modalg_2/bug22801
index 2579527a07..bc275126e1 100755
--- a/tests/bugs/modalg_2/bug22801
+++ b/tests/bugs/modalg_2/bug22801
@@ -23,14 +23,5 @@ puts "Finish boolean operation ..."
 
 set square 287634
 
-set nb_v_good 55
-set nb_e_good 97
-set nb_w_good 44
-set nb_f_good 44
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 243
-
+checknbshapes result -vertex 55 -edge 97 -wire 44 -face 44 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 243
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug22814 b/tests/bugs/modalg_2/bug22814
index c0cecf0a7b..d64ad254b8 100755
--- a/tests/bugs/modalg_2/bug22814
+++ b/tests/bugs/modalg_2/bug22814
@@ -16,15 +16,6 @@ bopsection result
 
 set length 0.667008
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 9
-
+checknbshapes result -vertex 4 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9
 set 3dviewer 1
 
diff --git a/tests/bugs/modalg_2/bug22818_1 b/tests/bugs/modalg_2/bug22818_1
index 03048d583f..0fab8c4b54 100755
--- a/tests/bugs/modalg_2/bug22818_1
+++ b/tests/bugs/modalg_2/bug22818_1
@@ -24,16 +24,7 @@ checkshape result
 
 set square 673.385
 
-set nb_v_good 3
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 3 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 vinit
 vdisplay result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug22818_2 b/tests/bugs/modalg_2/bug22818_2
index 676b5bdab2..4a3818871e 100755
--- a/tests/bugs/modalg_2/bug22818_2
+++ b/tests/bugs/modalg_2/bug22818_2
@@ -25,16 +25,7 @@ checkshape result
 
 set square 161.072
 
-set nb_v_good 3
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 3 -edge 8 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 vinit
 vdisplay result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug22818_3 b/tests/bugs/modalg_2/bug22818_3
index 29d5716b31..1659a0df29 100755
--- a/tests/bugs/modalg_2/bug22818_3
+++ b/tests/bugs/modalg_2/bug22818_3
@@ -14,16 +14,7 @@ checkshape result
 
 set square 479.224
 
-set nb_v_good 4
-set nb_e_good 7
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 4 -edge 7 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 vinit
 vdisplay result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug22818_4 b/tests/bugs/modalg_2/bug22818_4
index 83b79ad078..c16603ff26 100755
--- a/tests/bugs/modalg_2/bug22818_4
+++ b/tests/bugs/modalg_2/bug22818_4
@@ -17,16 +17,7 @@ checkshape result
 
 set square 708.32
 
-set nb_v_good 4
-set nb_e_good 7
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 4 -edge 7 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 vinit
 vdisplay result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug22828 b/tests/bugs/modalg_2/bug22828
index d1a27b5a47..ac11820538 100755
--- a/tests/bugs/modalg_2/bug22828
+++ b/tests/bugs/modalg_2/bug22828
@@ -14,15 +14,6 @@ catch { bfuse result b1 b2 }
 
 set square 4029.04
 
-set nb_v_good 11
-set nb_e_good 15
-set nb_w_good 12
-set nb_f_good 9
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 52
-
+checknbshapes result -vertex 11 -edge 15 -wire 12 -face 9 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 52
 set 3dviewer 1
 
diff --git a/tests/bugs/modalg_2/bug22830 b/tests/bugs/modalg_2/bug22830
index 62520d6fa1..84420ddce4 100755
--- a/tests/bugs/modalg_2/bug22830
+++ b/tests/bugs/modalg_2/bug22830
@@ -17,14 +17,5 @@ vfit
 
 set square 52482
 
-set nb_v_good 300
-set nb_e_good 300
-set nb_w_good 30
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 631
-
+checknbshapes result -vertex 300 -edge 300 -wire 30 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 631
 set only_screen 1
diff --git a/tests/bugs/modalg_2/bug22864 b/tests/bugs/modalg_2/bug22864
index 26e4fc8ceb..c90ce3bf95 100755
--- a/tests/bugs/modalg_2/bug22864
+++ b/tests/bugs/modalg_2/bug22864
@@ -15,76 +15,47 @@ shape aShape C
 add f1 aShape
 add f2 aShape
 
-#
 set status 0
-#
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8
-#
 set Numbers 11
-#
-for {set i 0} {$i < ${Numbers}} {incr i} {
-    puts "i=$i"
-    rollingball result aShape 15 @ f1 f2
-    
-    set nb_info [nbshapes result]
-    regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v
-    regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full nb_e
-    regexp {WIRE +: +([-0-9.+eE]+)} $nb_info full nb_w
-    regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_f
-    regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_sh
-    regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_sol
-    regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nb_compsol
-    regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound
-    regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_shape
-    
-    if {$nb_v != $nb_v_good || $nb_e != $nb_e_good ||
-	$nb_w != $nb_w_good || $nb_f != $nb_f_good ||
-	$nb_sh != $nb_sh_good || $nb_sol != $nb_sol_good || 
-	$nb_compsol != $nb_compsol_good || $nb_compound != $nb_compound_good ||
-	$nb_shape != $nb_shape_good } {
-        set status 1
-    }
-     
-    set aFile $imagedir/${test_image}.brep
-    puts "aFile=${aFile}"
-    file delete ${aFile}
-    if { [file exists ${aFile}] } {
-	puts "There is old ${aFile} file; Error"
-	set status 1
-    }
-  #
-    save result ${aFile}
-    catch {exec chmod 777 ${aFile}}
-    if { ![file exists ${aFile}] } {
-	puts "There is not ${aFile} file; save command: Error"
-	set status 1
-    }
 
-    set fp [open ${aFile} "r"]
-    set Log [read -nonewline ${fp}]
-    close ${fp}
+for {set i 0} {$i < ${Numbers}} {incr i} {
+  puts "i=$i"
+  rollingball result aShape 15 @ f1 f2
+  
+  checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 8
+   
+  set aFile $imagedir/${test_image}.brep
+  puts "aFile=${aFile}"
+  file delete ${aFile}
+  if { [file exists ${aFile}] } {
+    puts "There is old ${aFile} file; Error"
+    set status 1
+  }
+
+  save result ${aFile}
+  catch {exec chmod 777 ${aFile}}
+  if { ![file exists ${aFile}] } {
+    puts "There is not ${aFile} file; save command: Error"
+    set status 1
+  }
+
+  set fp [open ${aFile} "r"]
+  set Log [read -nonewline ${fp}]
+  close ${fp}
   #
-    if {$i == 0} {
-	set StandardLog ${Log}
+  if {$i == 0} {
+    set StandardLog ${Log}
+  } else {
+    set info_result [string compare ${Log} ${StandardLog}]
+    if {${info_result} == 0} {
+      # Log == StandardLog
+      puts "Log == StandardLog"
     } else {
-	set info_result [string compare ${Log} ${StandardLog}]
-	if {${info_result} == 0} {
-    	    # Log == StandardLog
-    	    puts "Log == StandardLog"
-	} else {
-    	    # Log != StandardLog
-    	    set status 1
-    	    puts "Log != StandardLog"
-	}
+      # Log != StandardLog
+      set status 1
+      puts "Log != StandardLog"
     }
+  }
 }
 
 # Resume
diff --git a/tests/bugs/modalg_2/bug22881 b/tests/bugs/modalg_2/bug22881
index b0b3d01407..1b5efd8703 100755
--- a/tests/bugs/modalg_2/bug22881
+++ b/tests/bugs/modalg_2/bug22881
@@ -14,16 +14,7 @@ sewing result a
 
 set square 12.819
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 19
-
+checknbshapes result -vertex 4 -edge 6 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 19
 checkmaxtol result -ref 1.6856648382486999e-005
 checknbshapes result -shell 1
 checkfreebounds result 0
diff --git a/tests/bugs/modalg_2/bug22884 b/tests/bugs/modalg_2/bug22884
index 6af4f51902..0670bb037c 100755
--- a/tests/bugs/modalg_2/bug22884
+++ b/tests/bugs/modalg_2/bug22884
@@ -21,16 +21,7 @@ vsetdispmode 1
 
 set square 697.812
 
-set nb_v_good 46
-set nb_e_good 46
-set nb_w_good 3
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 96
-
+checknbshapes result -vertex 46 -edge 46 -wire 3 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 96
 if { "[vreadpixel $x1 $y1 rgb name]" == "BLACK" } {
     puts "Faulty ${BugNumber}"
 } else {
diff --git a/tests/bugs/modalg_2/bug22893 b/tests/bugs/modalg_2/bug22893
index fa98fb2884..6ee63edb12 100755
--- a/tests/bugs/modalg_2/bug22893
+++ b/tests/bugs/modalg_2/bug22893
@@ -14,16 +14,7 @@ igesread [locate_data_file OCC22893-thread_22534_boing777.igs] result *
 
 set square 26974.5
 
-set nb_v_good 4183
-set nb_e_good 4191
-set nb_w_good 653
-set nb_f_good 639
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 9667
-
+checknbshapes result -vertex 4183 -edge 4191 -wire 653 -face 639 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9667
 set 2dviewer 0
 
 
diff --git a/tests/bugs/modalg_2/bug22990 b/tests/bugs/modalg_2/bug22990
index 05470ea4e7..b8762ddfb3 100755
--- a/tests/bugs/modalg_2/bug22990
+++ b/tests/bugs/modalg_2/bug22990
@@ -18,7 +18,8 @@ explode e e
 
 splitshape result s s_1 e_1 e_2
 
-set nb_f_good 3
+checknbshapes result -face 3
+
 set square 1256.64
 set 3dviewer 0
 
diff --git a/tests/bugs/modalg_2/bug23004 b/tests/bugs/modalg_2/bug23004
index d66fb64e74..37e4c3c51c 100755
--- a/tests/bugs/modalg_2/bug23004
+++ b/tests/bugs/modalg_2/bug23004
@@ -14,14 +14,5 @@ bopcut result
 
 set square 31308.8
 
-set nb_v_good 26
-set nb_e_good 41
-set nb_w_good 17
-set nb_f_good 17
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 104
-
+checknbshapes result -vertex 26 -edge 41 -wire 17 -face 17 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 104
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug23029 b/tests/bugs/modalg_2/bug23029
index 0726aed0ce..3f4c59319c 100755
--- a/tests/bugs/modalg_2/bug23029
+++ b/tests/bugs/modalg_2/bug23029
@@ -20,15 +20,6 @@ renamevar res_2 result
 
 set square 27.3919
 
-set nb_v_good 5
-set nb_e_good 5
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 12
-
+checknbshapes result -vertex 5 -edge 5 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 12
 set 3dviewer 1
 
diff --git a/tests/bugs/modalg_2/bug23029_1 b/tests/bugs/modalg_2/bug23029_1
index b6b72cddbc..a386ee3d8e 100755
--- a/tests/bugs/modalg_2/bug23029_1
+++ b/tests/bugs/modalg_2/bug23029_1
@@ -19,16 +19,7 @@ splitshape result a a_1 t
 
 set square 215.198
 
-set nb_v_good 19
-set nb_e_good 21
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 45
-
+checknbshapes result -vertex 19 -edge 21 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 45
 set CheckShape_status 0
 
 set ll [ llength [explode result f2 ] ]
diff --git a/tests/bugs/modalg_2/bug23100 b/tests/bugs/modalg_2/bug23100
index a9210fef8c..de4d6844a0 100755
--- a/tests/bugs/modalg_2/bug23100
+++ b/tests/bugs/modalg_2/bug23100
@@ -19,14 +19,5 @@ catch {bopfuse result}
 
 set square 50252.6
 
-set nb_v_good 34
-set nb_e_good 62
-set nb_w_good 30
-set nb_f_good 29
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 156
-
+checknbshapes result -vertex 34 -edge 62 -wire 30 -face 29 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 156
 set 3dviewer 1
diff --git a/tests/bugs/modalg_2/bug23160 b/tests/bugs/modalg_2/bug23160
index caead06792..aa2b1f9c7e 100755
--- a/tests/bugs/modalg_2/bug23160
+++ b/tests/bugs/modalg_2/bug23160
@@ -15,14 +15,5 @@ bopcut result
 
 set square 270192
 
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 63
-
+checknbshapes result -vertex 16 -edge 24 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 63
 set 3dviewer 0
diff --git a/tests/bugs/modalg_2/bug23470 b/tests/bugs/modalg_2/bug23470
index 8111768a1f..978f6e275c 100755
--- a/tests/bugs/modalg_2/bug23470
+++ b/tests/bugs/modalg_2/bug23470
@@ -11,10 +11,7 @@ explode qe
 bop qe_1 qe_2
 bopfuse result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_shape_good 4
+checknbshapes result -vertex 2 -edge 1 -wire 0 -shape 4
 
 set length 48.4459
 set command bopfuse
diff --git a/tests/bugs/modalg_2/bug23676 b/tests/bugs/modalg_2/bug23676
index d581a5b7c9..6a6be3ac25 100755
--- a/tests/bugs/modalg_2/bug23676
+++ b/tests/bugs/modalg_2/bug23676
@@ -15,12 +15,4 @@ copy b1_3 b2
 bop b1 b2
 bopcut result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
diff --git a/tests/bugs/modalg_2/bug238_1 b/tests/bugs/modalg_2/bug238_1
index cdfd9d737c..6723844d67 100755
--- a/tests/bugs/modalg_2/bug238_1
+++ b/tests/bugs/modalg_2/bug238_1
@@ -23,7 +23,7 @@ if { [expr $dis > 1.e-5] } {
     puts " Result shape is COMPLITE"
 }
 
-set nb_v_good 14
-set nb_e_good 7
+checknbshapes result -vertex 14 -edge 7
+
 set length 0
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug238_2 b/tests/bugs/modalg_2/bug238_2
index e92fd4bb6f..46b95a3555 100755
--- a/tests/bugs/modalg_2/bug238_2
+++ b/tests/bugs/modalg_2/bug238_2
@@ -23,7 +23,7 @@ if { [expr $dis > 1.e-5] } {
     puts " Result shape is COMPLITE"
 }
 
-set nb_v_good 14
-set nb_e_good 7
+checknbshapes result -vertex 14 -edge 7
+
 set length 0
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug239_1 b/tests/bugs/modalg_2/bug239_1
index cca3f2e937..5ffab41053 100755
--- a/tests/bugs/modalg_2/bug239_1
+++ b/tests/bugs/modalg_2/bug239_1
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contain"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
 
 puts "========================"
@@ -14,8 +14,8 @@ restore [locate_data_file case_2_wire1.brep] b
 puts [bop a b]
 puts [bopcommon result]
  
-set nb_v_good 18
-set nb_e_good 10
+checknbshapes result -vertex 18 -edge 10
+
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug239_2 b/tests/bugs/modalg_2/bug239_2
index aa2558a1c9..11088be49c 100755
--- a/tests/bugs/modalg_2/bug239_2
+++ b/tests/bugs/modalg_2/bug239_2
@@ -12,8 +12,7 @@ restore [locate_data_file case_2_wire1.brep] b
 puts [bop a b]
 puts [boptuc result]
 
-set nb_v_good 18
-set nb_e_good 11
+checknbshapes result -vertex 18 -edge 11
 set length 2434.21
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug240_1 b/tests/bugs/modalg_2/bug240_1
index 9761aa14e7..75897c74e8 100755
--- a/tests/bugs/modalg_2/bug240_1
+++ b/tests/bugs/modalg_2/bug240_1
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The command is not valid"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC240 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_2_edge2.brep] b
 puts [bop a b]
 puts [bopcommon result]
 
-set nb_v_good 14
-set nb_e_good 6
+checknbshapes result -vertex 14 -edge 6
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug240_2 b/tests/bugs/modalg_2/bug240_2
index 189f358a1e..70d87520ac 100755
--- a/tests/bugs/modalg_2/bug240_2
+++ b/tests/bugs/modalg_2/bug240_2
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
 
 puts "========================"
@@ -14,8 +14,7 @@ restore [locate_data_file case_2_edge2.brep] b
 puts [bop a b]
 puts [boptuc result]
 
-set nb_v_good 14
-set nb_e_good 7
+checknbshapes result -vertex 14 -edge 7
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug241_1 b/tests/bugs/modalg_2/bug241_1
index c29342aa5b..111624ba81 100755
--- a/tests/bugs/modalg_2/bug241_1
+++ b/tests/bugs/modalg_2/bug241_1
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The command is not valid"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC241 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_2_edge3.brep] b
 puts [bop a b]
 puts [bopcommon result]
 
-set nb_v_good 6
-set nb_e_good 3
+checknbshapes result -vertex 6 -edge 3
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug241_2 b/tests/bugs/modalg_2/bug241_2
index 0aecc6e2e9..6ee046d291 100755
--- a/tests/bugs/modalg_2/bug241_2
+++ b/tests/bugs/modalg_2/bug241_2
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC241 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_2_edge3.brep] b
 puts [bop a b]
 puts [boptuc result]
 
-set nb_v_good 6
-set nb_e_good 3
+checknbshapes result -vertex 6 -edge 3
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug242_1 b/tests/bugs/modalg_2/bug242_1
index 1e6dab42f1..4b5276bd76 100755
--- a/tests/bugs/modalg_2/bug242_1
+++ b/tests/bugs/modalg_2/bug242_1
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The command is not valid"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC242 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_2_wire1.brep] b
 puts [bop a b]
 puts [bopcommon result]
 
-set nb_v_good 18
-set nb_e_good 9
+checknbshapes result -vertex 18 -edge 9
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug242_2 b/tests/bugs/modalg_2/bug242_2
index 1304e72e5f..e7f9fa2c3b 100755
--- a/tests/bugs/modalg_2/bug242_2
+++ b/tests/bugs/modalg_2/bug242_2
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC242 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_2_wire1.brep] b
 puts [bop a b]
 puts [boptuc result]
 
-set nb_v_good 18
-set nb_e_good 13
+checknbshapes result -vertex 18 -edge 13
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug243_1 b/tests/bugs/modalg_2/bug243_1
index 6cca505a5a..b43f9c94df 100755
--- a/tests/bugs/modalg_2/bug243_1
+++ b/tests/bugs/modalg_2/bug243_1
@@ -12,8 +12,7 @@ restore [locate_data_file case_4_wire3.brep] b
 puts [bop a b]
 puts [bopcommon result]
 
-set nb_v_good 15
-set nb_e_good 10
+checknbshapes result -vertex 15 -edge 10
 set length 1150.78
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug243_2 b/tests/bugs/modalg_2/bug243_2
index d7613a902a..75d37b0829 100755
--- a/tests/bugs/modalg_2/bug243_2
+++ b/tests/bugs/modalg_2/bug243_2
@@ -12,8 +12,7 @@ restore [locate_data_file case_4_wire3.brep] b
 puts [bop a b]
 puts [boptuc result]
 
-set nb_v_good 16
-set nb_e_good 11
+checknbshapes result -vertex 16 -edge 11
 set length 929.278
 set 2dviewer 1
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug244 b/tests/bugs/modalg_2/bug244
index 8b24b1e4a8..2fc7bdf7fd 100755
--- a/tests/bugs/modalg_2/bug244
+++ b/tests/bugs/modalg_2/bug244
@@ -12,8 +12,7 @@ restore [locate_data_file case_4_wire3.brep] b
  puts [bop a b]
  puts [bopcommon result]
 
- set nb_v_good 12
- set nb_e_good 11
+ checknbshapes result -vertex 12 -edge 11
  set length 1808.02
  set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug245_1 b/tests/bugs/modalg_2/bug245_1
index ad7f598092..adf9621bbf 100755
--- a/tests/bugs/modalg_2/bug245_1
+++ b/tests/bugs/modalg_2/bug245_1
@@ -12,8 +12,7 @@ restore [locate_data_file case_4_wire3.brep] b
 puts [bop a b]
 puts [bopcommon result]
 
-set nb_v_good 12
-set nb_e_good 11
+checknbshapes result -vertex 12 -edge 11
 set length 1808.02
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug245_2 b/tests/bugs/modalg_2/bug245_2
index ceda3cdb65..072c9fed7a 100755
--- a/tests/bugs/modalg_2/bug245_2
+++ b/tests/bugs/modalg_2/bug245_2
@@ -12,8 +12,7 @@ restore [locate_data_file case_4_wire3.brep] b
 puts [bop a b]
 puts [boptuc result]
 
-set nb_v_good 3
-set nb_e_good 2
+checknbshapes result -vertex 3 -edge 2
 set length 272.04
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug246 b/tests/bugs/modalg_2/bug246
index dd1ea1d268..1e4fcafafa 100755
--- a/tests/bugs/modalg_2/bug246
+++ b/tests/bugs/modalg_2/bug246
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC246 "
@@ -14,7 +14,6 @@ restore [locate_data_file case_1_wire1.brep] b
 puts [bop a b]
 puts [bopcommon result]
 
-set nb_v_good 5
-set nb_e_good 2
+checknbshapes result -vertex 5 -edge 2
 set length 0
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug248_1 b/tests/bugs/modalg_2/bug248_1
index 19bd2cfb01..52bdba0ae2 100755
--- a/tests/bugs/modalg_2/bug248_1
+++ b/tests/bugs/modalg_2/bug248_1
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The command is not valid. The length is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC248 "
@@ -14,8 +14,7 @@ restore [locate_data_file OCC248b.brep] b
 puts [bop a b]
 puts [bopcommon result]
 
-set nb_v_good 1
-set nb_e_good 0
+checknbshapes result -vertex 1 -edge 0
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug248_2 b/tests/bugs/modalg_2/bug248_2
index 86644ae15d..906fdd773c 100755
--- a/tests/bugs/modalg_2/bug248_2
+++ b/tests/bugs/modalg_2/bug248_2
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC248 "
@@ -14,8 +14,7 @@ restore [locate_data_file OCC248b.brep] b
 puts [bop a b]
 puts [boptuc result]
 
-set nb_v_good 8
-set nb_e_good 8
+checknbshapes result -vertex 8 -edge 8
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug249_1 b/tests/bugs/modalg_2/bug249_1
index 718f83c9a7..a4666d8768 100755
--- a/tests/bugs/modalg_2/bug249_1
+++ b/tests/bugs/modalg_2/bug249_1
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The command is not valid. The length is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC249 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_9_edge3.brep] b
 puts [bop a b]
 puts [bopcommon result]
 
-set nb_v_good 2
-set nb_e_good 1
+checknbshapes result -vertex 2 -edge 1
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug249_2 b/tests/bugs/modalg_2/bug249_2
index 3831479d5b..b03bb5ed29 100755
--- a/tests/bugs/modalg_2/bug249_2
+++ b/tests/bugs/modalg_2/bug249_2
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC249 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_9_edge3.brep] b
 puts [bop a b]
 puts [boptuc result]
 
-set nb_v_good 4
-set nb_e_good 2
+checknbshapes result -vertex 4 -edge 2
 set length 0
 set 2dviewer 0
  
diff --git a/tests/bugs/modalg_2/bug249_3 b/tests/bugs/modalg_2/bug249_3
index eb6acc1aa0..e5471d0603 100755
--- a/tests/bugs/modalg_2/bug249_3
+++ b/tests/bugs/modalg_2/bug249_3
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC249 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_9_edge3.brep] b
 puts [bop a b]
 puts [bopcut result]
 
-set nb_v_good 4
-set nb_e_good 2
+checknbshapes result -vertex 4 -edge 2
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug249_4 b/tests/bugs/modalg_2/bug249_4
index 75e0d9cc29..85cf964746 100755
--- a/tests/bugs/modalg_2/bug249_4
+++ b/tests/bugs/modalg_2/bug249_4
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC249 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_9_edge3.brep] b
 puts [bop a b]
 puts [bopfuse result]
 
-set nb_v_good 6
-set nb_e_good 5
+checknbshapes result -vertex 6 -edge 5
 set length 0
 set 2dviewer 2
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug250_1 b/tests/bugs/modalg_2/bug250_1
index f45bec692e..7bfdfb67a6 100755
--- a/tests/bugs/modalg_2/bug250_1
+++ b/tests/bugs/modalg_2/bug250_1
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The command is not valid. The length is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC250 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_9_wire2.brep] b
 puts [bop a b]
 puts [bopcommon result]
 
-set nb_v_good 2
-set nb_e_good 1
+checknbshapes result -vertex 2 -edge 1
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug250_2 b/tests/bugs/modalg_2/bug250_2
index 4e98480501..8fc9e0d957 100755
--- a/tests/bugs/modalg_2/bug250_2
+++ b/tests/bugs/modalg_2/bug250_2
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC250 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_9_wire2.brep] b
 puts [bop a b]
 puts [boptuc result]
 
-set nb_v_good 7
-set nb_e_good 6
+checknbshapes result -vertex 7 -edge 6
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug250_3 b/tests/bugs/modalg_2/bug250_3
index 5d94ebaa81..448a3e9e22 100755
--- a/tests/bugs/modalg_2/bug250_3
+++ b/tests/bugs/modalg_2/bug250_3
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC250 "
@@ -14,8 +14,7 @@ restore [locate_data_file case_9_wire2.brep] b
 puts [bop a b]
 puts [bopcut result]
 
-set nb_v_good 4
-set nb_e_good 2
+checknbshapes result -vertex 4 -edge 2
 set length 0
 set 2dviewer 0
  
\ No newline at end of file
diff --git a/tests/bugs/modalg_2/bug250_4 b/tests/bugs/modalg_2/bug250_4
index 18a06125f4..488002571c 100755
--- a/tests/bugs/modalg_2/bug250_4
+++ b/tests/bugs/modalg_2/bug250_4
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The length of result shape is"
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "========================"
 puts " OCC250 "
@@ -14,7 +14,6 @@ restore [locate_data_file case_9_wire2.brep] b
 puts [bop a b]
 puts [bopfuse result]
 
-set nb_v_good 9
-set nb_e_good 9
+checknbshapes result -vertex 9 -edge 9
 set length 0
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug397_1 b/tests/bugs/modalg_2/bug397_1
index 2df65432f6..3a33da49d6 100755
--- a/tests/bugs/modalg_2/bug397_1
+++ b/tests/bugs/modalg_2/bug397_1
@@ -1,5 +1,5 @@
 puts "TODO OCC11111 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of"
 puts "TODO OCC11111 ALL: Error : The square of result shape is"
 
 puts "================"
@@ -18,16 +18,7 @@ igesread [locate_data_file Amino_komatsu.igs] result *
 
 set square 25310.8
 
-set nb_v_good 5060
-set nb_e_good 5105
-set nb_w_good 416
-set nb_f_good 399
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 10981
-
+checknbshapes result -vertex 5060 -edge 5105 -wire 416 -face 399 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10981
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug398 b/tests/bugs/modalg_2/bug398
index 829c95cb9e..2e0aa5c75d 100755
--- a/tests/bugs/modalg_2/bug398
+++ b/tests/bugs/modalg_2/bug398
@@ -19,6 +19,7 @@ scaleshape result a 10
 
 #statsh res
 
-set nb_sol_good 1
+checknbshapes result -solid 1
+
 set square 180000.
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug400_1 b/tests/bugs/modalg_2/bug400_1
index 7b3819a08a..cf8e7c75d6 100755
--- a/tests/bugs/modalg_2/bug400_1
+++ b/tests/bugs/modalg_2/bug400_1
@@ -12,16 +12,7 @@ restore [locate_data_file OCC400.brep] result
 
 set square 6607.38
 
-set nb_v_good 26
-set nb_e_good 26
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 57
-
+checknbshapes result -vertex 26 -edge 26 -wire 2 -face 2 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 57
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_2/bug4717_1 b/tests/bugs/modalg_2/bug4717_1
index 77f6b34cc7..aaf2bbac1e 100755
--- a/tests/bugs/modalg_2/bug4717_1
+++ b/tests/bugs/modalg_2/bug4717_1
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "============"
 puts "OCC4717"
@@ -30,14 +30,5 @@ bopfuse result
 
 set square 680565
 
-set nb_v_good 11
-set nb_e_good 16
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 45
-
+checknbshapes result -vertex 11 -edge 16 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 45
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug4717_2 b/tests/bugs/modalg_2/bug4717_2
index edf0106c58..4db7e0459c 100755
--- a/tests/bugs/modalg_2/bug4717_2
+++ b/tests/bugs/modalg_2/bug4717_2
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "============"
 puts "OCC4717"
@@ -30,14 +30,5 @@ bopfuse result
 
 set square 680565
 
-set nb_v_good 11
-set nb_e_good 16
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 45
-
+checknbshapes result -vertex 11 -edge 16 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 45
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug4717_3 b/tests/bugs/modalg_2/bug4717_3
index 185f5885b4..2d19e6f181 100755
--- a/tests/bugs/modalg_2/bug4717_3
+++ b/tests/bugs/modalg_2/bug4717_3
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "============"
 puts "OCC4717"
@@ -30,14 +30,5 @@ bopcut result
 
 set square 181937
 
-set nb_v_good 3
-set nb_e_good 4
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 4 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 14
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug4717_4 b/tests/bugs/modalg_2/bug4717_4
index c68768ed24..93673cd5a6 100755
--- a/tests/bugs/modalg_2/bug4717_4
+++ b/tests/bugs/modalg_2/bug4717_4
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 
 puts "============"
 puts "OCC4717"
@@ -30,14 +30,5 @@ bopcut result
 
 set square 680565
 
-set nb_v_good 11
-set nb_e_good 16
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 45
-
+checknbshapes result -vertex 11 -edge 16 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 45
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug4717_5 b/tests/bugs/modalg_2/bug4717_5
index 8eae8fa6fc..222cb67465 100755
--- a/tests/bugs/modalg_2/bug4717_5
+++ b/tests/bugs/modalg_2/bug4717_5
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC4717"
@@ -30,14 +30,5 @@ boptuc result
 
 set square 680565
 
-set nb_v_good 11
-set nb_e_good 16
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 45
-
+checknbshapes result -vertex 11 -edge 16 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 45
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug4717_6 b/tests/bugs/modalg_2/bug4717_6
index dab4307691..f4a73393d0 100755
--- a/tests/bugs/modalg_2/bug4717_6
+++ b/tests/bugs/modalg_2/bug4717_6
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC4717"
@@ -30,14 +30,5 @@ boptuc result
 
 set square 181937
 
-set nb_v_good 3
-set nb_e_good 4
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 4 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 14
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug4717_7 b/tests/bugs/modalg_2/bug4717_7
index 804091e634..57f4f259dc 100755
--- a/tests/bugs/modalg_2/bug4717_7
+++ b/tests/bugs/modalg_2/bug4717_7
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC4717"
@@ -30,14 +30,5 @@ bopcommon result
 
 set square 181937
 
-set nb_v_good 3
-set nb_e_good 4
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 4 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 14
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug4717_8 b/tests/bugs/modalg_2/bug4717_8
index 40fe4fa6c6..a6166f554b 100755
--- a/tests/bugs/modalg_2/bug4717_8
+++ b/tests/bugs/modalg_2/bug4717_8
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 
 puts "============"
 puts "OCC4717"
@@ -30,14 +30,5 @@ bopcommon result
 
 set square 181937
 
-set nb_v_good 3
-set nb_e_good 4
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 4 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 14
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug472_3 b/tests/bugs/modalg_2/bug472_3
index 9dc5992847..42619b6e1a 100755
--- a/tests/bugs/modalg_2/bug472_3
+++ b/tests/bugs/modalg_2/bug472_3
@@ -23,8 +23,8 @@ checkshape b2
 
 bfuse result b1 b2
 
-set nb_v_good 66
-set nb_e_edge 107
+checknbshapes result -vertex 66 -edge 107
+
 set square 31657.5
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_2/bug476_1 b/tests/bugs/modalg_2/bug476_1
index e05d8c9dc0..fb808fc64a 100755
--- a/tests/bugs/modalg_2/bug476_1
+++ b/tests/bugs/modalg_2/bug476_1
@@ -16,14 +16,5 @@ bop s1 s2
 bopfuse result
 
 set square 9333.96
-set nb_v_good 16
-set nb_e_good 26
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 67
-
+checknbshapes result -vertex 16 -edge 26 -wire 11 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 67
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug476_2 b/tests/bugs/modalg_2/bug476_2
index 892685e680..71d86ad08a 100755
--- a/tests/bugs/modalg_2/bug476_2
+++ b/tests/bugs/modalg_2/bug476_2
@@ -16,15 +16,6 @@ bop s2 s1
 bopfuse result
 
 set square 9333.96
-set nb_v_good 16
-set nb_e_good 26
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 67
-
+checknbshapes result -vertex 16 -edge 26 -wire 11 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 67
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_2/bug476_3 b/tests/bugs/modalg_2/bug476_3
index ef5d6ff58b..ddbd102785 100755
--- a/tests/bugs/modalg_2/bug476_3
+++ b/tests/bugs/modalg_2/bug476_3
@@ -16,15 +16,6 @@ bop s1 s2
 bopcut result
 
 set square 99.5159
-set nb_v_good 12
-set nb_e_good 19
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 52
-
+checknbshapes result -vertex 12 -edge 19 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 52
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_2/bug476_4 b/tests/bugs/modalg_2/bug476_4
index 55739ac89c..ff234664cb 100755
--- a/tests/bugs/modalg_2/bug476_4
+++ b/tests/bugs/modalg_2/bug476_4
@@ -16,14 +16,5 @@ bop s2 s1
 bopcut result
 
 set square 9340.03
-set nb_v_good 19
-set nb_e_good 33
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 83
-
+checknbshapes result -vertex 19 -edge 33 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 83
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug476_5 b/tests/bugs/modalg_2/bug476_5
index b7a375c85a..e2840c1b75 100755
--- a/tests/bugs/modalg_2/bug476_5
+++ b/tests/bugs/modalg_2/bug476_5
@@ -16,14 +16,5 @@ bop s1 s2
 boptuc result
 
 set square 9340.03
-set nb_v_good 19
-set nb_e_good 33
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 83
-
+checknbshapes result -vertex 19 -edge 33 -wire 14 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 83
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug476_6 b/tests/bugs/modalg_2/bug476_6
index a43243998f..4b8a9db72c 100755
--- a/tests/bugs/modalg_2/bug476_6
+++ b/tests/bugs/modalg_2/bug476_6
@@ -16,14 +16,5 @@ bop s2 s1
 boptuc result
 
 set square 99.5159
-set nb_v_good 12
-set nb_e_good 19
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 52
-
+checknbshapes result -vertex 12 -edge 19 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 52
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug476_7 b/tests/bugs/modalg_2/bug476_7
index e8c9a7efb9..ceac520ee6 100755
--- a/tests/bugs/modalg_2/bug476_7
+++ b/tests/bugs/modalg_2/bug476_7
@@ -16,14 +16,5 @@ bop s1 s2
 bopcommon result
 
 set square 105.587
-set nb_v_good 15
-set nb_e_good 26
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 68
-
+checknbshapes result -vertex 15 -edge 26 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 68
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug476_8 b/tests/bugs/modalg_2/bug476_8
index f519b5abb6..25f5e60a3b 100755
--- a/tests/bugs/modalg_2/bug476_8
+++ b/tests/bugs/modalg_2/bug476_8
@@ -16,14 +16,5 @@ bop s2 s1
 bopcommon result
 
 set square 105.587
-set nb_v_good 15
-set nb_e_good 26
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 68
-
+checknbshapes result -vertex 15 -edge 26 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 68
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug4993_1 b/tests/bugs/modalg_2/bug4993_1
index 5641abff35..61f269cdf1 100755
--- a/tests/bugs/modalg_2/bug4993_1
+++ b/tests/bugs/modalg_2/bug4993_1
@@ -18,14 +18,5 @@ bopfuse result
 
 set square 4854.51
 
-set nb_v_good 40
-set nb_e_good 64
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 155
-
+checknbshapes result -vertex 40 -edge 64 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 155
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug4993_2 b/tests/bugs/modalg_2/bug4993_2
index 7c5ff166b5..4d935ab375 100755
--- a/tests/bugs/modalg_2/bug4993_2
+++ b/tests/bugs/modalg_2/bug4993_2
@@ -18,14 +18,5 @@ bopfuse result
 
 set square 4854.51
 
-set nb_v_good 40
-set nb_e_good 64
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 155
-
+checknbshapes result -vertex 40 -edge 64 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 155
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug539_1 b/tests/bugs/modalg_2/bug539_1
index 5c3493849c..92678945bc 100755
--- a/tests/bugs/modalg_2/bug539_1
+++ b/tests/bugs/modalg_2/bug539_1
@@ -15,7 +15,6 @@ restore [locate_data_file case_4_wire3.brep] b
 bop a b
 bopcommon result
 
-set nb_v_good 15
-set nb_e_good 10
+checknbshapes result -vertex 15 -edge 10
 set length 1150.78
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug539_2 b/tests/bugs/modalg_2/bug539_2
index dc31058c43..86ec1bda7b 100755
--- a/tests/bugs/modalg_2/bug539_2
+++ b/tests/bugs/modalg_2/bug539_2
@@ -15,8 +15,7 @@ restore [locate_data_file case_4_wire3.brep] b
 bop a b
 boptuc result
 
-set nb_v_good 16
-set nb_e_good 11
+checknbshapes result -vertex 16 -edge 11
 set length 929.278
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_2/bug5729 b/tests/bugs/modalg_2/bug5729
index a594ca7460..e3f4a80247 100755
--- a/tests/bugs/modalg_2/bug5729
+++ b/tests/bugs/modalg_2/bug5729
@@ -29,13 +29,4 @@ bfuse result f1 f2
 
 set square 28559.8
 
-set nb_v_good 13
-set nb_e_good 22
-set nb_w_good 15
-set nb_f_good 13
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 66
-
+checknbshapes result -vertex 13 -edge 22 -wire 15 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 66
diff --git a/tests/bugs/modalg_2/bug5805_1 b/tests/bugs/modalg_2/bug5805_1
index 1c459de3a4..e881ececeb 100755
--- a/tests/bugs/modalg_2/bug5805_1
+++ b/tests/bugs/modalg_2/bug5805_1
@@ -36,14 +36,5 @@ checkmaxtol result -min_tol 1.
 
 set square 981.941
 
-set nb_v_good 6
-set nb_e_good 10
-set nb_w_good 8
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 32
-
+checknbshapes result -vertex 6 -edge 10 -wire 8 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 32
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug5805_10 b/tests/bugs/modalg_2/bug5805_10
index 45b8520436..a58821a747 100755
--- a/tests/bugs/modalg_2/bug5805_10
+++ b/tests/bugs/modalg_2/bug5805_10
@@ -31,16 +31,7 @@ catch { OFFSETSHAPE $distance {s_2} $calcul $type }
 
 set square 1041.35
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 3 -edge 5 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_11 b/tests/bugs/modalg_2/bug5805_11
index 9bc05c78a6..cc8b102e1b 100755
--- a/tests/bugs/modalg_2/bug5805_11
+++ b/tests/bugs/modalg_2/bug5805_11
@@ -30,16 +30,7 @@ catch { OFFSETSHAPE $distance {s_3} $calcul $type }
 
 set square 1041.35
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 3 -edge 5 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_12 b/tests/bugs/modalg_2/bug5805_12
index 417a4b2c68..072a9987f6 100755
--- a/tests/bugs/modalg_2/bug5805_12
+++ b/tests/bugs/modalg_2/bug5805_12
@@ -31,16 +31,7 @@ catch { OFFSETSHAPE $distance {s_2 s_3} $calcul $type }
 
 set square 982.254
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 20
-
+checknbshapes result -vertex 3 -edge 5 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 20
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_13 b/tests/bugs/modalg_2/bug5805_13
index 208f29e5c8..7b43e0feed 100755
--- a/tests/bugs/modalg_2/bug5805_13
+++ b/tests/bugs/modalg_2/bug5805_13
@@ -47,16 +47,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 176
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 34
-
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 34
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_14 b/tests/bugs/modalg_2/bug5805_14
index 88bb8d91d5..b188a57a3b 100755
--- a/tests/bugs/modalg_2/bug5805_14
+++ b/tests/bugs/modalg_2/bug5805_14
@@ -47,16 +47,7 @@ catch { OFFSETSHAPE $distance {s_5} $calcul $type }
 
 set square 402
 
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 12
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 65
-
+checknbshapes result -vertex 16 -edge 24 -wire 12 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 65
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_15 b/tests/bugs/modalg_2/bug5805_15
index e01daaa059..5c7a5c07ea 100755
--- a/tests/bugs/modalg_2/bug5805_15
+++ b/tests/bugs/modalg_2/bug5805_15
@@ -47,16 +47,7 @@ catch { OFFSETSHAPE $distance {s_6} $calcul $type }
 
 set square 402
 
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 12
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 65
-
+checknbshapes result -vertex 16 -edge 24 -wire 12 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 65
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_16 b/tests/bugs/modalg_2/bug5805_16
index 07fa432809..881487dbb4 100755
--- a/tests/bugs/modalg_2/bug5805_16
+++ b/tests/bugs/modalg_2/bug5805_16
@@ -47,16 +47,7 @@ catch { OFFSETSHAPE $distance {s_5 s_6} $calcul $type }
 
 set square 378
 
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 12
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 64
-
+checknbshapes result -vertex 16 -edge 24 -wire 12 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 64
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_17 b/tests/bugs/modalg_2/bug5805_17
index 682d9c6292..0ada3c1aab 100755
--- a/tests/bugs/modalg_2/bug5805_17
+++ b/tests/bugs/modalg_2/bug5805_17
@@ -1,6 +1,6 @@
 puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: result is not a topological shape"
 puts "TODO OCC25925 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
 
 puts "============"
 puts "OCC5805"
@@ -36,20 +36,6 @@ set distance -0.001
 catch { OFFSETSHAPE $distance {} $calcul $type }
 # Null result
 
-
-set square 495.635
-
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
-
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
   puts "Faulty ${BugNumber} : s is not Closed shape"
@@ -62,5 +48,7 @@ if {$index == -1} {
   
 }
 
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
+set square 495.635
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug5805_18 b/tests/bugs/modalg_2/bug5805_18
index 17673bb251..722cd8476a 100755
--- a/tests/bugs/modalg_2/bug5805_18
+++ b/tests/bugs/modalg_2/bug5805_18
@@ -1,6 +1,6 @@
 puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: Tcl Exception: result is not a topological shape!!!"
+puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
 puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
@@ -37,20 +37,6 @@ set distance -0.001
 catch { OFFSETSHAPE $distance {s_2} $calcul $type }
 # Bad result
 
-
-set square 495.635
-
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
-
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
   puts "Faulty ${BugNumber} : s is not Closed shape"
@@ -63,5 +49,7 @@ if {$index == -1} {
   
 }
 
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
+set square 495.635
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug5805_19 b/tests/bugs/modalg_2/bug5805_19
index a9823466ad..27c7c6acf0 100755
--- a/tests/bugs/modalg_2/bug5805_19
+++ b/tests/bugs/modalg_2/bug5805_19
@@ -1,6 +1,6 @@
 puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: Tcl Exception: result is not a topological shape!!!"
+puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
 puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
@@ -37,20 +37,6 @@ set distance -0.001
 catch { OFFSETSHAPE $distance {s_3} $calcul $type }
 # Bad result
 
-
-set square 495.635
-
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
-
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
   puts "Faulty ${BugNumber} : s is not Closed shape"
@@ -63,5 +49,7 @@ if {$index == -1} {
   
 }
 
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
+set square 495.635
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug5805_2 b/tests/bugs/modalg_2/bug5805_2
index 6db13931f9..375249f70f 100755
--- a/tests/bugs/modalg_2/bug5805_2
+++ b/tests/bugs/modalg_2/bug5805_2
@@ -32,14 +32,5 @@ checkmaxtol result -min_tol 1.
 
 set square 982.254
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 20
-
+checknbshapes result -vertex 3 -edge 5 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 20
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug5805_20 b/tests/bugs/modalg_2/bug5805_20
index 3104407c1b..a23fdb05ba 100755
--- a/tests/bugs/modalg_2/bug5805_20
+++ b/tests/bugs/modalg_2/bug5805_20
@@ -1,6 +1,6 @@
 puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: Tcl Exception: result is not a topological shape!!!"
+puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
 puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
@@ -37,20 +37,6 @@ set distance -0.001
 catch { OFFSETSHAPE $distance {s_2 s_3} $calcul $type }
 # Bad result
 
-
-set square 495.635
-
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
-
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
   puts "Faulty ${BugNumber} : s is not Closed shape"
@@ -63,5 +49,7 @@ if {$index == -1} {
   
 }
 
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
+set square 495.635
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug5805_21 b/tests/bugs/modalg_2/bug5805_21
index 24a683fec1..0d44b4dc7e 100755
--- a/tests/bugs/modalg_2/bug5805_21
+++ b/tests/bugs/modalg_2/bug5805_21
@@ -32,16 +32,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 253.902
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_22 b/tests/bugs/modalg_2/bug5805_22
index bc6ae303a0..2582b9e74d 100755
--- a/tests/bugs/modalg_2/bug5805_22
+++ b/tests/bugs/modalg_2/bug5805_22
@@ -32,16 +32,7 @@ catch { OFFSETSHAPE $distance {s_3} $calcul $type }
 
 set square 502.366
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 3 -edge 5 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_23 b/tests/bugs/modalg_2/bug5805_23
index e670f809f2..404ac54950 100755
--- a/tests/bugs/modalg_2/bug5805_23
+++ b/tests/bugs/modalg_2/bug5805_23
@@ -32,16 +32,7 @@ catch { OFFSETSHAPE $distance {s_2} $calcul $type }
 
 set square 502.366
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 3 -edge 5 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_24 b/tests/bugs/modalg_2/bug5805_24
index 4ad85530c8..9f26fb68dd 100755
--- a/tests/bugs/modalg_2/bug5805_24
+++ b/tests/bugs/modalg_2/bug5805_24
@@ -32,16 +32,7 @@ catch { OFFSETSHAPE $distance {s_3 s_2} $calcul $type }
 
 set square 489.372
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 20
-
+checknbshapes result -vertex 3 -edge 5 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 20
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_25 b/tests/bugs/modalg_2/bug5805_25
index 5f50d97c53..0285e9033e 100755
--- a/tests/bugs/modalg_2/bug5805_25
+++ b/tests/bugs/modalg_2/bug5805_25
@@ -58,16 +58,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 914.876
 
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 27
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_26 b/tests/bugs/modalg_2/bug5805_26
index dbdbc167b3..e54f46010f 100755
--- a/tests/bugs/modalg_2/bug5805_26
+++ b/tests/bugs/modalg_2/bug5805_26
@@ -58,16 +58,7 @@ catch { OFFSETSHAPE $distance {s_4} $calcul $type }
 
 set square 2011.91
 
-set nb_v_good 12
-set nb_e_good 18
-set nb_w_good 10
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 51
-
+checknbshapes result -vertex 12 -edge 18 -wire 10 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 51
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_27 b/tests/bugs/modalg_2/bug5805_27
index 909933b8a6..2ee2f17a2b 100755
--- a/tests/bugs/modalg_2/bug5805_27
+++ b/tests/bugs/modalg_2/bug5805_27
@@ -58,16 +58,7 @@ catch { OFFSETSHAPE $distance {s_5} $calcul $type }
 
 set square 1755.54
 
-set nb_v_good 12
-set nb_e_good 18
-set nb_w_good 10
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 51
-
+checknbshapes result -vertex 12 -edge 18 -wire 10 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 51
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_28 b/tests/bugs/modalg_2/bug5805_28
index 19fa61abad..af777dea22 100755
--- a/tests/bugs/modalg_2/bug5805_28
+++ b/tests/bugs/modalg_2/bug5805_28
@@ -58,16 +58,7 @@ catch { OFFSETSHAPE $distance {s_4 s_5} $calcul $type }
 
 set square 1735.06
 
-set nb_v_good 12
-set nb_e_good 18
-set nb_w_good 10
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 50
-
+checknbshapes result -vertex 12 -edge 18 -wire 10 -face 8 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 50
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_29 b/tests/bugs/modalg_2/bug5805_29
index 41dfb04a52..89479f3f0b 100755
--- a/tests/bugs/modalg_2/bug5805_29
+++ b/tests/bugs/modalg_2/bug5805_29
@@ -37,16 +37,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 5829.59
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_3 b/tests/bugs/modalg_2/bug5805_3
index f262fc146b..034795edfb 100755
--- a/tests/bugs/modalg_2/bug5805_3
+++ b/tests/bugs/modalg_2/bug5805_3
@@ -29,14 +29,5 @@ checkmaxtol result -min_tol 1.
 
 set square 1185.03
 
-set nb_v_good 10
-set nb_e_good 15
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 41
-
+checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 41
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug5805_30 b/tests/bugs/modalg_2/bug5805_30
index b0be04b1da..895955e5ea 100755
--- a/tests/bugs/modalg_2/bug5805_30
+++ b/tests/bugs/modalg_2/bug5805_30
@@ -36,16 +36,7 @@ catch { OFFSETSHAPE $distance {s_2} $calcul $type }
 
 set square 1336.75
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_31 b/tests/bugs/modalg_2/bug5805_31
index 033e89c38f..8190eb47ae 100755
--- a/tests/bugs/modalg_2/bug5805_31
+++ b/tests/bugs/modalg_2/bug5805_31
@@ -34,16 +34,7 @@ catch { OFFSETSHAPE $distance {s_3} $calcul $type }
 
 set square 7157.43
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_32 b/tests/bugs/modalg_2/bug5805_32
index e9d508280f..26b4f5ac77 100755
--- a/tests/bugs/modalg_2/bug5805_32
+++ b/tests/bugs/modalg_2/bug5805_32
@@ -39,16 +39,7 @@ catch { OFFSETSHAPE $distance {s_2 s_3} $calcul $type }
 
 set square 1223.65
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_33 b/tests/bugs/modalg_2/bug5805_33
index b256334149..423fc4a418 100755
--- a/tests/bugs/modalg_2/bug5805_33
+++ b/tests/bugs/modalg_2/bug5805_33
@@ -34,16 +34,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 418.388
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_34 b/tests/bugs/modalg_2/bug5805_34
index 4077edd1b7..46336d32cb 100755
--- a/tests/bugs/modalg_2/bug5805_34
+++ b/tests/bugs/modalg_2/bug5805_34
@@ -34,16 +34,7 @@ catch { OFFSETSHAPE $distance {s_2} $calcul $type }
 
 set square 881.591
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_35 b/tests/bugs/modalg_2/bug5805_35
index 5cc0100ec5..59f9a27417 100755
--- a/tests/bugs/modalg_2/bug5805_35
+++ b/tests/bugs/modalg_2/bug5805_35
@@ -34,16 +34,7 @@ catch { OFFSETSHAPE $distance {s_3} $calcul $type }
 
 set square 915.469
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_36 b/tests/bugs/modalg_2/bug5805_36
index f2722cc973..27c3c2e956 100755
--- a/tests/bugs/modalg_2/bug5805_36
+++ b/tests/bugs/modalg_2/bug5805_36
@@ -34,16 +34,7 @@ catch { OFFSETSHAPE $distance {s_2 s_3} $calcul $type }
 
 set square 856.92
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_37 b/tests/bugs/modalg_2/bug5805_37
index 20716b3ed3..a4d7dbc46e 100755
--- a/tests/bugs/modalg_2/bug5805_37
+++ b/tests/bugs/modalg_2/bug5805_37
@@ -47,16 +47,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 246.821
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 34
-
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 34
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_38 b/tests/bugs/modalg_2/bug5805_38
index 2d746c58d3..7125820141 100755
--- a/tests/bugs/modalg_2/bug5805_38
+++ b/tests/bugs/modalg_2/bug5805_38
@@ -47,16 +47,7 @@ catch { OFFSETSHAPE $distance {s_5} $calcul $type }
 
 set square 544.931
 
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 12
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 65
-
+checknbshapes result -vertex 16 -edge 24 -wire 12 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 65
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_39 b/tests/bugs/modalg_2/bug5805_39
index 73bfe2d737..cf512cf97e 100755
--- a/tests/bugs/modalg_2/bug5805_39
+++ b/tests/bugs/modalg_2/bug5805_39
@@ -47,16 +47,7 @@ catch { OFFSETSHAPE $distance {s_6} $calcul $type }
 
 set square 524.758
 
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 12
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 65
-
+checknbshapes result -vertex 16 -edge 24 -wire 12 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 65
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_4 b/tests/bugs/modalg_2/bug5805_4
index 731cff9d0f..75131580f4 100755
--- a/tests/bugs/modalg_2/bug5805_4
+++ b/tests/bugs/modalg_2/bug5805_4
@@ -35,14 +35,5 @@ checkmaxtol result -min_tol 1.
 
 set square 1185.03
 
-set nb_v_good 10
-set nb_e_good 15
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 41
-
+checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 41
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug5805_40 b/tests/bugs/modalg_2/bug5805_40
index 881e0039de..8d22e02c59 100755
--- a/tests/bugs/modalg_2/bug5805_40
+++ b/tests/bugs/modalg_2/bug5805_40
@@ -47,16 +47,7 @@ catch { OFFSETSHAPE $distance {s_5 s_6} $calcul $type }
 
 set square 485.358
 
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 12
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 64
-
+checknbshapes result -vertex 16 -edge 24 -wire 12 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 64
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_41 b/tests/bugs/modalg_2/bug5805_41
index 3f40a62840..1c9310c828 100755
--- a/tests/bugs/modalg_2/bug5805_41
+++ b/tests/bugs/modalg_2/bug5805_41
@@ -1,4 +1,4 @@
-puts "TODO OCC24862 ALL: Error : Result shape is WRONG"
+puts "TODO OCC24862 ALL: Error :  is WRONG because number of"
 puts "TODO OCC24862 ALL: Error : The square of result shape is"
 puts "TODO OCC24682 ALL: Faulty shapes in variables faulty_1 to faulty_"
 
@@ -39,16 +39,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 495.635
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_42 b/tests/bugs/modalg_2/bug5805_42
index 7a15c2f721..7c4d0f5883 100755
--- a/tests/bugs/modalg_2/bug5805_42
+++ b/tests/bugs/modalg_2/bug5805_42
@@ -1,5 +1,5 @@
 puts "TODO OCC25925 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO OCC25925 ALL: Error : Result shape is WRONG"
+puts "TODO OCC25925 ALL: Error :  is WRONG because number of"
 
 puts "============"
 puts "OCC5805"
@@ -38,16 +38,7 @@ catch { OFFSETSHAPE $distance {s_2} $calcul $type }
 
 set square 495.635
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_43 b/tests/bugs/modalg_2/bug5805_43
index bcb3735f7a..4d5dadc9f2 100755
--- a/tests/bugs/modalg_2/bug5805_43
+++ b/tests/bugs/modalg_2/bug5805_43
@@ -1,4 +1,4 @@
-puts "TODO OCC24862 ALL: Error : Result shape is WRONG"
+puts "TODO OCC24862 ALL: Error :  is WRONG because number of"
 puts "TODO OCC24862 ALL: Error : The square of result shape is"
 puts "TODO OCC24682 ALL: Faulty shapes in variables faulty_1 to faulty_"
 
@@ -39,16 +39,7 @@ catch { OFFSETSHAPE $distance {s_3} $calcul $type }
 
 set square 495.635
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_44 b/tests/bugs/modalg_2/bug5805_44
index bd9dc83af1..1deb08305d 100755
--- a/tests/bugs/modalg_2/bug5805_44
+++ b/tests/bugs/modalg_2/bug5805_44
@@ -1,6 +1,6 @@
 puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: Tcl Exception: result is not a topological shape!!!"
+puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
 puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
@@ -37,20 +37,6 @@ set distance -0.001
 catch { OFFSETSHAPE $distance {s_2 s_3} $calcul $type }
 # Bad result
 
-
-set square 495.635
-
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
-
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
   puts "Faulty ${BugNumber} : s is not Closed shape"
@@ -63,5 +49,7 @@ if {$index == -1} {
   
 }
 
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
+set square 495.635
 set 2dviewer 0
diff --git a/tests/bugs/modalg_2/bug5805_45 b/tests/bugs/modalg_2/bug5805_45
index 31512581e5..262812b29b 100755
--- a/tests/bugs/modalg_2/bug5805_45
+++ b/tests/bugs/modalg_2/bug5805_45
@@ -32,16 +32,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 767.63
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_46 b/tests/bugs/modalg_2/bug5805_46
index b93c41c113..8f85786fa0 100755
--- a/tests/bugs/modalg_2/bug5805_46
+++ b/tests/bugs/modalg_2/bug5805_46
@@ -32,16 +32,7 @@ catch { OFFSETSHAPE $distance {s_3} $calcul $type }
 
 set square 1470.32
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_47 b/tests/bugs/modalg_2/bug5805_47
index 1081bd51d1..26c7b67d33 100755
--- a/tests/bugs/modalg_2/bug5805_47
+++ b/tests/bugs/modalg_2/bug5805_47
@@ -32,16 +32,7 @@ catch { OFFSETSHAPE $distance {s_2} $calcul $type }
 
 set square 1530.96
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_48 b/tests/bugs/modalg_2/bug5805_48
index 9fbd1d3d0f..4604bcc89a 100755
--- a/tests/bugs/modalg_2/bug5805_48
+++ b/tests/bugs/modalg_2/bug5805_48
@@ -32,16 +32,7 @@ catch { OFFSETSHAPE $distance {s_3 s_2} $calcul $type }
 
 set square 1471.48
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_49 b/tests/bugs/modalg_2/bug5805_49
index f8e244cfad..102007d0f8 100755
--- a/tests/bugs/modalg_2/bug5805_49
+++ b/tests/bugs/modalg_2/bug5805_49
@@ -20,16 +20,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 5829.59
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 12
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 12
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_2/bug5805_5 b/tests/bugs/modalg_2/bug5805_5
index c6135a3b82..cd5be904fe 100755
--- a/tests/bugs/modalg_2/bug5805_5
+++ b/tests/bugs/modalg_2/bug5805_5
@@ -30,14 +30,5 @@ checkmaxtol result -min_tol 1.
 
 set square 876.584
 
-set nb_v_good 10
-set nb_e_good 15
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 41
-
+checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 41
 set 2dviewer 0
diff --git a/tests/bugs/modalg_3/bug5805_50 b/tests/bugs/modalg_3/bug5805_50
index 5d02a676c6..5a8195c2ee 100755
--- a/tests/bugs/modalg_3/bug5805_50
+++ b/tests/bugs/modalg_3/bug5805_50
@@ -19,16 +19,7 @@ catch { OFFSETSHAPE $distance {s_2} $calcul $type }
 
 set square 12150
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_51 b/tests/bugs/modalg_3/bug5805_51
index 336ba56c12..0754282001 100755
--- a/tests/bugs/modalg_3/bug5805_51
+++ b/tests/bugs/modalg_3/bug5805_51
@@ -19,16 +19,7 @@ catch { OFFSETSHAPE $distance {s_3} $calcul $type }
 
 set square 7157.43
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_52 b/tests/bugs/modalg_3/bug5805_52
index a3d83376d8..bc3cd5129f 100755
--- a/tests/bugs/modalg_3/bug5805_52
+++ b/tests/bugs/modalg_3/bug5805_52
@@ -19,16 +19,7 @@ catch { OFFSETSHAPE $distance {s_2 s_3} $calcul $type }
 
 set square 7051.59
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_53 b/tests/bugs/modalg_3/bug5805_53
index c777675d1b..2192efafe0 100755
--- a/tests/bugs/modalg_3/bug5805_53
+++ b/tests/bugs/modalg_3/bug5805_53
@@ -44,16 +44,7 @@ catch { OFFSETSHAPE $distance {s_4} $calcul $type }
 
 set square 889.96
 
-set nb_v_good 12
-set nb_e_good 18
-set nb_w_good 10
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 51
-
+checknbshapes result -vertex 12 -edge 18 -wire 10 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 51
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_54 b/tests/bugs/modalg_3/bug5805_54
index d2ff51c9e3..a07f5ee036 100755
--- a/tests/bugs/modalg_3/bug5805_54
+++ b/tests/bugs/modalg_3/bug5805_54
@@ -44,16 +44,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 376.733
 
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 27
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_55 b/tests/bugs/modalg_3/bug5805_55
index 23ee9cd730..2ac3d81e48 100755
--- a/tests/bugs/modalg_3/bug5805_55
+++ b/tests/bugs/modalg_3/bug5805_55
@@ -44,16 +44,7 @@ catch { OFFSETSHAPE $distance {s_5} $calcul $type }
 
 set square 889.96
 
-set nb_v_good 12
-set nb_e_good 18
-set nb_w_good 10
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 51
-
+checknbshapes result -vertex 12 -edge 18 -wire 10 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 51
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_56 b/tests/bugs/modalg_3/bug5805_56
index 9bd61633ab..eb133f8222 100755
--- a/tests/bugs/modalg_3/bug5805_56
+++ b/tests/bugs/modalg_3/bug5805_56
@@ -44,16 +44,7 @@ catch { OFFSETSHAPE $distance {s_4 s_5} $calcul $type }
 
 set square 870.345
 
-set nb_v_good 12
-set nb_e_good 18
-set nb_w_good 10
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 50
-
+checknbshapes result -vertex 12 -edge 18 -wire 10 -face 8 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 50
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_57 b/tests/bugs/modalg_3/bug5805_57
index 7cb0549c39..1cd09ca956 100755
--- a/tests/bugs/modalg_3/bug5805_57
+++ b/tests/bugs/modalg_3/bug5805_57
@@ -34,16 +34,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 664.447
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_58 b/tests/bugs/modalg_3/bug5805_58
index 1ed9814539..9ee8fde597 100755
--- a/tests/bugs/modalg_3/bug5805_58
+++ b/tests/bugs/modalg_3/bug5805_58
@@ -34,16 +34,7 @@ catch { OFFSETSHAPE $distance {s_2} $calcul $type }
 
 set square 1336.75
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_6 b/tests/bugs/modalg_3/bug5805_6
index cf9940f35c..53aca28b5c 100755
--- a/tests/bugs/modalg_3/bug5805_6
+++ b/tests/bugs/modalg_3/bug5805_6
@@ -25,14 +25,5 @@ checkmaxtol result -min_tol 1.
 
 set square 876.584
 
-set nb_v_good 10
-set nb_e_good 15
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 41
-
+checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 41
 set 2dviewer 0
diff --git a/tests/bugs/modalg_3/bug5805_7 b/tests/bugs/modalg_3/bug5805_7
index 12d0c00629..4684bdb1a4 100755
--- a/tests/bugs/modalg_3/bug5805_7
+++ b/tests/bugs/modalg_3/bug5805_7
@@ -34,16 +34,7 @@ catch { OFFSETSHAPE $distance {s_3} $calcul $type }
 
 set square 1336.75
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_8 b/tests/bugs/modalg_3/bug5805_8
index 06b73e67f9..4f9bc8e4af 100755
--- a/tests/bugs/modalg_3/bug5805_8
+++ b/tests/bugs/modalg_3/bug5805_8
@@ -34,16 +34,7 @@ catch { OFFSETSHAPE $distance {s_2 s_3} $calcul $type }
 
 set square 1223.65
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_3/bug5805_9 b/tests/bugs/modalg_3/bug5805_9
index b320e42e4a..28577712d9 100755
--- a/tests/bugs/modalg_3/bug5805_9
+++ b/tests/bugs/modalg_3/bug5805_9
@@ -31,16 +31,7 @@ catch { OFFSETSHAPE $distance {} $calcul $type }
 
 set square 495.635
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_4/bug13595_1 b/tests/bugs/modalg_4/bug13595_1
index f48d6dae98..3984f02e8c 100755
--- a/tests/bugs/modalg_4/bug13595_1
+++ b/tests/bugs/modalg_4/bug13595_1
@@ -17,16 +17,7 @@ if [catch { pipe result sp p1 } catch_result] {
 } else {
 set square 80
 
-set nb_v_good 6
-set nb_e_good 7
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 19
-
+checknbshapes result -vertex 6 -edge 7 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 1 -shape 19
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug13595_2 b/tests/bugs/modalg_4/bug13595_2
index 1a316e162d..c6ea83dcbf 100755
--- a/tests/bugs/modalg_4/bug13595_2
+++ b/tests/bugs/modalg_4/bug13595_2
@@ -16,16 +16,7 @@ if [catch { pipe result sp p2 } catch_result] {
 } else {
 set square 407.922
 
-set nb_v_good 6
-set nb_e_good 7
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 19
-
+checknbshapes result -vertex 6 -edge 7 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 1 -shape 19
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug23765 b/tests/bugs/modalg_4/bug23765
index 2b32dfa375..53193c0464 100755
--- a/tests/bugs/modalg_4/bug23765
+++ b/tests/bugs/modalg_4/bug23765
@@ -12,6 +12,6 @@ restore [locate_data_file bug23765_b2.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
+checknbshapes result -vertex 2
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_4/bug5806 b/tests/bugs/modalg_4/bug5806
index eafe5fa7e3..78834f5f0e 100755
--- a/tests/bugs/modalg_4/bug5806
+++ b/tests/bugs/modalg_4/bug5806
@@ -33,14 +33,5 @@ checkmaxtol result -min_tol 1.
 
 set square 1116.06
 
-set nb_v_good 10
-set nb_e_good 15
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 41
-
+checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 41
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug6181 b/tests/bugs/modalg_4/bug6181
index 5a5667d9e1..7fcda4790c 100755
--- a/tests/bugs/modalg_4/bug6181
+++ b/tests/bugs/modalg_4/bug6181
@@ -27,14 +27,5 @@ bcut result s1 s2
 
 set square 151691
 
-set nb_v_good 14
-set nb_e_good 21
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 56
-
+checknbshapes result -vertex 14 -edge 21 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 56
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug6182 b/tests/bugs/modalg_4/bug6182
index f0b12771a4..9087810fe3 100755
--- a/tests/bugs/modalg_4/bug6182
+++ b/tests/bugs/modalg_4/bug6182
@@ -26,14 +26,5 @@ bcut result s1 s2
 
 set square 318709
 
-set nb_v_good 316
-set nb_e_good 502
-set nb_w_good 185
-set nb_f_good 181
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1187
-
+checknbshapes result -vertex 316 -edge 502 -wire 185 -face 181 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 1187
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug6272_5 b/tests/bugs/modalg_4/bug6272_5
index fc46efeeb1..c134f97873 100755
--- a/tests/bugs/modalg_4/bug6272_5
+++ b/tests/bugs/modalg_4/bug6272_5
@@ -18,16 +18,7 @@ bopfuse result
 set square 6552.67
 
 # Analysis of "nbshapes res"
-set nb_v_good 116
-set nb_e_good 176
-set nb_w_good 72
-set nb_f_good 70
-set nb_sh_good 5
-set nb_sol_good 5
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 445
-
+checknbshapes result -vertex 116 -edge 176 -wire 72 -face 70 -shell 5 -solid 5 -compsolid 0 -compound 1 -shape 445
 set 2dviewer 0
 
 
diff --git a/tests/bugs/modalg_4/bug6272_6 b/tests/bugs/modalg_4/bug6272_6
index e494b1db98..8f5e50dee1 100755
--- a/tests/bugs/modalg_4/bug6272_6
+++ b/tests/bugs/modalg_4/bug6272_6
@@ -1,5 +1,5 @@
 puts "TODO OCC22033 ALL: Error : The square of result shape is"
-puts "TODO OCC22033 ALL: Error : Result shape is WRONG"
+puts "TODO OCC22033 ALL: Error :  is WRONG because number of"
 
 puts "============"
 puts "OCC6272"
@@ -22,15 +22,6 @@ bopfuse result
 set square 8979.70
 
 # Analysis of "nbshapes res"
-set nb_v_good 60
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 40
-set nb_sh_good 5
-set nb_sol_good 5
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 243
-
+checknbshapes result -vertex 60 -edge 90 -wire 42 -face 40 -shell 5 -solid 5 -compsolid 0 -compound 1 -shape 243
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_4/bug6277 b/tests/bugs/modalg_4/bug6277
index fcc3558b47..f28c995ba3 100755
--- a/tests/bugs/modalg_4/bug6277
+++ b/tests/bugs/modalg_4/bug6277
@@ -1,4 +1,4 @@
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of"
 
 puts "============"
 puts "OCC6277"
@@ -29,15 +29,6 @@ bcut result s1 s2
 
 set square 40084.9
 
-set nb_v_good 23
-set nb_e_good 34
-set nb_w_good 19
-set nb_f_good 14
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 93
-
+checknbshapes result -vertex 23 -edge 34 -wire 19 -face 14 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 93
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_4/bug6334 b/tests/bugs/modalg_4/bug6334
index 079031c4a3..5f935e0ecb 100755
--- a/tests/bugs/modalg_4/bug6334
+++ b/tests/bugs/modalg_4/bug6334
@@ -40,16 +40,7 @@ renamevar h result
 
 set square 117509
 
-set nb_v_good 30
-set nb_e_good 51
-set nb_w_good 27
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 135
-
+checknbshapes result -vertex 30 -edge 51 -wire 27 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 135
 
 # 4. Check thickness of box and hole
 set dx_t [expr [lindex $bnd_t 3] - [lindex $bnd_t 0]]
diff --git a/tests/bugs/modalg_4/bug6538 b/tests/bugs/modalg_4/bug6538
index 72f74ceedc..b8f79b12ea 100755
--- a/tests/bugs/modalg_4/bug6538
+++ b/tests/bugs/modalg_4/bug6538
@@ -29,14 +29,5 @@ bopcommon result
 
 set square 18.695
 
-set nb_v_good 16
-set nb_e_good 16
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 35
-
+checknbshapes result -vertex 16 -edge 16 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 35
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug6725 b/tests/bugs/modalg_4/bug6725
index fba7ee5aba..d528ca00f0 100755
--- a/tests/bugs/modalg_4/bug6725
+++ b/tests/bugs/modalg_4/bug6725
@@ -21,16 +21,7 @@ if {$r == 0} {
 
 set square 624989
 
-set nb_v_good 3806
-set nb_e_good 3808
-set nb_w_good 756
-set nb_f_good 730
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 9101
-
+checknbshapes result -vertex 3806 -edge 3808 -wire 756 -face 730 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9101
 if { ${status1} != 0} {
    puts "Faulty ${BugNumber}"
 } else {
diff --git a/tests/bugs/modalg_4/bug6766_1 b/tests/bugs/modalg_4/bug6766_1
index a8e5acc09f..0be92c0ed7 100755
--- a/tests/bugs/modalg_4/bug6766_1
+++ b/tests/bugs/modalg_4/bug6766_1
@@ -24,15 +24,6 @@ bsection result a f
 
 
     
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 8
 set length 138.474
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug6766_2 b/tests/bugs/modalg_4/bug6766_2
index d0e28edac3..ceec139c83 100755
--- a/tests/bugs/modalg_4/bug6766_2
+++ b/tests/bugs/modalg_4/bug6766_2
@@ -24,15 +24,6 @@ bop a f
 bopsection result
 
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 8
 set length 138.474
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug6766_3 b/tests/bugs/modalg_4/bug6766_3
index d5da09d66d..dd81044e21 100755
--- a/tests/bugs/modalg_4/bug6766_3
+++ b/tests/bugs/modalg_4/bug6766_3
@@ -23,15 +23,6 @@ mkface f pl
 bsection result a f
 
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 8
 set length 126.138
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug6766_4 b/tests/bugs/modalg_4/bug6766_4
index 21479c806d..0612434e48 100755
--- a/tests/bugs/modalg_4/bug6766_4
+++ b/tests/bugs/modalg_4/bug6766_4
@@ -23,15 +23,6 @@ bop a f
 bopsection result
 
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 8
 set length 126.138
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug7626_1 b/tests/bugs/modalg_4/bug7626_1
index 4eb38094ab..268b55b740 100755
--- a/tests/bugs/modalg_4/bug7626_1
+++ b/tests/bugs/modalg_4/bug7626_1
@@ -16,14 +16,5 @@ bcut result s b
 
 set square 1271.7
 
-set nb_v_good 4
-set nb_e_good 7
-set nb_w_good 4
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 21
-
+checknbshapes result -vertex 4 -edge 7 -wire 4 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 21
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug7626_2 b/tests/bugs/modalg_4/bug7626_2
index 406de37ad2..3e8ff30359 100755
--- a/tests/bugs/modalg_4/bug7626_2
+++ b/tests/bugs/modalg_4/bug7626_2
@@ -16,15 +16,6 @@ bcommon result s b
 
 set square 199.095
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 14
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 14
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_4/bug7668 b/tests/bugs/modalg_4/bug7668
index e3704ab77e..71a0d5fe93 100755
--- a/tests/bugs/modalg_4/bug7668
+++ b/tests/bugs/modalg_4/bug7668
@@ -22,15 +22,6 @@ mkoffset result w1 1 2
 renamevar result_1 result
 
 # Analysis of "nbshapes res"
-set nb_v_good 134
-set nb_e_good 134
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 269
-
+checknbshapes result -vertex 134 -edge 134 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 269
 set length 136.008
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug81 b/tests/bugs/modalg_4/bug81
index 31ccd3acf7..c7fe97dc88 100755
--- a/tests/bugs/modalg_4/bug81
+++ b/tests/bugs/modalg_4/bug81
@@ -15,14 +15,7 @@ mkface f f
 bsection result sh f
 puts "Info: it should be 12 edges"
 
-set nb_info [nbshapes result]
-regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full ne
-
-if { $ne != 12 } {                                         
-    puts "Faulty :Number of edges is wrong"                                                                               
-} else {
-    puts "Number of edges is OK"                                                                                                   
-}
+checknbshapes result -edge 12
 
 set length 33.6353
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8228 b/tests/bugs/modalg_4/bug8228
index 8946b337c4..3b3da7d5ab 100755
--- a/tests/bugs/modalg_4/bug8228
+++ b/tests/bugs/modalg_4/bug8228
@@ -24,14 +24,5 @@ XGetOneShape result D
 
 set square 1.46159e+06
 
-set nb_v_good 1296
-set nb_e_good 2041
-set nb_w_good 826
-set nb_f_good 761
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 4926
-
+checknbshapes result -vertex 1296 -edge 2041 -wire 826 -face 761 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 4926
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug825 b/tests/bugs/modalg_4/bug825
index 7036c07767..d99f2af7d6 100755
--- a/tests/bugs/modalg_4/bug825
+++ b/tests/bugs/modalg_4/bug825
@@ -31,45 +31,7 @@ if { [ catch { set info_result [OCC825 a1 a2 a3 res1 res2 0] } ] } {
     }
     checkshape res1
 
-    set nbFace_exp 2
-    set nbShell_exp 1
-    set nbSolid_exp 1
-    set nbCompSolid_exp 0
-    set nbCompound_exp 1
-    set nbShape_exp 15
-        
-    set nb_info [nbshapes res1]
-    regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_face
-    regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_shell
-    regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_solid
-    regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nbCompSolid
-    regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound
-    regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_Shape
-        
-    if { $nb_face != $nbFace_exp } {
-      puts [format "Faulty : result must contain %s FACE(S), but it contains %s only." $nbFace_exp $nb_face]
-    }
-
-    if { $nb_shell != $nbShell_exp } {
-      puts [format "Faulty : result must contain %s SHELL(S), but it contains %s only." $nbShell_exp $nb_shell]
-    }
-    
-    if { $nb_solid != $nbSolid_exp } {
-      puts [format "Faulty : result must contain %s SOLID(S), but it contains %s only." $nbSolid_exp $nb_solid]
-    }
-
-    if { $nbCompSolid != $nbCompSolid_exp } {
-      puts [format "Faulty : result must contain %s COMPSOLID(S), but it contains %s only." $nbCompSolid_exp $nbCompSolid]
-    }
-
-    if { $nb_compound != $nbCompound_exp } {
-      puts [format "Faulty : result must contain %s COMPOUND(S), but it contains %s only." $nbCompound_exp $nb_compound]
-    }
-
-    if { $nb_Shape != $nbShape_exp } {
-      puts [format "Faulty : result must contain %s SHAPE(S), but it contains %s only." $nbShape_exp $nb_Shape]
-    }
-
+    checknbshapes res1 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 15
 
     renamevar res2 result
 }
diff --git a/tests/bugs/modalg_4/bug8370 b/tests/bugs/modalg_4/bug8370
index c8fca38d92..1e68a74b95 100755
--- a/tests/bugs/modalg_4/bug8370
+++ b/tests/bugs/modalg_4/bug8370
@@ -14,16 +14,7 @@ igesread [locate_data_file OCC8370-part1.igs] result *
 
 set square 25310.8
 
-set nb_v_good 5060
-set nb_e_good 5105
-set nb_w_good 416
-set nb_f_good 399
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 10981
-
+checknbshapes result -vertex 5060 -edge 5105 -wire 416 -face 399 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10981
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_4/bug8372 b/tests/bugs/modalg_4/bug8372
index 5a7cfaa4d7..d45df819a8 100755
--- a/tests/bugs/modalg_4/bug8372
+++ b/tests/bugs/modalg_4/bug8372
@@ -15,14 +15,5 @@ thrusections result 1 1 w1 w2
 
 set square 4140.46
 
-set nb_v_good 12
-set nb_e_good 18
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 48
-
+checknbshapes result -vertex 12 -edge 18 -wire 8 -face 8 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 48
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_1 b/tests/bugs/modalg_4/bug8842_1
index 25da09005c..108421aec2 100755
--- a/tests/bugs/modalg_4/bug8842_1
+++ b/tests/bugs/modalg_4/bug8842_1
@@ -34,16 +34,7 @@ if [catch { myoffset result con1 5 0 } catch_result] {
 
 set square 32396.2
 
-set nb_v_good 5
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 5 -edge 8 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 22
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_10 b/tests/bugs/modalg_4/bug8842_10
index 2620a70147..88199d9e33 100755
--- a/tests/bugs/modalg_4/bug8842_10
+++ b/tests/bugs/modalg_4/bug8842_10
@@ -33,15 +33,6 @@ if [catch { myoffset result cyl1 -5 0 } catch_result] {
 } else {
 
 set square 55514.4
-set nb_v_good 8
-set nb_e_good 14
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 39
-}
+checknbshapes result -vertex 8 -edge 14 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 39}
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_11 b/tests/bugs/modalg_4/bug8842_11
index 4f0c7252c1..e306635545 100755
--- a/tests/bugs/modalg_4/bug8842_11
+++ b/tests/bugs/modalg_4/bug8842_11
@@ -38,16 +38,7 @@ if [catch { myoffset result cyl1 5 1 } catch_result] {
 } else {
 
 set square 38170.4
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 19
-
+checknbshapes result -vertex 4 -edge 6 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 19
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_12 b/tests/bugs/modalg_4/bug8842_12
index 323246d3f5..4f9ca65a35 100755
--- a/tests/bugs/modalg_4/bug8842_12
+++ b/tests/bugs/modalg_4/bug8842_12
@@ -37,16 +37,7 @@ if [catch { myoffset result cyl1 -5 1 } catch_result] {
 } else {
 
 set square 57019.9
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 19
-
+checknbshapes result -vertex 4 -edge 6 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 19
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_13 b/tests/bugs/modalg_4/bug8842_13
index c9843d8e66..2565560636 100755
--- a/tests/bugs/modalg_4/bug8842_13
+++ b/tests/bugs/modalg_4/bug8842_13
@@ -33,16 +33,7 @@ if [catch { myoffset result cyl2 5 0 } catch_result] {
 } else {
 
 set square 34980.9
-set nb_v_good 20
-set nb_e_good 33
-set nb_w_good 15
-set nb_f_good 15
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 85
-
+checknbshapes result -vertex 20 -edge 33 -wire 15 -face 15 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 85
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_14 b/tests/bugs/modalg_4/bug8842_14
index a98d2ed375..c69e4cfcc2 100755
--- a/tests/bugs/modalg_4/bug8842_14
+++ b/tests/bugs/modalg_4/bug8842_14
@@ -33,16 +33,7 @@ if [catch { myoffset result cyl2 -5 0 } catch_result] {
 } else {
 
 set square 20106.2
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 27
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_15 b/tests/bugs/modalg_4/bug8842_15
index d952a8916d..62fffd6f2d 100755
--- a/tests/bugs/modalg_4/bug8842_15
+++ b/tests/bugs/modalg_4/bug8842_15
@@ -33,16 +33,7 @@ if [catch { myoffset result cyl2 5 1 } catch_result] {
   puts "${BugNumber}: Faulty (1)"
 } else {
 set square 35814.2
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 27
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_16 b/tests/bugs/modalg_4/bug8842_16
index ab6e8106c0..a762e22639 100755
--- a/tests/bugs/modalg_4/bug8842_16
+++ b/tests/bugs/modalg_4/bug8842_16
@@ -33,16 +33,7 @@ if [catch { myoffset result cyl2 -5 1 } catch_result] {
 } else {
 
 set square 20106.2
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 27
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_2 b/tests/bugs/modalg_4/bug8842_2
index c3ed279ace..60b019d2be 100755
--- a/tests/bugs/modalg_4/bug8842_2
+++ b/tests/bugs/modalg_4/bug8842_2
@@ -38,16 +38,7 @@ if [catch { myoffset result con1 -5 0 } catch_result] {
 
 set square 3542.24
 
-set nb_v_good 60
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 40
-set nb_sh_good 5
-set nb_sol_good 5
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 243
-
+checknbshapes result -vertex 60 -edge 90 -wire 42 -face 40 -shell 5 -solid 5 -compsolid 0 -compound 1 -shape 243
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_3 b/tests/bugs/modalg_4/bug8842_3
index c8ce92fe36..ced6df5e32 100755
--- a/tests/bugs/modalg_4/bug8842_3
+++ b/tests/bugs/modalg_4/bug8842_3
@@ -1,4 +1,4 @@
-puts "TODO OCC25913 ALL: Error : Result shape is WRONG"
+puts "TODO OCC25913 ALL: Error :  is WRONG because number of"
 puts "TODO OCC25913 ALL: Error : The square of result shape is"
 puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*"
 puts "TODO OCC24156 MacOS: An exception was caught"
@@ -40,16 +40,7 @@ if [catch { myoffset result con1 5 1 } catch_result] {
 
 set square 3542.24
 
-set nb_v_good 60
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 40
-set nb_sh_good 5
-set nb_sol_good 5
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 243
-
+checknbshapes result -vertex 60 -edge 90 -wire 42 -face 40 -shell 5 -solid 5 -compsolid 0 -compound 1 -shape 243
 
 }
 
diff --git a/tests/bugs/modalg_4/bug8842_4 b/tests/bugs/modalg_4/bug8842_4
index 20db569c18..f9a49247c2 100755
--- a/tests/bugs/modalg_4/bug8842_4
+++ b/tests/bugs/modalg_4/bug8842_4
@@ -36,16 +36,7 @@ if [catch { myoffset result con1 -5 1 } catch_result] {
   puts "${BugNumber}: Faulty (1)"
 } else {
 set square 3542.24
-set nb_v_good 60
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 40
-set nb_sh_good 5
-set nb_sol_good 5
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 243
-
+checknbshapes result -vertex 60 -edge 90 -wire 42 -face 40 -shell 5 -solid 5 -compsolid 0 -compound 1 -shape 243
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_5 b/tests/bugs/modalg_4/bug8842_5
index 7742da880f..631ec7b71f 100755
--- a/tests/bugs/modalg_4/bug8842_5
+++ b/tests/bugs/modalg_4/bug8842_5
@@ -1,5 +1,5 @@
 puts "TODO ?OCC25913 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO OCC25913 ALL: Error : Result shape is WRONG"
+puts "TODO OCC25913 ALL: Error :  is WRONG because number of"
 puts "TODO OCC25913 ALL: Error : The square of result shape is"
 
 puts "============"
@@ -37,16 +37,7 @@ if [catch { myoffset result con2 5 0 } catch_result] {
 } else {
 
 set square 3542.24
-set nb_v_good 60
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 40
-set nb_sh_good 5
-set nb_sol_good 5
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 243
-
+checknbshapes result -vertex 60 -edge 90 -wire 42 -face 40 -shell 5 -solid 5 -compsolid 0 -compound 1 -shape 243
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_6 b/tests/bugs/modalg_4/bug8842_6
index 1e9df0d877..283d085d65 100755
--- a/tests/bugs/modalg_4/bug8842_6
+++ b/tests/bugs/modalg_4/bug8842_6
@@ -33,16 +33,7 @@ if [catch { myoffset result con2 -5 0 } catch_result] {
 } else {
 
 set square 9885.2
-set nb_v_good 4
-set nb_e_good 9
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 9 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_7 b/tests/bugs/modalg_4/bug8842_7
index 4f4af9e161..9176e1f294 100755
--- a/tests/bugs/modalg_4/bug8842_7
+++ b/tests/bugs/modalg_4/bug8842_7
@@ -33,16 +33,7 @@ if [catch { myoffset result con2 5 1 } catch_result] {
 } else {
 
 set square 22391
-set nb_v_good 4
-set nb_e_good 9
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 9 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_8 b/tests/bugs/modalg_4/bug8842_8
index 10a97698b6..6ef56caeaf 100755
--- a/tests/bugs/modalg_4/bug8842_8
+++ b/tests/bugs/modalg_4/bug8842_8
@@ -35,16 +35,7 @@ if [catch { myoffset result con2 -5 1 } catch_result] {
 } else {
 
 set square 9885.2
-set nb_v_good 4
-set nb_e_good 9
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 9 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_4/bug8842_9 b/tests/bugs/modalg_4/bug8842_9
index fa95be1c80..a170099da7 100755
--- a/tests/bugs/modalg_4/bug8842_9
+++ b/tests/bugs/modalg_4/bug8842_9
@@ -33,16 +33,7 @@ if [catch { myoffset result cyl1 5 0 } catch_result] {
 } else {
 
 set square 38170.4
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 19
-
+checknbshapes result -vertex 4 -edge 6 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 19
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/modalg_5/bug22027 b/tests/bugs/modalg_5/bug22027
index 0ea0d72cc7..02b8196fd0 100644
--- a/tests/bugs/modalg_5/bug22027
+++ b/tests/bugs/modalg_5/bug22027
@@ -18,10 +18,7 @@ bop f1 f2
 bopcut result
 
 set square 1178.1
-set nb_v_good 2
-set nb_e_good 4
-set nb_w_good 2
-set nb_f_good 2
+checknbshapes result -vertex 2 -edge 4 -wire 2 -face 2
 
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_5/bug22614_1 b/tests/bugs/modalg_5/bug22614_1
index 2ac59c2a57..067ae70c04 100644
--- a/tests/bugs/modalg_5/bug22614_1
+++ b/tests/bugs/modalg_5/bug22614_1
@@ -17,14 +17,5 @@ renamevar p_1 result
 
 set square 0.00314159
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 7
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug22614_2 b/tests/bugs/modalg_5/bug22614_2
index 3943a31728..29f6e2ffac 100644
--- a/tests/bugs/modalg_5/bug22614_2
+++ b/tests/bugs/modalg_5/bug22614_2
@@ -17,14 +17,5 @@ renamevar p_2 result
 
 set square 0.000314159
 
-set nb_v_good 1
-set nb_e_good 1
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 4
-
+checknbshapes result -vertex 1 -edge 1 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug22614_3 b/tests/bugs/modalg_5/bug22614_3
index d63e72faae..f8ea8d53d9 100644
--- a/tests/bugs/modalg_5/bug22614_3
+++ b/tests/bugs/modalg_5/bug22614_3
@@ -16,14 +16,5 @@ renamevar f result
 
 set square 0.0025
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 10
-
+checknbshapes result -vertex 4 -edge 4 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 10
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23282_1 b/tests/bugs/modalg_5/bug23282_1
index 82a6067708..91662f0515 100755
--- a/tests/bugs/modalg_5/bug23282_1
+++ b/tests/bugs/modalg_5/bug23282_1
@@ -14,16 +14,7 @@ checkshape result
 
 set square 289.612
 
-set nb_v_good 4
-set nb_e_good 7
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 4 -edge 7 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 vinit
 vdisplay result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_5/bug23282_2 b/tests/bugs/modalg_5/bug23282_2
index 5c2814d6d9..ecccdf76b7 100755
--- a/tests/bugs/modalg_5/bug23282_2
+++ b/tests/bugs/modalg_5/bug23282_2
@@ -17,16 +17,7 @@ checkshape result
 
 set square 454.16
 
-set nb_v_good 4
-set nb_e_good 7
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 4 -edge 7 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 21
 vinit
 vdisplay result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_5/bug23782 b/tests/bugs/modalg_5/bug23782
index 999f5c316e..295ade0fc1 100644
--- a/tests/bugs/modalg_5/bug23782
+++ b/tests/bugs/modalg_5/bug23782
@@ -11,9 +11,7 @@ restore [locate_data_file bug23782_c.brep] f
 explode f
 bsection result f_1 f_2
 
-set nbsh_t 1
-set nb_v_good 2
-set nb_e_good 1
+checknbshapes result -t -vertex 2 -edge 1
 
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_5/bug23823 b/tests/bugs/modalg_5/bug23823
index 38cb4ac916..c940c26c3d 100644
--- a/tests/bugs/modalg_5/bug23823
+++ b/tests/bugs/modalg_5/bug23823
@@ -20,16 +20,5 @@ copy b2_1 b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
-set nb_info [nbshapes result]
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23824_1 b/tests/bugs/modalg_5/bug23824_1
index 08189cb801..8714fdab57 100755
--- a/tests/bugs/modalg_5/bug23824_1
+++ b/tests/bugs/modalg_5/bug23824_1
@@ -20,14 +20,5 @@ buildsweep result
 
 set square 516.633
 
-set nb_v_good 8
-set nb_e_good 10
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 25
-
+checknbshapes result -vertex 8 -edge 10 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 25
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23824_2 b/tests/bugs/modalg_5/bug23824_2
index 454a51c0a5..0d825c333c 100755
--- a/tests/bugs/modalg_5/bug23824_2
+++ b/tests/bugs/modalg_5/bug23824_2
@@ -21,14 +21,5 @@ buildsweep result
 
 set square 8805.92
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23824_3 b/tests/bugs/modalg_5/bug23824_3
index 81f9803d4d..5c234dfbce 100755
--- a/tests/bugs/modalg_5/bug23824_3
+++ b/tests/bugs/modalg_5/bug23824_3
@@ -22,14 +22,5 @@ buildsweep result
 
 set square 848.989
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23824_4 b/tests/bugs/modalg_5/bug23824_4
index 9643305022..95addf83d9 100755
--- a/tests/bugs/modalg_5/bug23824_4
+++ b/tests/bugs/modalg_5/bug23824_4
@@ -22,14 +22,5 @@ buildsweep result
 
 set square 38663.7
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23870_1 b/tests/bugs/modalg_5/bug23870_1
index 8585151870..2c0cf57672 100755
--- a/tests/bugs/modalg_5/bug23870_1
+++ b/tests/bugs/modalg_5/bug23870_1
@@ -21,14 +21,5 @@ pipe result spine profile 2 approx
 
 set square 516.633
 
-set nb_v_good 8
-set nb_e_good 10
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 25
-
+checknbshapes result -vertex 8 -edge 10 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 25
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23870_2 b/tests/bugs/modalg_5/bug23870_2
index 56773f8ce6..825942bc8b 100755
--- a/tests/bugs/modalg_5/bug23870_2
+++ b/tests/bugs/modalg_5/bug23870_2
@@ -22,14 +22,5 @@ pipe result spine profile 2 approx
 
 set square 8772.95
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23870_3 b/tests/bugs/modalg_5/bug23870_3
index 4b65af2399..5e0b429b19 100755
--- a/tests/bugs/modalg_5/bug23870_3
+++ b/tests/bugs/modalg_5/bug23870_3
@@ -18,14 +18,5 @@ pipe result spine profile 2 approx
 
 set square 848.989
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23870_4 b/tests/bugs/modalg_5/bug23870_4
index c0802834d0..2f5409cb26 100755
--- a/tests/bugs/modalg_5/bug23870_4
+++ b/tests/bugs/modalg_5/bug23870_4
@@ -23,14 +23,5 @@ pipe result spine profile 2 approx
 
 set square 38260.5
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23870_5 b/tests/bugs/modalg_5/bug23870_5
index 3542fcb175..d20e27ba43 100755
--- a/tests/bugs/modalg_5/bug23870_5
+++ b/tests/bugs/modalg_5/bug23870_5
@@ -17,14 +17,5 @@ pipe result spine profile 1
 
 set square 254837
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 29
-
+checknbshapes result -vertex 8 -edge 12 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 29
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23892 b/tests/bugs/modalg_5/bug23892
index 11bcb25a4f..2fd23d1eeb 100644
--- a/tests/bugs/modalg_5/bug23892
+++ b/tests/bugs/modalg_5/bug23892
@@ -12,14 +12,5 @@ restore [locate_data_file bug23892_fz46] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 5
-
+checknbshapes result -vertex 2 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 5
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23903 b/tests/bugs/modalg_5/bug23903
index 89282795a0..be44e91786 100755
--- a/tests/bugs/modalg_5/bug23903
+++ b/tests/bugs/modalg_5/bug23903
@@ -11,14 +11,5 @@ restore [locate_data_file bug23903_path.brep] w
 
 pipe result w sh
 
-set nb_v_good 2
-set nb_e_good 5
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 18
-
+checknbshapes result -vertex 2 -edge 5 -wire 3 -face 3 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 18
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23991 b/tests/bugs/modalg_5/bug23991
index 808a16d7dc..6a0e823eb4 100644
--- a/tests/bugs/modalg_5/bug23991
+++ b/tests/bugs/modalg_5/bug23991
@@ -14,16 +14,5 @@ restore [locate_data_file bug23991_Plane_1.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
-set nb_info [nbshapes result]
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug23998 b/tests/bugs/modalg_5/bug23998
index 6743a6c611..e4de6d7a7a 100755
--- a/tests/bugs/modalg_5/bug23998
+++ b/tests/bugs/modalg_5/bug23998
@@ -19,14 +19,5 @@ checkshape result
 set length 67.026
 
 # Analysis of "nbshapes res"
-set nb_v_good 1
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 3
-
+checknbshapes result -vertex 1 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 3
 set 2dviewer 0
diff --git a/tests/bugs/modalg_5/bug24037_1 b/tests/bugs/modalg_5/bug24037_1
index 5fb33a0439..8678789893 100755
--- a/tests/bugs/modalg_5/bug24037_1
+++ b/tests/bugs/modalg_5/bug24037_1
@@ -16,18 +16,6 @@ baddcompound b2
 bfillds
 bbuild result
 
-nbshapes result -t
-#the number of solids should be 12 instead of 2
-
-set nbsh_t 1
-set nb_v_good 52
-set nb_e_good 105
-set nb_w_good 76
-set nb_f_good 70
-set nb_sh_good 12
-set nb_sol_good 12
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 328
+checknbshapes result -t -vertex 52 -edge 105 -wire 76 -face 70 -shell 12 -solid 12 -compsolid 0 -compound 1 -shape 328
 
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug24037_2 b/tests/bugs/modalg_5/bug24037_2
index 48c95fdc79..7a612e342c 100755
--- a/tests/bugs/modalg_5/bug24037_2
+++ b/tests/bugs/modalg_5/bug24037_2
@@ -21,18 +21,6 @@ baddtools b2
 bfillds
 bbuild result
 
-nbshapes result -t
-#the number of solids should be 2 instead of 1
-
-set nbsh_t 1
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 13
-set nb_f_good 12
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 70
+checknbshapes result -t -vertex 16 -edge 24 -wire 13 -face 12 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 70
 
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug24040 b/tests/bugs/modalg_5/bug24040
index 8a9cd3838d..d62264ce33 100755
--- a/tests/bugs/modalg_5/bug24040
+++ b/tests/bugs/modalg_5/bug24040
@@ -14,12 +14,4 @@ bopcut result
 
 #the result should be empty compound
 # Analysis of "nbshapes res"
-set nb_v_good 0
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1
+checknbshapes result -vertex 0 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24053 b/tests/bugs/modalg_5/bug24053
index 46aeee11cc..fb29086ffe 100755
--- a/tests/bugs/modalg_5/bug24053
+++ b/tests/bugs/modalg_5/bug24053
@@ -12,16 +12,7 @@ restore [locate_data_file bug24053_plane.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 3
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 6
-
+checknbshapes result -vertex 3 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 6
 set length 17.2391
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24060 b/tests/bugs/modalg_5/bug24060
index 722a5e6dc9..3af1018dd4 100644
--- a/tests/bugs/modalg_5/bug24060
+++ b/tests/bugs/modalg_5/bug24060
@@ -15,7 +15,7 @@ baddobjects b1 b2
 bfillds
 bbuild result
 
-set nb_v_good 4
+checknbshapes result -vertex 4
 
 set 2dviewer 0
 
diff --git a/tests/bugs/modalg_5/bug24075 b/tests/bugs/modalg_5/bug24075
index 54848f3856..bad67fb6ee 100644
--- a/tests/bugs/modalg_5/bug24075
+++ b/tests/bugs/modalg_5/bug24075
@@ -12,14 +12,6 @@ restore [locate_data_file bug24075_b2.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24089 b/tests/bugs/modalg_5/bug24089
index 111761f289..8153e71577 100644
--- a/tests/bugs/modalg_5/bug24089
+++ b/tests/bugs/modalg_5/bug24089
@@ -12,10 +12,6 @@ restore [locate_data_file bug24089_qf1] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 5
-set nb_e_good 4
-set nb_shape_good 10
+checknbshapes result -vertex 5 -edge 4 -shape 10
 
 set 2dviewer 0
-
-
diff --git a/tests/bugs/modalg_5/bug24092 b/tests/bugs/modalg_5/bug24092
index 9b73779413..71070c0cab 100644
--- a/tests/bugs/modalg_5/bug24092
+++ b/tests/bugs/modalg_5/bug24092
@@ -14,14 +14,5 @@ bopfuse result
 
 set square 155006
 
-set nb_v_good 9
-set nb_e_good 15
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 33
-
+checknbshapes result -vertex 9 -edge 15 -wire 4 -face 4 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 33
 set 2dviewer 0
diff --git a/tests/bugs/modalg_5/bug24140 b/tests/bugs/modalg_5/bug24140
index f28a12d40c..f4d1ddc958 100755
--- a/tests/bugs/modalg_5/bug24140
+++ b/tests/bugs/modalg_5/bug24140
@@ -16,14 +16,5 @@ bsection result sh1 sh2
 
 set length 557.6
 
-set nb_v_good 1
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 3
-
+checknbshapes result -vertex 1 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 3
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24144_1 b/tests/bugs/modalg_5/bug24144_1
index ec7325aafb..4310db7e3f 100644
--- a/tests/bugs/modalg_5/bug24144_1
+++ b/tests/bugs/modalg_5/bug24144_1
@@ -36,14 +36,5 @@ wedge result ${Ox} ${Oy} ${Oz} ${Zx} ${Zy} ${Zz} ${Xx} ${Xy} ${Xz} \
 set square 2.25939e+06
 
 # Analysis of "nbshapes result"
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 27
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24144_2 b/tests/bugs/modalg_5/bug24144_2
index e5dcd67e9c..c8da1d09af 100644
--- a/tests/bugs/modalg_5/bug24144_2
+++ b/tests/bugs/modalg_5/bug24144_2
@@ -36,14 +36,5 @@ wedge result \
 set square 2.25939e+06
 
 # Analysis of "nbshapes result"
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 6 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 27
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24154 b/tests/bugs/modalg_5/bug24154
index 0c8803c988..6a09cc47ac 100644
--- a/tests/bugs/modalg_5/bug24154
+++ b/tests/bugs/modalg_5/bug24154
@@ -15,14 +15,5 @@ bopcut result
 set square 2.68434e+06
 
 # Analysis of "nbshapes res"
-set nb_v_good 18
-set nb_e_good 27
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 70
-
+checknbshapes result -vertex 18 -edge 27 -wire 11 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 70
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24187 b/tests/bugs/modalg_5/bug24187
index 5d7781b9a6..cabc64e307 100644
--- a/tests/bugs/modalg_5/bug24187
+++ b/tests/bugs/modalg_5/bug24187
@@ -20,14 +20,5 @@ bopcommon result
 set length 18.5459
 
 # Analysis of "nbshapes result"
-set nb_v_good 6
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 11
-
+checknbshapes result -vertex 6 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 11
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24204 b/tests/bugs/modalg_5/bug24204
index 9007bf3c32..0f7d48098b 100644
--- a/tests/bugs/modalg_5/bug24204
+++ b/tests/bugs/modalg_5/bug24204
@@ -40,14 +40,5 @@ if { ${tolmax_result} > [expr 2 * ${tolmax_s}] } {
 
 set square 3.44584
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug24208_1 b/tests/bugs/modalg_5/bug24208_1
index abddc5d573..bc6d1a7e1d 100644
--- a/tests/bugs/modalg_5/bug24208_1
+++ b/tests/bugs/modalg_5/bug24208_1
@@ -24,14 +24,5 @@ bbuild result
 set square 157311
 
 # Analysis of "nbshapes result"
-set nb_v_good 8
-set nb_e_good 14
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 37
-
+checknbshapes result -vertex 8 -edge 14 -wire 7 -face 7 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 37
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_10 b/tests/bugs/modalg_5/bug24208_10
index 48f553b0e6..1695068903 100644
--- a/tests/bugs/modalg_5/bug24208_10
+++ b/tests/bugs/modalg_5/bug24208_10
@@ -24,14 +24,5 @@ bbuild result
 set square 80532.3
 
 # Analysis of "nbshapes result"
-set nb_v_good 54
-set nb_e_good 106
-set nb_w_good 31
-set nb_f_good 31
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 223
-
+checknbshapes result -vertex 54 -edge 106 -wire 31 -face 31 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 223
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_11 b/tests/bugs/modalg_5/bug24208_11
index e7d1c91897..7b2d15ab10 100644
--- a/tests/bugs/modalg_5/bug24208_11
+++ b/tests/bugs/modalg_5/bug24208_11
@@ -24,14 +24,5 @@ bbuild result
 set square 81730.6
 
 # Analysis of "nbshapes result"
-set nb_v_good 121
-set nb_e_good 191
-set nb_w_good 40
-set nb_f_good 40
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 393
-
+checknbshapes result -vertex 121 -edge 191 -wire 40 -face 40 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 393
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_12 b/tests/bugs/modalg_5/bug24208_12
index 170bef3a93..8d6cb9a7da 100644
--- a/tests/bugs/modalg_5/bug24208_12
+++ b/tests/bugs/modalg_5/bug24208_12
@@ -24,14 +24,5 @@ bbuild result
 set square 159918
 
 # Analysis of "nbshapes result"
-set nb_v_good 38
-set nb_e_good 74
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 153
-
+checknbshapes result -vertex 38 -edge 74 -wire 20 -face 20 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 153
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_13 b/tests/bugs/modalg_5/bug24208_13
index e46fadbac4..94fa0e41af 100644
--- a/tests/bugs/modalg_5/bug24208_13
+++ b/tests/bugs/modalg_5/bug24208_13
@@ -24,14 +24,5 @@ bbuild result
 set square 279864
 
 # Analysis of "nbshapes result"
-set nb_v_good 50
-set nb_e_good 94
-set nb_w_good 36
-set nb_f_good 32
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 213
-
+checknbshapes result -vertex 50 -edge 94 -wire 36 -face 32 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 213
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_14 b/tests/bugs/modalg_5/bug24208_14
index 6e6c793b07..0c1cbf02e3 100644
--- a/tests/bugs/modalg_5/bug24208_14
+++ b/tests/bugs/modalg_5/bug24208_14
@@ -24,14 +24,5 @@ bbuild result
 set square 126161
 
 # Analysis of "nbshapes result"
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 10
-set nb_f_good 7
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 58
-
+checknbshapes result -vertex 16 -edge 24 -wire 10 -face 7 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 58
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_2 b/tests/bugs/modalg_5/bug24208_2
index c01661b23b..adb75207a0 100644
--- a/tests/bugs/modalg_5/bug24208_2
+++ b/tests/bugs/modalg_5/bug24208_2
@@ -24,14 +24,5 @@ bbuild result
 set square 182532
 
 # Analysis of "nbshapes result"
-set nb_v_good 46
-set nb_e_good 86
-set nb_w_good 30
-set nb_f_good 26
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 189
-
+checknbshapes result -vertex 46 -edge 86 -wire 30 -face 26 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 189
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_3 b/tests/bugs/modalg_5/bug24208_3
index b304a2e21e..8a2dc98e34 100644
--- a/tests/bugs/modalg_5/bug24208_3
+++ b/tests/bugs/modalg_5/bug24208_3
@@ -24,14 +24,5 @@ bbuild result
 set square 80532.3
 
 # Analysis of "nbshapes result"
-set nb_v_good 54
-set nb_e_good 106
-set nb_w_good 31
-set nb_f_good 31
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 223
-
+checknbshapes result -vertex 54 -edge 106 -wire 31 -face 31 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 223
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_4 b/tests/bugs/modalg_5/bug24208_4
index c274756c86..18c800a1f0 100644
--- a/tests/bugs/modalg_5/bug24208_4
+++ b/tests/bugs/modalg_5/bug24208_4
@@ -24,14 +24,5 @@ bbuild result
 set square 81730.6
 
 # Analysis of "nbshapes result"
-set nb_v_good 121
-set nb_e_good 191
-set nb_w_good 40
-set nb_f_good 40
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 393
-
+checknbshapes result -vertex 121 -edge 191 -wire 40 -face 40 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 393
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_5 b/tests/bugs/modalg_5/bug24208_5
index 971b2833cd..27eadebb20 100644
--- a/tests/bugs/modalg_5/bug24208_5
+++ b/tests/bugs/modalg_5/bug24208_5
@@ -24,14 +24,5 @@ bbuild result
 set square 159918
 
 # Analysis of "nbshapes result"
-set nb_v_good 38
-set nb_e_good 74
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 153
-
+checknbshapes result -vertex 38 -edge 74 -wire 20 -face 20 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 153
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_6 b/tests/bugs/modalg_5/bug24208_6
index 9b3eacfe7a..e36748ce39 100644
--- a/tests/bugs/modalg_5/bug24208_6
+++ b/tests/bugs/modalg_5/bug24208_6
@@ -24,14 +24,5 @@ bbuild result
 set square 279864
 
 # Analysis of "nbshapes result"
-set nb_v_good 50
-set nb_e_good 94
-set nb_w_good 36
-set nb_f_good 32
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 213
-
+checknbshapes result -vertex 50 -edge 94 -wire 36 -face 32 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 213
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_7 b/tests/bugs/modalg_5/bug24208_7
index e82a780b2b..ee402c77d9 100644
--- a/tests/bugs/modalg_5/bug24208_7
+++ b/tests/bugs/modalg_5/bug24208_7
@@ -24,14 +24,5 @@ bbuild result
 set square 126161
 
 # Analysis of "nbshapes result"
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 10
-set nb_f_good 7
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 58
-
+checknbshapes result -vertex 16 -edge 24 -wire 10 -face 7 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 58
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_8 b/tests/bugs/modalg_5/bug24208_8
index 8d59847138..1f4afeb1e8 100644
--- a/tests/bugs/modalg_5/bug24208_8
+++ b/tests/bugs/modalg_5/bug24208_8
@@ -24,14 +24,5 @@ bbuild result
 set square 157311
 
 # Analysis of "nbshapes result"
-set nb_v_good 8
-set nb_e_good 14
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 37
-
+checknbshapes result -vertex 8 -edge 14 -wire 7 -face 7 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 37
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24208_9 b/tests/bugs/modalg_5/bug24208_9
index ca910f471c..e9e1e0a53e 100644
--- a/tests/bugs/modalg_5/bug24208_9
+++ b/tests/bugs/modalg_5/bug24208_9
@@ -24,14 +24,5 @@ bbuild result
 set square 182532
 
 # Analysis of "nbshapes result"
-set nb_v_good 46
-set nb_e_good 86
-set nb_w_good 30
-set nb_f_good 26
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 189
-
+checknbshapes result -vertex 46 -edge 86 -wire 30 -face 26 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 189
 set 2dviewer 1
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24247 b/tests/bugs/modalg_5/bug24247
index b980fa3be2..7d2ee2603d 100644
--- a/tests/bugs/modalg_5/bug24247
+++ b/tests/bugs/modalg_5/bug24247
@@ -25,14 +25,5 @@ bbuild result
 
 set square 260611
 
-set nb_v_good 44
-set nb_e_good 108
-set nb_w_good 74
-set nb_f_good 74
-set nb_sh_good 17
-set nb_sol_good 17
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 335
-
+checknbshapes result -vertex 44 -edge 108 -wire 74 -face 74 -shell 17 -solid 17 -compsolid 0 -compound 1 -shape 335
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24286 b/tests/bugs/modalg_5/bug24286
index aa631d3aec..2c160093c2 100644
--- a/tests/bugs/modalg_5/bug24286
+++ b/tests/bugs/modalg_5/bug24286
@@ -20,14 +20,5 @@ bbuild result
 
 set square 281195
 
-set nb_v_good 12
-set nb_e_good 22
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 57
-
+checknbshapes result -vertex 12 -edge 22 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 2 -shape 57
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24290_2 b/tests/bugs/modalg_5/bug24290_2
index 493de2f0fc..93eed1b663 100755
--- a/tests/bugs/modalg_5/bug24290_2
+++ b/tests/bugs/modalg_5/bug24290_2
@@ -12,14 +12,5 @@ restore [locate_data_file bug24290_TheShape.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 6
-set nb_e_good 6
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 13
-
+checknbshapes result -vertex 6 -edge 6 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 13
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24305 b/tests/bugs/modalg_5/bug24305
index bd0a132400..2b72ff1934 100755
--- a/tests/bugs/modalg_5/bug24305
+++ b/tests/bugs/modalg_5/bug24305
@@ -20,14 +20,5 @@ buildsweep result
 
 set square 69608
 
-set nb_v_good 12
-set nb_e_good 16
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 39
-
+checknbshapes result -vertex 12 -edge 16 -wire 5 -face 5 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 39
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24359 b/tests/bugs/modalg_5/bug24359
index 81f17f51a4..4cc9d05965 100755
--- a/tests/bugs/modalg_5/bug24359
+++ b/tests/bugs/modalg_5/bug24359
@@ -61,16 +61,7 @@ bop s s25; bopfuse s
 bop s s26; bopfuse s
 bop s s27; bopfuse result
 
-set nb_v_good 60
-set nb_e_good 105
-set nb_w_good 29
-set nb_f_good 29
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 226
-
+checknbshapes result -vertex 60 -edge 105 -wire 29 -face 29 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 226
 set square 150.187
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24400 b/tests/bugs/modalg_5/bug24400
index 083e4b2363..9bb596232f 100644
--- a/tests/bugs/modalg_5/bug24400
+++ b/tests/bugs/modalg_5/bug24400
@@ -12,14 +12,5 @@ restore [locate_data_file bug24075_b2.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24493 b/tests/bugs/modalg_5/bug24493
index 0b0666f6c9..793846a8b7 100644
--- a/tests/bugs/modalg_5/bug24493
+++ b/tests/bugs/modalg_5/bug24493
@@ -27,14 +27,5 @@ bbuild result
 
 set square 3.44726e+06
 
-set nb_v_good 41
-set nb_e_good 53
-set nb_w_good 23
-set nb_f_good 18
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 136
-
+checknbshapes result -vertex 41 -edge 53 -wire 23 -face 18 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 136
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24532 b/tests/bugs/modalg_5/bug24532
index 1a4c0c232c..7afea260ac 100755
--- a/tests/bugs/modalg_5/bug24532
+++ b/tests/bugs/modalg_5/bug24532
@@ -25,14 +25,5 @@ buildsweep result -S
 
 set square 2343.46
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 34
-
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 34
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24558 b/tests/bugs/modalg_5/bug24558
index ae0a5584f0..c933dca25f 100644
--- a/tests/bugs/modalg_5/bug24558
+++ b/tests/bugs/modalg_5/bug24558
@@ -21,14 +21,5 @@ bbuild result
 
 set square 134338
 
-set nb_v_good 108
-set nb_e_good 187
-set nb_w_good 94
-set nb_f_good 87
-set nb_sh_good 11
-set nb_sol_good 5
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 493
-
+checknbshapes result -vertex 108 -edge 187 -wire 94 -face 87 -shell 11 -solid 5 -compsolid 0 -compound 1 -shape 493
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24573 b/tests/bugs/modalg_5/bug24573
index 5a9b19a07a..7b6bd539c3 100755
--- a/tests/bugs/modalg_5/bug24573
+++ b/tests/bugs/modalg_5/bug24573
@@ -18,15 +18,7 @@ if [catch { mkoffset resoffset ww 1 12.5 } ] {
 
   set length 178.54
 
-  set nb_v_good 10
-  set nb_e_good 10
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 21
+  checknbshapes result -vertex 10 -edge 10 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 21
 }
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24585_2 b/tests/bugs/modalg_5/bug24585_2
index 2c2492adea..d32877bde3 100644
--- a/tests/bugs/modalg_5/bug24585_2
+++ b/tests/bugs/modalg_5/bug24585_2
@@ -18,14 +18,5 @@ bbuild result
 
 set square 933.33
 
-set nb_v_good 10
-set nb_e_good 11
-set nb_w_good 4
-set nb_f_good 3
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 29
-
+checknbshapes result -vertex 10 -edge 11 -wire 4 -face 3 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 29
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24586 b/tests/bugs/modalg_5/bug24586
index b3e7033c6e..80a275889f 100755
--- a/tests/bugs/modalg_5/bug24586
+++ b/tests/bugs/modalg_5/bug24586
@@ -11,14 +11,5 @@ restore [locate_data_file bug24586_path.brep] path
 
 pipe result path base
 
-set nb_v_good 164
-set nb_e_good 379
-set nb_w_good 240
-set nb_f_good 240
-set nb_sh_good 24
-set nb_sol_good 24
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1072
-
+checknbshapes result -vertex 164 -edge 379 -wire 240 -face 240 -shell 24 -solid 24 -compsolid 0 -compound 1 -shape 1072
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24597 b/tests/bugs/modalg_5/bug24597
index 925b9d4594..de189545f3 100644
--- a/tests/bugs/modalg_5/bug24597
+++ b/tests/bugs/modalg_5/bug24597
@@ -27,14 +27,5 @@ bbuild result
 
 set square 33136.3
 
-set nb_v_good 13
-set nb_e_good 19
-set nb_w_good 13
-set nb_f_good 11
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 61
-
+checknbshapes result -vertex 13 -edge 19 -wire 13 -face 11 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 61
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24618_1 b/tests/bugs/modalg_5/bug24618_1
index 6eb4dd56d5..80e91b90e2 100644
--- a/tests/bugs/modalg_5/bug24618_1
+++ b/tests/bugs/modalg_5/bug24618_1
@@ -29,14 +29,5 @@ explode r
 # Check number of shapes
 renamevar r_1 result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 1
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 1
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24618_2 b/tests/bugs/modalg_5/bug24618_2
index c074e060ea..c934992c7e 100644
--- a/tests/bugs/modalg_5/bug24618_2
+++ b/tests/bugs/modalg_5/bug24618_2
@@ -29,14 +29,5 @@ explode r
 # Check number of shapes
 renamevar r_2 result
 
-set nb_v_good 3
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 3 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24618_3 b/tests/bugs/modalg_5/bug24618_3
index 7d4cbfff5c..7cb9ed09ca 100644
--- a/tests/bugs/modalg_5/bug24618_3
+++ b/tests/bugs/modalg_5/bug24618_3
@@ -29,14 +29,5 @@ explode r
 # Check number of shapes
 renamevar r_1 result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 1
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 1
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24618_4 b/tests/bugs/modalg_5/bug24618_4
index 6edc353b93..a939aa6a23 100644
--- a/tests/bugs/modalg_5/bug24618_4
+++ b/tests/bugs/modalg_5/bug24618_4
@@ -29,14 +29,5 @@ explode r
 # Check number of shapes
 renamevar r_2 result
 
-set nb_v_good 3
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 3 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24620 b/tests/bugs/modalg_5/bug24620
index f913998407..47e2733f4a 100755
--- a/tests/bugs/modalg_5/bug24620
+++ b/tests/bugs/modalg_5/bug24620
@@ -18,14 +18,5 @@ bopcheck b1
 
 compound x0 x1 b1 result
 
-set nb_v_good 4
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 2 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24628 b/tests/bugs/modalg_5/bug24628
index a2e0062385..1c09615967 100644
--- a/tests/bugs/modalg_5/bug24628
+++ b/tests/bugs/modalg_5/bug24628
@@ -11,8 +11,7 @@ restore [locate_data_file bug24628_shellcut2.brep] cut
 
 bsection result shell cut
 
-set nb_v_good 15
-set nb_e_good 14
+checknbshapes result -vertex 15 -edge 14
 
 set 2dviewer 1
 
diff --git a/tests/bugs/modalg_5/bug24655 b/tests/bugs/modalg_5/bug24655
index 26b90f53c1..dac11c47af 100644
--- a/tests/bugs/modalg_5/bug24655
+++ b/tests/bugs/modalg_5/bug24655
@@ -15,14 +15,5 @@ bopcommon result
 set square 11.9246
 
 # Analysis of "nbshapes result"
-set nb_v_good 23
-set nb_e_good 34
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 86
-
+checknbshapes result -vertex 23 -edge 34 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 86
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24656 b/tests/bugs/modalg_5/bug24656
index a2ca79d801..0882005ce7 100755
--- a/tests/bugs/modalg_5/bug24656
+++ b/tests/bugs/modalg_5/bug24656
@@ -27,14 +27,5 @@ fixshape result res
 
 set square 337959
 
-set nb_v_good 300
-set nb_e_good 443
-set nb_w_good 171
-set nb_f_good 149
-set nb_sh_good 85
-set nb_sol_good 12
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 1162
-
+checknbshapes result -vertex 300 -edge 443 -wire 171 -face 149 -shell 85 -solid 12 -compsolid 0 -compound 2 -shape 1162
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24667 b/tests/bugs/modalg_5/bug24667
index 1d0b290be8..4d2fe096af 100644
--- a/tests/bugs/modalg_5/bug24667
+++ b/tests/bugs/modalg_5/bug24667
@@ -21,14 +21,5 @@ compound r r_f r_l result
 set length 100
 
 # Analysis of "nbshapes result"
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 5
-
+checknbshapes result -vertex 2 -edge 1 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 5
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24684 b/tests/bugs/modalg_5/bug24684
index ee30114806..f7d73cc0bd 100644
--- a/tests/bugs/modalg_5/bug24684
+++ b/tests/bugs/modalg_5/bug24684
@@ -16,14 +16,5 @@ fixshape result a
 
 set square 337959
 
-set nb_v_good 300
-set nb_e_good 443
-set nb_w_good 171
-set nb_f_good 149
-set nb_sh_good 85
-set nb_sol_good 15
-set nb_compsol_good 0
-set nb_compound_good 3
-set nb_shape_good 1166
-
+checknbshapes result -vertex 300 -edge 443 -wire 171 -face 149 -shell 85 -solid 15 -compsolid 0 -compound 3 -shape 1166
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24731 b/tests/bugs/modalg_5/bug24731
index f9b879ff67..3a1cef5688 100644
--- a/tests/bugs/modalg_5/bug24731
+++ b/tests/bugs/modalg_5/bug24731
@@ -13,14 +13,5 @@ bsection result b l -n2d2
 
 set length 93.2392
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 8
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24738 b/tests/bugs/modalg_5/bug24738
index 4cbda68d28..3dc11317f5 100644
--- a/tests/bugs/modalg_5/bug24738
+++ b/tests/bugs/modalg_5/bug24738
@@ -11,16 +11,7 @@ restore [locate_data_file bug24738_profile.brep] pr
 
 pipe result sp pr
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 set info [sprops result]
 
 set string {Center +of +gravity +:[\t\n]*[\s\t]*X +=[\s\t]*([-0-9.+eE]+)[\t\n]*Y +=[\s\t]*([-0-9.+eE]+)[\t\n]*Z +=[\s\t]*([-0-9.+eE]+)[\t\n]*}
diff --git a/tests/bugs/modalg_5/bug24746 b/tests/bugs/modalg_5/bug24746
index 2db9f01292..cf28975656 100644
--- a/tests/bugs/modalg_5/bug24746
+++ b/tests/bugs/modalg_5/bug24746
@@ -14,18 +14,8 @@ explode c f
 explode c_2 e
 bop c_1 c_2
 bopcommon res1
-nbshapes res1
 bop c_1 c_2_4
 bopcommon result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24764 b/tests/bugs/modalg_5/bug24764
index 939730bda3..79469ec9d7 100755
--- a/tests/bugs/modalg_5/bug24764
+++ b/tests/bugs/modalg_5/bug24764
@@ -13,14 +13,5 @@ restore [locate_data_file bug24764_qa.brep] a
 bopcheck a 4
 compound a x2 x51 x8 x10 x28 x30 x36 x46 x1 x50 result
 
-set nb_v_good 24
-set nb_e_good 24
-set nb_w_good 2
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 53
-
+checknbshapes result -vertex 24 -edge 24 -wire 2 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 2 -shape 53
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24798 b/tests/bugs/modalg_5/bug24798
index 916a5b28e1..f7c8917bdb 100644
--- a/tests/bugs/modalg_5/bug24798
+++ b/tests/bugs/modalg_5/bug24798
@@ -15,14 +15,5 @@ bopcut result
 set square 1826.16
 
 # Analysis of "nbshapes res"
-set nb_v_good 44
-set nb_e_good 67
-set nb_w_good 29
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 165
-
+checknbshapes result -vertex 44 -edge 67 -wire 29 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 165
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24817 b/tests/bugs/modalg_5/bug24817
index ac3242f50a..b6f1e9d48c 100755
--- a/tests/bugs/modalg_5/bug24817
+++ b/tests/bugs/modalg_5/bug24817
@@ -41,42 +41,10 @@ sewing sr1 plane1 plane2 +n
 sewing sr2 plane1 plane2 plane3 +n
 
 #
-set list1 [nbshapes sr1]
-regexp {VERTEX +: +([-0-9.+eE]+)} ${list1} full nb_v1
-regexp {EDGE +: +([-0-9.+eE]+)} ${list1} full nb_e1
-regexp {WIRE +: +([-0-9.+eE]+)} ${list1} full nb_w1
-regexp {FACE +: +([-0-9.+eE]+)} ${list1} full nb_f1
-regexp {SHELL +: +([-0-9.+eE]+)} ${list1} full nb_sh1
-regexp {SOLID +: +([-0-9.+eE]+)} ${list1} full nb_sol1
-regexp {COMPSOLID +: +([-0-9.+eE]+)} ${list1} full nb_compsol1
-regexp {COMPOUND +: +([-0-9.+eE]+)} ${list1} full nb_compound1
-regexp {SHAPE +: +([-0-9.+eE]+)} ${list1} full nb_shape1
+checknbshapes sr1 -vertex 2 -edge 3 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 10
 
 regexp {Mass +: +([-0-9.+eE]+)} [sprops sr1] full square1
-
 set square1_good 3.14159
-set nb_v1_good 2
-set nb_e1_good 3
-set nb_w1_good 2
-set nb_f1_good 2
-set nb_sh1_good 1
-set nb_sol1_good 0
-set nb_compsol1_good 0
-set nb_compound1_good 0
-set nb_shape1_good 10
-
-if { ${nb_v1} != ${nb_v1_good} 
-    || ${nb_e1} != ${nb_e1_good} 
-    || ${nb_w1} != ${nb_w1_good} 
-    || ${nb_f1} != ${nb_f1_good} 
-    || ${nb_sh1} != ${nb_sh1_good} 
-    || ${nb_sol1} != ${nb_sol1_good} 
-    || ${nb_compsol1} != ${nb_compsol1_good} 
-    || ${nb_compound1} != ${nb_compound1_good} 
-    || ${nb_shape1} != ${nb_shape1_good} } {
-    puts "Error 1: Number of shapes is faulty"
-}
-
 if { ${square1} != ${square1_good} } {
    puts "Error 2: Square is not valid"
 }
@@ -88,42 +56,10 @@ fit
 xwd $imagedir/${test_image}_1.png
 
 #
-set list2 [nbshapes sr2]
-regexp {VERTEX +: +([-0-9.+eE]+)} ${list2} full nb_v2
-regexp {EDGE +: +([-0-9.+eE]+)} ${list2} full nb_e2
-regexp {WIRE +: +([-0-9.+eE]+)} ${list2} full nb_w2
-regexp {FACE +: +([-0-9.+eE]+)} ${list2} full nb_f2
-regexp {SHELL +: +([-0-9.+eE]+)} ${list2} full nb_sh2
-regexp {SOLID +: +([-0-9.+eE]+)} ${list2} full nb_sol2
-regexp {COMPSOLID +: +([-0-9.+eE]+)} ${list2} full nb_compsol2
-regexp {COMPOUND +: +([-0-9.+eE]+)} ${list2} full nb_compound2
-regexp {SHAPE +: +([-0-9.+eE]+)} ${list2} full nb_shape2
+checknbshapes sr2 -vertex 2 -edge 4 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 
 regexp {Mass +: +([-0-9.+eE]+)} [sprops sr2] full square2
-
 set square2_good 4.71239
-set nb_v2_good 2
-set nb_e2_good 4
-set nb_w2_good 3
-set nb_f2_good 3
-set nb_sh2_good 1
-set nb_sol2_good 0
-set nb_compsol2_good 0
-set nb_compound2_good 0
-set nb_shape2_good 13
-
-if { ${nb_v2} != ${nb_v2_good} 
-    || ${nb_e2} != ${nb_e2_good} 
-    || ${nb_w2} != ${nb_w2_good} 
-    || ${nb_f2} != ${nb_f2_good} 
-    || ${nb_sh2} != ${nb_sh2_good} 
-    || ${nb_sol2} != ${nb_sol2_good} 
-    || ${nb_compsol2} != ${nb_compsol2_good} 
-    || ${nb_compound2} != ${nb_compound2_good} 
-    || ${nb_shape2} != ${nb_shape2_good} } {
-    puts "Error 3: Number of shapes is faulty"
-}
-
 if { ${square2} != ${square2_good} } {
    puts "Error 4: Square is not valid"
 }
@@ -133,9 +69,7 @@ fit
 xwd $imagedir/${test_image}_2.png
 
 checkmaxtol sr1 -ref 1.0000000015308085e-007
-checknbshapes sr1 -shell 1
 checkfreebounds sr1 2
 
 checkmaxtol sr2 -ref 1.0000000015308085e-007
-checknbshapes sr2 -shell 1
 checkfreebounds sr2 0
diff --git a/tests/bugs/modalg_5/bug24825_common b/tests/bugs/modalg_5/bug24825_common
index 25737d3ddf..507070bf7e 100644
--- a/tests/bugs/modalg_5/bug24825_common
+++ b/tests/bugs/modalg_5/bug24825_common
@@ -45,14 +45,5 @@ bbop result 0
 
 set square 10008.9
 
-set nb_v_good 86
-set nb_e_good 132
-set nb_w_good 126
-set nb_f_good 126
-set nb_sh_good 40
-set nb_sol_good 40
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 551
-
+checknbshapes result -vertex 86 -edge 132 -wire 126 -face 126 -shell 40 -solid 40 -compsolid 0 -compound 1 -shape 551
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24825_cut b/tests/bugs/modalg_5/bug24825_cut
index 014b7c0be0..ec2e5ca2ae 100644
--- a/tests/bugs/modalg_5/bug24825_cut
+++ b/tests/bugs/modalg_5/bug24825_cut
@@ -44,15 +44,5 @@ bfillds
 bbop result 2
 
 set square 142845
-
-set nb_v_good 108
-set nb_e_good 168
-set nb_w_good 152
-set nb_f_good 86
-set nb_sh_good 7
-set nb_sol_good 7
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 529
-
+checknbshapes result -vertex 108 -edge 168 -wire 152 -face 86 -shell 7 -solid 7 -compsolid 0 -compound 1 -shape 529
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24825_fuse b/tests/bugs/modalg_5/bug24825_fuse
index a3f9aad3d7..bc0ef00412 100644
--- a/tests/bugs/modalg_5/bug24825_fuse
+++ b/tests/bugs/modalg_5/bug24825_fuse
@@ -46,14 +46,5 @@ bbop result 1
 
 set square 157211
 
-set nb_v_good 106
-set nb_e_good 164
-set nb_w_good 142
-set nb_f_good 80
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 495
-
+checknbshapes result -vertex 106 -edge 164 -wire 142 -face 80 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 495
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24840 b/tests/bugs/modalg_5/bug24840
index 125cf1bcf6..ca64993b0b 100644
--- a/tests/bugs/modalg_5/bug24840
+++ b/tests/bugs/modalg_5/bug24840
@@ -12,14 +12,5 @@ explode c
 pipe result c_1 c_2 1
 checkshape result
 
-set nb_v_good 56
-set nb_e_good 130
-set nb_w_good 99
-set nb_f_good 99
-set nb_sh_good 24
-set nb_sol_good 24
-set nb_compsol_good 1
-set nb_compound_good 0
-set nb_shape_good 433
-
+checknbshapes result -vertex 56 -edge 130 -wire 99 -face 99 -shell 24 -solid 24 -compsolid 1 -compound 0 -shape 433
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24844 b/tests/bugs/modalg_5/bug24844
index e86cd8d3eb..da42f9e0fa 100644
--- a/tests/bugs/modalg_5/bug24844
+++ b/tests/bugs/modalg_5/bug24844
@@ -13,14 +13,5 @@ bcut result c_1 c_2
 
 set square 9.82018
 
-set nb_v_good 5
-set nb_e_good 11
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 31
-
+checknbshapes result -vertex 5 -edge 11 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 31
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24849_1 b/tests/bugs/modalg_5/bug24849_1
index 39e41792e7..28168b70ee 100644
--- a/tests/bugs/modalg_5/bug24849_1
+++ b/tests/bugs/modalg_5/bug24849_1
@@ -17,14 +17,5 @@ wire ww w_1
 
 pipe result ww f 2
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 31
-
+checknbshapes result -vertex 4 -edge 8 -wire 7 -face 7 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 31
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24849_2 b/tests/bugs/modalg_5/bug24849_2
index c4b91c4961..442d072f82 100644
--- a/tests/bugs/modalg_5/bug24849_2
+++ b/tests/bugs/modalg_5/bug24849_2
@@ -17,14 +17,5 @@ wire ww w_2
 
 pipe result ww f 2
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 31
-
+checknbshapes result -vertex 4 -edge 8 -wire 7 -face 7 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 31
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24851 b/tests/bugs/modalg_5/bug24851
index 546e95ae15..be5cf1d8c4 100644
--- a/tests/bugs/modalg_5/bug24851
+++ b/tests/bugs/modalg_5/bug24851
@@ -14,14 +14,5 @@ bopfuse result
 
 set square 9.56837e-05
 
-set nb_v_good 6
-set nb_e_good 8
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 19
-
+checknbshapes result -vertex 6 -edge 8 -wire 2 -face 2 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 19
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24861 b/tests/bugs/modalg_5/bug24861
index 64044814f7..f09ae715fb 100644
--- a/tests/bugs/modalg_5/bug24861
+++ b/tests/bugs/modalg_5/bug24861
@@ -20,14 +20,5 @@ bbuild result -s
 
 set square 1780.37
 
-set nb_v_good 18
-set nb_e_good 38
-set nb_w_good 32
-set nb_f_good 29
-set nb_sh_good 9
-set nb_sol_good 7
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 134
-
+checknbshapes result -vertex 18 -edge 38 -wire 32 -face 29 -shell 9 -solid 7 -compsolid 0 -compound 1 -shape 134
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24910 b/tests/bugs/modalg_5/bug24910
index 82ebd178a3..32d0ffbca3 100644
--- a/tests/bugs/modalg_5/bug24910
+++ b/tests/bugs/modalg_5/bug24910
@@ -9,12 +9,4 @@ puts ""
 restore [locate_data_file bug24910_Solid_4.brep] a
 offsetshape result a 1
 
-set nb_v_good 46
-set nb_e_good 88
-set nb_w_good 44
-set nb_f_good 44
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 224
+checknbshapes result -vertex 46 -edge 88 -wire 44 -face 44 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 224
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug24914 b/tests/bugs/modalg_5/bug24914
index fd4ff126f6..9461d0b098 100644
--- a/tests/bugs/modalg_5/bug24914
+++ b/tests/bugs/modalg_5/bug24914
@@ -17,14 +17,5 @@ baddobjects b1 b2
 bfillds
 bbuild result
 
-set nb_v_good 14
-set nb_e_good 15
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 34
-
+checknbshapes result -vertex 14 -edge 15 -wire 2 -face 2 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 34
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24939 b/tests/bugs/modalg_5/bug24939
index 1a1cb1ab50..be53e72e6f 100755
--- a/tests/bugs/modalg_5/bug24939
+++ b/tests/bugs/modalg_5/bug24939
@@ -13,14 +13,5 @@ bfuse result c_1 c_2
 
 set square 31.0346
 
-set nb_v_good 70
-set nb_e_good 111
-set nb_w_good 42
-set nb_f_good 42
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 268
-
+checknbshapes result -vertex 70 -edge 111 -wire 42 -face 42 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 268
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24949 b/tests/bugs/modalg_5/bug24949
index da907a0d12..d783f91b83 100644
--- a/tests/bugs/modalg_5/bug24949
+++ b/tests/bugs/modalg_5/bug24949
@@ -18,14 +18,5 @@ pipe result c_1 c_2 2
 
 set square 188.689
 
-set nb_v_good 14
-set nb_e_good 19
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 46
-
+checknbshapes result -vertex 14 -edge 19 -wire 6 -face 6 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 46
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24964 b/tests/bugs/modalg_5/bug24964
index 8a97f6cfbe..568fbe245c 100644
--- a/tests/bugs/modalg_5/bug24964
+++ b/tests/bugs/modalg_5/bug24964
@@ -14,14 +14,5 @@ thrusections result 0 0 w1 w2 w3
 
 set square 163127
 
-set nb_v_good 30
-set nb_e_good 45
-set nb_w_good 15
-set nb_f_good 15
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 106
-
+checknbshapes result -vertex 30 -edge 45 -wire 15 -face 15 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 106
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug24981 b/tests/bugs/modalg_5/bug24981
index 3bfa8f1954..1215eccd89 100644
--- a/tests/bugs/modalg_5/bug24981
+++ b/tests/bugs/modalg_5/bug24981
@@ -20,14 +20,5 @@ baddtools b_1 b_2 b_3 b_4 b_5 b_6 b_7 b_8 b_9 b_10 b_11 b_12 b_13 b_14 b_15 b_16
 bfillds
 bbuild result
 
-set nb_v_good 122
-set nb_e_good 220
-set nb_w_good 243
-set nb_f_good 195
-set nb_sh_good 75
-set nb_sol_good 75
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 931
-
+checknbshapes result -vertex 122 -edge 220 -wire 243 -face 195 -shell 75 -solid 75 -compsolid 0 -compound 1 -shape 931
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25002 b/tests/bugs/modalg_5/bug25002
index 6bf317d812..6034dfac0a 100644
--- a/tests/bugs/modalg_5/bug25002
+++ b/tests/bugs/modalg_5/bug25002
@@ -24,14 +24,5 @@ if { ${nb_alone_Vertices} == 0 } {
 
 set length 67.3503
 
-set nb_v_good 1128
-set nb_e_good 1128
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2257
-
+checknbshapes result -vertex 1128 -edge 1128 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2257
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25106 b/tests/bugs/modalg_5/bug25106
index d7ba97c881..dcd0173ed4 100755
--- a/tests/bugs/modalg_5/bug25106
+++ b/tests/bugs/modalg_5/bug25106
@@ -14,16 +14,7 @@ splitshape result c1_1 c1_1 c1_2
 
 set square 100
 
-set nb_v_good 12
-set nb_e_good 16
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 39
-
+checknbshapes result -vertex 12 -edge 16 -wire 5 -face 5 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 39
 vinit
 vdisplay result
 vsetdispmode 0
diff --git a/tests/bugs/modalg_5/bug25111 b/tests/bugs/modalg_5/bug25111
index beaa9b5ccb..c98850256b 100644
--- a/tests/bugs/modalg_5/bug25111
+++ b/tests/bugs/modalg_5/bug25111
@@ -17,14 +17,5 @@ bopsection result
 
 set length 53.1714
 
-set nb_v_good 4
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 7
-
+checknbshapes result -vertex 4 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 7
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25127 b/tests/bugs/modalg_5/bug25127
index 45801da645..5d6c353286 100755
--- a/tests/bugs/modalg_5/bug25127
+++ b/tests/bugs/modalg_5/bug25127
@@ -25,14 +25,5 @@ checkreal "Volume" ${volume} ${expected_volume} ${tol_abs_volume} ${tol_rel_volu
 
 set square 842.655
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 3
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 20
-
+checknbshapes result -vertex 4 -edge 6 -wire 2 -face 2 -shell 3 -solid 2 -compsolid 0 -compound 1 -shape 20
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25163 b/tests/bugs/modalg_5/bug25163
index d3a27b8353..6fa0cec760 100644
--- a/tests/bugs/modalg_5/bug25163
+++ b/tests/bugs/modalg_5/bug25163
@@ -18,14 +18,5 @@ bopcommon result
 set square 3417.71
 
 # Analysis of "nbshapes result"
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 11
-
+checknbshapes result -vertex 4 -edge 4 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 11
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25191 b/tests/bugs/modalg_5/bug25191
index 684ee71dfa..a314c7b631 100644
--- a/tests/bugs/modalg_5/bug25191
+++ b/tests/bugs/modalg_5/bug25191
@@ -17,14 +17,5 @@ bfillds -s
 bbuild result
 
 # Analysis of "nbshapes result"
-set nb_v_good 5
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 10
-
+checknbshapes result -vertex 5 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25210 b/tests/bugs/modalg_5/bug25210
index 4dd54633c4..cf4a9c0f20 100755
--- a/tests/bugs/modalg_5/bug25210
+++ b/tests/bugs/modalg_5/bug25210
@@ -16,14 +16,5 @@ renamevar res_1 result
 
 set length 41.9674
 
-set nb_v_good 2
-set nb_e_good 2
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 5
-
+checknbshapes result -vertex 2 -edge 2 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 5
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25224 b/tests/bugs/modalg_5/bug25224
index c4ad521ca7..f0cbc8891e 100755
--- a/tests/bugs/modalg_5/bug25224
+++ b/tests/bugs/modalg_5/bug25224
@@ -38,14 +38,5 @@ bbuild result
 
 set square 21.4983
 
-set nb_v_good 10
-set nb_e_good 19
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 62
-
+checknbshapes result -vertex 10 -edge 19 -wire 13 -face 13 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 62
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25225_1 b/tests/bugs/modalg_5/bug25225_1
index 057095e2db..8dc16639ce 100755
--- a/tests/bugs/modalg_5/bug25225_1
+++ b/tests/bugs/modalg_5/bug25225_1
@@ -15,15 +15,7 @@ if [catch { mkoffset resoffset a 1 10} ] {
 
   set length 416.777
 
-  set nb_v_good 7
-  set nb_e_good 7
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 15
+  checknbshapes result -vertex 7 -edge 7 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 15
 }
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25225_2 b/tests/bugs/modalg_5/bug25225_2
index 90605cbb3c..da2d0ca16e 100755
--- a/tests/bugs/modalg_5/bug25225_2
+++ b/tests/bugs/modalg_5/bug25225_2
@@ -15,15 +15,7 @@ if [catch { mkoffset resoffset a 1 -10} ] {
 
   set length 416.777
 
-  set nb_v_good 7
-  set nb_e_good 7
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 15
+  checknbshapes result -vertex 7 -edge 7 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 15
 }
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25225_3 b/tests/bugs/modalg_5/bug25225_3
index 5255be955b..134610afdb 100755
--- a/tests/bugs/modalg_5/bug25225_3
+++ b/tests/bugs/modalg_5/bug25225_3
@@ -15,15 +15,7 @@ if [catch { mkoffset resoffset a 1 -10} ] {
 
   set length 192.023
 
-  set nb_v_good 3
-  set nb_e_good 3
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 7
+  checknbshapes result -vertex 3 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7
 }
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25228 b/tests/bugs/modalg_5/bug25228
index 6a459b77a6..bcd0042472 100755
--- a/tests/bugs/modalg_5/bug25228
+++ b/tests/bugs/modalg_5/bug25228
@@ -21,14 +21,5 @@ bbuild result
 
 set square 227.765
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 8
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_1 b/tests/bugs/modalg_5/bug25232_1
index a897221912..ed3791a067 100644
--- a/tests/bugs/modalg_5/bug25232_1
+++ b/tests/bugs/modalg_5/bug25232_1
@@ -16,14 +16,5 @@ mkvolume result b1 f b2_1
 
 set square 1228.32
 
-set nb_v_good 20
-set nb_e_good 21
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 3
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 61
-
+checknbshapes result -vertex 20 -edge 21 -wire 7 -face 7 -shell 3 -solid 2 -compsolid 0 -compound 1 -shape 61
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_10 b/tests/bugs/modalg_5/bug25232_10
index 2cc04c1104..0bd4826fc8 100644
--- a/tests/bugs/modalg_5/bug25232_10
+++ b/tests/bugs/modalg_5/bug25232_10
@@ -13,14 +13,5 @@ mkvolume result b_1 b_2 b_3
 
 set square 5.46979e+06
 
-set nb_v_good 5
-set nb_e_good 7
-set nb_w_good 7
-set nb_f_good 5
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 31
-
+checknbshapes result -vertex 5 -edge 7 -wire 7 -face 5 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 31
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_11 b/tests/bugs/modalg_5/bug25232_11
index 994fe974a2..2f30c1243e 100644
--- a/tests/bugs/modalg_5/bug25232_11
+++ b/tests/bugs/modalg_5/bug25232_11
@@ -13,14 +13,5 @@ mkvolume result b_1 b_2 b_3 b_4 b_5
 
 set square 1.5988e+07
 
-set nb_v_good 23
-set nb_e_good 54
-set nb_w_good 44
-set nb_f_good 44
-set nb_sh_good 16
-set nb_sol_good 16
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 198
-
+checknbshapes result -vertex 23 -edge 54 -wire 44 -face 44 -shell 16 -solid 16 -compsolid 0 -compound 1 -shape 198
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_12 b/tests/bugs/modalg_5/bug25232_12
index 601b2fd9db..f9fcb70dc6 100644
--- a/tests/bugs/modalg_5/bug25232_12
+++ b/tests/bugs/modalg_5/bug25232_12
@@ -13,14 +13,5 @@ mkvolume result b_3 b_4 b_2 b_5 -s
 
 set square 1.41057e+07
 
-set nb_v_good 12
-set nb_e_good 25
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 8
-set nb_sol_good 8
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 90
-
+checknbshapes result -vertex 12 -edge 25 -wire 18 -face 18 -shell 8 -solid 8 -compsolid 0 -compound 1 -shape 90
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_2 b/tests/bugs/modalg_5/bug25232_2
index f662c94ff7..cfa88b425f 100644
--- a/tests/bugs/modalg_5/bug25232_2
+++ b/tests/bugs/modalg_5/bug25232_2
@@ -15,14 +15,5 @@ mkvolume result b1_1 b1_2 b1_3 b1_4 b1_5 b1_6 b2_1 b2_2 b2_3 b2_4 b2_5 b2_6 -ni
 
 set square 600
 
-set nb_v_good 16
-set nb_e_good 24
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 16 -edge 24 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_3 b/tests/bugs/modalg_5/bug25232_3
index 687b7afb4b..f93a3ba464 100644
--- a/tests/bugs/modalg_5/bug25232_3
+++ b/tests/bugs/modalg_5/bug25232_3
@@ -15,14 +15,5 @@ mkvolume result b1 b2 b3 -ni
 
 set square 826.195
 
-set nb_v_good 11
-set nb_e_good 15
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 3
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 46
-
+checknbshapes result -vertex 11 -edge 15 -wire 7 -face 7 -shell 3 -solid 2 -compsolid 0 -compound 1 -shape 46
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_4 b/tests/bugs/modalg_5/bug25232_4
index 73901be246..0e986a40af 100644
--- a/tests/bugs/modalg_5/bug25232_4
+++ b/tests/bugs/modalg_5/bug25232_4
@@ -24,14 +24,5 @@ mkvolume result fcyl fcon1 fcon2 fp fsph
 
 set square 6725.11
 
-set nb_v_good 12
-set nb_e_good 26
-set nb_w_good 14
-set nb_f_good 14
-set nb_sh_good 7
-set nb_sol_good 7
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 81
-
+checknbshapes result -vertex 12 -edge 26 -wire 14 -face 14 -shell 7 -solid 7 -compsolid 0 -compound 1 -shape 81
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_5 b/tests/bugs/modalg_5/bug25232_5
index 5a34fa51b3..659bf2010c 100644
--- a/tests/bugs/modalg_5/bug25232_5
+++ b/tests/bugs/modalg_5/bug25232_5
@@ -24,14 +24,5 @@ mkvolume result fcyl fsph
 
 set square 3476.67
 
-set nb_v_good 4
-set nb_e_good 8
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 25
-
+checknbshapes result -vertex 4 -edge 8 -wire 4 -face 4 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 25
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_6 b/tests/bugs/modalg_5/bug25232_6
index 0c01870893..e11c6010bb 100644
--- a/tests/bugs/modalg_5/bug25232_6
+++ b/tests/bugs/modalg_5/bug25232_6
@@ -24,14 +24,5 @@ mkvolume result fsph fcon1
 
 set square 2449.33
 
-set nb_v_good 4
-set nb_e_good 7
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 22
-
+checknbshapes result -vertex 4 -edge 7 -wire 3 -face 3 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 22
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_7 b/tests/bugs/modalg_5/bug25232_7
index a1504b42ab..a007d2e9ab 100644
--- a/tests/bugs/modalg_5/bug25232_7
+++ b/tests/bugs/modalg_5/bug25232_7
@@ -22,14 +22,5 @@ mkface fsph sph
 mkvolume result fcyl fp
 # 0 solids
 
-set nb_v_good 0
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 1
-
+checknbshapes result -vertex 0 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 1
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_8 b/tests/bugs/modalg_5/bug25232_8
index 1398966532..57c7b314a0 100644
--- a/tests/bugs/modalg_5/bug25232_8
+++ b/tests/bugs/modalg_5/bug25232_8
@@ -26,14 +26,5 @@ mkvolume result fcon3 fp
 
 set square 1706.51
 
-set nb_v_good 4
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 15
-
+checknbshapes result -vertex 4 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 15
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25232_9 b/tests/bugs/modalg_5/bug25232_9
index 1a147446c4..6d92a96c7a 100644
--- a/tests/bugs/modalg_5/bug25232_9
+++ b/tests/bugs/modalg_5/bug25232_9
@@ -23,14 +23,5 @@ mkvolume result b1 b2 b3 f
 
 set square 50513.3
 
-set nb_v_good 11037
-set nb_e_good 31880
-set nb_w_good 30668
-set nb_f_good 30668
-set nb_sh_good 9832
-set nb_sol_good 9832
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 123918
-
+checknbshapes result -vertex 11037 -edge 31880 -wire 30668 -face 30668 -shell 9832 -solid 9832 -compsolid 0 -compound 1 -shape 123918
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25237 b/tests/bugs/modalg_5/bug25237
index 818f581b19..cf5919178b 100644
--- a/tests/bugs/modalg_5/bug25237
+++ b/tests/bugs/modalg_5/bug25237
@@ -12,12 +12,4 @@ restore [locate_data_file bug25237_b5.brep] e2
 bop e1 e2
 bopcommon result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 4
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
diff --git a/tests/bugs/modalg_5/bug25242 b/tests/bugs/modalg_5/bug25242
index 2ad7afcc92..18fa3f3ae9 100644
--- a/tests/bugs/modalg_5/bug25242
+++ b/tests/bugs/modalg_5/bug25242
@@ -12,12 +12,4 @@ box b 20 0 0 10 10 10
 bfuse r0 a b
 bcut result r0 a
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 35
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 35
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug25245_1 b/tests/bugs/modalg_5/bug25245_1
index 89b1b50a46..755b733d61 100755
--- a/tests/bugs/modalg_5/bug25245_1
+++ b/tests/bugs/modalg_5/bug25245_1
@@ -41,16 +41,6 @@ bbuild result
 
 set square 11598.4
 
-set nbsh_t 1
-
-set nb_v_good 34
-set nb_e_good 80
-set nb_w_good 57
-set nb_f_good 56
-set nb_sh_good 14
-set nb_sol_good 14
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 256
+checknbshapes result -t -vertex 34 -edge 80 -wire 57 -face 56 -shell 14 -solid 14 -compsolid 0 -compound 1 -shape 256
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25263 b/tests/bugs/modalg_5/bug25263
index de01c71d1b..62d25e099b 100644
--- a/tests/bugs/modalg_5/bug25263
+++ b/tests/bugs/modalg_5/bug25263
@@ -15,14 +15,5 @@ bopcut result
 set square 3.76991
 
 # Analysis of "nbshapes res"
-set nb_v_good 3
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 10
-
+checknbshapes result -vertex 3 -edge 4 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25285 b/tests/bugs/modalg_5/bug25285
index a74e0fa17f..6cc9887f4e 100755
--- a/tests/bugs/modalg_5/bug25285
+++ b/tests/bugs/modalg_5/bug25285
@@ -21,14 +21,5 @@ bbuild result
 
 set square 8.83493
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 11
-
+checknbshapes result -vertex 4 -edge 4 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 11
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25292_13 b/tests/bugs/modalg_5/bug25292_13
index 823e87c3fc..48c1ec77a6 100644
--- a/tests/bugs/modalg_5/bug25292_13
+++ b/tests/bugs/modalg_5/bug25292_13
@@ -23,14 +23,5 @@ bbuild result
 
 set square 289.348
 
-set nb_v_good 9
-set nb_e_good 15
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 51
-
+checknbshapes result -vertex 9 -edge 15 -wire 10 -face 10 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 51
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25292_14 b/tests/bugs/modalg_5/bug25292_14
index ad96d3bf41..07ba5a1638 100644
--- a/tests/bugs/modalg_5/bug25292_14
+++ b/tests/bugs/modalg_5/bug25292_14
@@ -23,14 +23,5 @@ bbuild result
 
 set square 289.348
 
-set nb_v_good 9
-set nb_e_good 15
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 51
-
+checknbshapes result -vertex 9 -edge 15 -wire 10 -face 10 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 51
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25292_23 b/tests/bugs/modalg_5/bug25292_23
index 935340c2a7..b1b51d2755 100644
--- a/tests/bugs/modalg_5/bug25292_23
+++ b/tests/bugs/modalg_5/bug25292_23
@@ -24,14 +24,5 @@ bbuild result
 #These values must be equal to the analogical values in bug25292_23 and bug25292_24 of "bugs modalg_5" testgrid. 
 set square 31.6797
 
-set nb_v_good 10
-set nb_e_good 19
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 62
-
+checknbshapes result -vertex 10 -edge 19 -wire 13 -face 13 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 62
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25292_24 b/tests/bugs/modalg_5/bug25292_24
index 69ba43e8af..f246e32891 100644
--- a/tests/bugs/modalg_5/bug25292_24
+++ b/tests/bugs/modalg_5/bug25292_24
@@ -24,14 +24,5 @@ bbuild result
 #These values must be equal to the analogical values in bug25292_23 and bug25292_24 of "bugs modalg_5" testgrid. 
 set square 31.6797
 
-set nb_v_good 10
-set nb_e_good 19
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 62
-
+checknbshapes result -vertex 10 -edge 19 -wire 13 -face 13 -shell 3 -solid 3 -compsolid 0 -compound 1 -shape 62
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25298_01 b/tests/bugs/modalg_5/bug25298_01
index 9605b8fddb..e103cc6cde 100755
--- a/tests/bugs/modalg_5/bug25298_01
+++ b/tests/bugs/modalg_5/bug25298_01
@@ -19,16 +19,7 @@ if [catch { openoffset resoffset a 1 10 i } ] {
 
   set length 193.986
 
-  set nb_v_good 4
-  set nb_e_good 3
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 8
-
+  checknbshapes result -vertex 4 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_02 b/tests/bugs/modalg_5/bug25298_02
index 703805d39d..eda8d91452 100755
--- a/tests/bugs/modalg_5/bug25298_02
+++ b/tests/bugs/modalg_5/bug25298_02
@@ -19,16 +19,7 @@ if [catch { openoffset resoffset a 1 -10 i } ] {
 
   set length 159.96
 
-  set nb_v_good 3
-  set nb_e_good 2
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 6
-
+  checknbshapes result -vertex 3 -edge 2 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 6
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_03 b/tests/bugs/modalg_5/bug25298_03
index 326c06a41a..34f336c9a0 100755
--- a/tests/bugs/modalg_5/bug25298_03
+++ b/tests/bugs/modalg_5/bug25298_03
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset a 1 10 i } ] {
 
   set length 416.777
 
-  set nb_v_good 7
-  set nb_e_good 7
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 15
-
+  checknbshapes result -vertex 7 -edge 7 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 15
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_04 b/tests/bugs/modalg_5/bug25298_04
index 41cc81573b..b9ed0aa083 100755
--- a/tests/bugs/modalg_5/bug25298_04
+++ b/tests/bugs/modalg_5/bug25298_04
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset a 1 -10 i } ] {
 
   set length 192.023
 
-  set nb_v_good 3
-  set nb_e_good 3
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 7
-
+  checknbshapes result -vertex 3 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_05 b/tests/bugs/modalg_5/bug25298_05
index aa0951016e..0c87fc82c7 100755
--- a/tests/bugs/modalg_5/bug25298_05
+++ b/tests/bugs/modalg_5/bug25298_05
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset a 1 10 i } ] {
 
   set length 403.249
 
-  set nb_v_good 4
-  set nb_e_good 4
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 9
-
+  checknbshapes result -vertex 4 -edge 4 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 9
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_06 b/tests/bugs/modalg_5/bug25298_06
index f1cc3639be..6abec1cf1b 100755
--- a/tests/bugs/modalg_5/bug25298_06
+++ b/tests/bugs/modalg_5/bug25298_06
@@ -23,16 +23,7 @@ if [catch { mkoffset resoffset ww 1 2. i } ] {
 
   set length 49.1327
 
-  set nb_v_good 5
-  set nb_e_good 5
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 11
-
+  checknbshapes result -vertex 5 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 11
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_07 b/tests/bugs/modalg_5/bug25298_07
index d9a2cd1ffc..0b3a03ffeb 100755
--- a/tests/bugs/modalg_5/bug25298_07
+++ b/tests/bugs/modalg_5/bug25298_07
@@ -23,16 +23,7 @@ if [catch { mkoffset resoffset ww 1 -0.2 i } ] {
 
   set length 24.2333
 
-  set nb_v_good 3
-  set nb_e_good 3
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 7
-
+  checknbshapes result -vertex 3 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_08 b/tests/bugs/modalg_5/bug25298_08
index 443f4b9415..ee1f47c336 100755
--- a/tests/bugs/modalg_5/bug25298_08
+++ b/tests/bugs/modalg_5/bug25298_08
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset pp 1 1. i } ] {
 
   set length 58
 
-  set nb_v_good 8
-  set nb_e_good 8
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 17
-
+  checknbshapes result -vertex 8 -edge 8 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 17
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_09 b/tests/bugs/modalg_5/bug25298_09
index a94e40277a..39812c2dfe 100755
--- a/tests/bugs/modalg_5/bug25298_09
+++ b/tests/bugs/modalg_5/bug25298_09
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset pp 1 -1. i } ] {
 
   set length 39.5
 
-  set nb_v_good 6
-  set nb_e_good 7
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 14
-
+  checknbshapes result -vertex 6 -edge 7 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 14
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_10 b/tests/bugs/modalg_5/bug25298_10
index 472a149eae..8458fd5fa2 100755
--- a/tests/bugs/modalg_5/bug25298_10
+++ b/tests/bugs/modalg_5/bug25298_10
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset pp 1 -0.2 i } ] {
 
   set length 48.4
 
-  set nb_v_good 8
-  set nb_e_good 8
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 17
-
+  checknbshapes result -vertex 8 -edge 8 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 17
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_11 b/tests/bugs/modalg_5/bug25298_11
index dfba6165b1..e160e376c4 100755
--- a/tests/bugs/modalg_5/bug25298_11
+++ b/tests/bugs/modalg_5/bug25298_11
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset pp 1 -2. i } ] {
 
   set length 24
 
-  set nb_v_good 5
-  set nb_e_good 5
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 11
-
+  checknbshapes result -vertex 5 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 11
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_12 b/tests/bugs/modalg_5/bug25298_12
index 934b10a363..e85af1eff8 100755
--- a/tests/bugs/modalg_5/bug25298_12
+++ b/tests/bugs/modalg_5/bug25298_12
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset a 1 0.5 i } ] {
 
   set length 92.9473
 
-  set nb_v_good 5
-  set nb_e_good 5
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 11
-
+  checknbshapes result -vertex 5 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 11
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_13 b/tests/bugs/modalg_5/bug25298_13
index 8a502f0e97..b96987ee75 100755
--- a/tests/bugs/modalg_5/bug25298_13
+++ b/tests/bugs/modalg_5/bug25298_13
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset a 1 -0.2 i } ] {
 
   set length 77.093
 
-  set nb_v_good 5
-  set nb_e_good 5
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 11
-
+  checknbshapes result -vertex 5 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 11
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_14 b/tests/bugs/modalg_5/bug25298_14
index b0f32e5584..1e2bf9a553 100755
--- a/tests/bugs/modalg_5/bug25298_14
+++ b/tests/bugs/modalg_5/bug25298_14
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset a 1 -2.5 i } ] {
 
   set length 10
 
-  set nb_v_good 6
-  set nb_e_good 6
-  set nb_w_good 2
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 1
-  set nb_shape_good 15
-
+  checknbshapes result -vertex 6 -edge 6 -wire 2 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 15
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_15 b/tests/bugs/modalg_5/bug25298_15
index 9bf89e7b14..6ced91800b 100755
--- a/tests/bugs/modalg_5/bug25298_15
+++ b/tests/bugs/modalg_5/bug25298_15
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset a 1 5. i } ] {
 
   set length 484.978
 
-  set nb_v_good 7
-  set nb_e_good 7
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 15
-
+  checknbshapes result -vertex 7 -edge 7 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 15
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25298_16 b/tests/bugs/modalg_5/bug25298_16
index 881a45f3b9..cb171ec7c7 100755
--- a/tests/bugs/modalg_5/bug25298_16
+++ b/tests/bugs/modalg_5/bug25298_16
@@ -19,16 +19,7 @@ if [catch { mkoffset resoffset a 1 -5. i } ] {
 
   set length 409.27
 
-  set nb_v_good 7
-  set nb_e_good 7
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 15
-
+  checknbshapes result -vertex 7 -edge 7 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 15
   display result
   fit
 }
diff --git a/tests/bugs/modalg_5/bug25319_1 b/tests/bugs/modalg_5/bug25319_1
index f21242dff3..31448b0af1 100644
--- a/tests/bugs/modalg_5/bug25319_1
+++ b/tests/bugs/modalg_5/bug25319_1
@@ -15,14 +15,5 @@ bcommon result b1 b2
 
 set square 1690.81
 
-set nb_v_good 19
-set nb_e_good 30
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 78
-
+checknbshapes result -vertex 19 -edge 30 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 78
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25319_2 b/tests/bugs/modalg_5/bug25319_2
index 6aa7ecd2c5..60dc3fd113 100644
--- a/tests/bugs/modalg_5/bug25319_2
+++ b/tests/bugs/modalg_5/bug25319_2
@@ -18,14 +18,5 @@ bcommon result b1 b2
 
 set square 1690.81
 
-set nb_v_good 19
-set nb_e_good 30
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 78
-
+checknbshapes result -vertex 19 -edge 30 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 78
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25334_1 b/tests/bugs/modalg_5/bug25334_1
index 4cc20ca67a..30bf12c81b 100644
--- a/tests/bugs/modalg_5/bug25334_1
+++ b/tests/bugs/modalg_5/bug25334_1
@@ -22,14 +22,5 @@ fit
 
 set length 613.39
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 4
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_10 b/tests/bugs/modalg_5/bug25334_10
index 4c515204b2..322301e564 100644
--- a/tests/bugs/modalg_5/bug25334_10
+++ b/tests/bugs/modalg_5/bug25334_10
@@ -22,14 +22,5 @@ fit
 
 set length 548.106
 
-set nb_v_good 5
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 10
-
+checknbshapes result -vertex 5 -edge 4 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 10
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_11 b/tests/bugs/modalg_5/bug25334_11
index 0bcfcf59a3..a56a6057a4 100644
--- a/tests/bugs/modalg_5/bug25334_11
+++ b/tests/bugs/modalg_5/bug25334_11
@@ -22,14 +22,5 @@ fit
 
 set length 846.702
 
-set nb_v_good 5
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 10
-
+checknbshapes result -vertex 5 -edge 4 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 10
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_12 b/tests/bugs/modalg_5/bug25334_12
index f17d8a227b..c91737820d 100644
--- a/tests/bugs/modalg_5/bug25334_12
+++ b/tests/bugs/modalg_5/bug25334_12
@@ -22,14 +22,5 @@ fit
 
 set length 768.339
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_13 b/tests/bugs/modalg_5/bug25334_13
index ac57bd70a1..92698bd96f 100644
--- a/tests/bugs/modalg_5/bug25334_13
+++ b/tests/bugs/modalg_5/bug25334_13
@@ -22,14 +22,5 @@ fit
 
 set length 1216.59
 
-set nb_v_good 6
-set nb_e_good 5
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 12
-
+checknbshapes result -vertex 6 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 12
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_14 b/tests/bugs/modalg_5/bug25334_14
index 1c125b31d8..53551f2383 100644
--- a/tests/bugs/modalg_5/bug25334_14
+++ b/tests/bugs/modalg_5/bug25334_14
@@ -22,14 +22,5 @@ fit
 
 set length 1132.6
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_15 b/tests/bugs/modalg_5/bug25334_15
index 2a0d0debfd..6803b74be1 100644
--- a/tests/bugs/modalg_5/bug25334_15
+++ b/tests/bugs/modalg_5/bug25334_15
@@ -22,14 +22,5 @@ fit
 
 set length 1042.35
 
-set nb_v_good 6
-set nb_e_good 5
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 12
-
+checknbshapes result -vertex 6 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 12
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_16 b/tests/bugs/modalg_5/bug25334_16
index 098eb6d7d4..eb7921bfe3 100644
--- a/tests/bugs/modalg_5/bug25334_16
+++ b/tests/bugs/modalg_5/bug25334_16
@@ -22,14 +22,5 @@ fit
 
 set length 937.174
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_17 b/tests/bugs/modalg_5/bug25334_17
index 2ff5437431..d6ef623375 100644
--- a/tests/bugs/modalg_5/bug25334_17
+++ b/tests/bugs/modalg_5/bug25334_17
@@ -22,14 +22,5 @@ fit
 
 set length 1211.6
 
-set nb_v_good 6
-set nb_e_good 5
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 12
-
+checknbshapes result -vertex 6 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 12
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_18 b/tests/bugs/modalg_5/bug25334_18
index fe089d9757..a94c15198a 100644
--- a/tests/bugs/modalg_5/bug25334_18
+++ b/tests/bugs/modalg_5/bug25334_18
@@ -22,14 +22,5 @@ fit
 
 set length 1143.61
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_19 b/tests/bugs/modalg_5/bug25334_19
index 8a928055d9..19d95df42f 100644
--- a/tests/bugs/modalg_5/bug25334_19
+++ b/tests/bugs/modalg_5/bug25334_19
@@ -22,14 +22,5 @@ fit
 
 set length 752.799
 
-set nb_v_good 6
-set nb_e_good 5
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 12
-
+checknbshapes result -vertex 6 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 12
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_2 b/tests/bugs/modalg_5/bug25334_2
index 7361dfa7a1..140e157d38 100644
--- a/tests/bugs/modalg_5/bug25334_2
+++ b/tests/bugs/modalg_5/bug25334_2
@@ -22,14 +22,5 @@ fit
 
 set length 644.509
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 4
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_20 b/tests/bugs/modalg_5/bug25334_20
index 9cce2340f6..e88497a8fb 100644
--- a/tests/bugs/modalg_5/bug25334_20
+++ b/tests/bugs/modalg_5/bug25334_20
@@ -22,14 +22,5 @@ fit
 
 set length 705.994
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_3 b/tests/bugs/modalg_5/bug25334_3
index bf8a152d16..7b875f4142 100644
--- a/tests/bugs/modalg_5/bug25334_3
+++ b/tests/bugs/modalg_5/bug25334_3
@@ -22,14 +22,5 @@ fit
 
 set length 354.958
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 4
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_4 b/tests/bugs/modalg_5/bug25334_4
index 5430c645d4..10341603d5 100644
--- a/tests/bugs/modalg_5/bug25334_4
+++ b/tests/bugs/modalg_5/bug25334_4
@@ -22,14 +22,5 @@ fit
 
 set length 386.077
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 4
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_5 b/tests/bugs/modalg_5/bug25334_5
index 78c1301c64..7e668358da 100644
--- a/tests/bugs/modalg_5/bug25334_5
+++ b/tests/bugs/modalg_5/bug25334_5
@@ -22,14 +22,5 @@ fit
 
 set length 840.157
 
-set nb_v_good 5
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 10
-
+checknbshapes result -vertex 5 -edge 4 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 10
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_6 b/tests/bugs/modalg_5/bug25334_6
index 81784f948c..55bba2689e 100644
--- a/tests/bugs/modalg_5/bug25334_6
+++ b/tests/bugs/modalg_5/bug25334_6
@@ -22,14 +22,5 @@ fit
 
 set length 782.224
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_7 b/tests/bugs/modalg_5/bug25334_7
index 052bdb7d3c..be8051942d 100644
--- a/tests/bugs/modalg_5/bug25334_7
+++ b/tests/bugs/modalg_5/bug25334_7
@@ -22,14 +22,5 @@ fit
 
 set length 559.65
 
-set nb_v_good 5
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 10
-
+checknbshapes result -vertex 5 -edge 4 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 10
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_8 b/tests/bugs/modalg_5/bug25334_8
index 3922c68ed4..81d2b20eb0 100644
--- a/tests/bugs/modalg_5/bug25334_8
+++ b/tests/bugs/modalg_5/bug25334_8
@@ -22,14 +22,5 @@ fit
 
 set length 533.593
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25334_9 b/tests/bugs/modalg_5/bug25334_9
index ad993a8087..f10adc8ced 100644
--- a/tests/bugs/modalg_5/bug25334_9
+++ b/tests/bugs/modalg_5/bug25334_9
@@ -22,14 +22,5 @@ fit
 
 set length 558.479
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 8
-
+checknbshapes result -vertex 4 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25337_1 b/tests/bugs/modalg_5/bug25337_1
index 6ff3f9c5e0..a901cbd6cd 100644
--- a/tests/bugs/modalg_5/bug25337_1
+++ b/tests/bugs/modalg_5/bug25337_1
@@ -20,14 +20,5 @@ bopfuse result
 
 set square 582.987
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 17
-
+checknbshapes result -vertex 4 -edge 6 -wire 3 -face 3 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 17
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25337_2 b/tests/bugs/modalg_5/bug25337_2
index 36be0fd872..50bc693f55 100644
--- a/tests/bugs/modalg_5/bug25337_2
+++ b/tests/bugs/modalg_5/bug25337_2
@@ -20,15 +20,6 @@ bopcommon result
 
 set square 45.3312
 
-set nb_v_good 3
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 9
-
+checknbshapes result -vertex 3 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9
 set 2dviewer 1
 
diff --git a/tests/bugs/modalg_5/bug25346_1 b/tests/bugs/modalg_5/bug25346_1
index fde4f83c8c..66a03ae05b 100644
--- a/tests/bugs/modalg_5/bug25346_1
+++ b/tests/bugs/modalg_5/bug25346_1
@@ -18,7 +18,6 @@ bbuild result
 
 set square 470659
 
-# Analysis of "nbshapes res"
-set nb_sol_good 3
+checknbshapes result -solid 3
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_01 b/tests/bugs/modalg_5/bug25354_01
index 91604aac8a..464205a5b0 100644
--- a/tests/bugs/modalg_5/bug25354_01
+++ b/tests/bugs/modalg_5/bug25354_01
@@ -14,14 +14,5 @@ restore [locate_data_file bug25354_e2.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_02 b/tests/bugs/modalg_5/bug25354_02
index 15c77b84fc..99dc00fca8 100644
--- a/tests/bugs/modalg_5/bug25354_02
+++ b/tests/bugs/modalg_5/bug25354_02
@@ -15,14 +15,5 @@ ttranslate b2 4 0 0
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_03 b/tests/bugs/modalg_5/bug25354_03
index f67696166b..cb94a44246 100644
--- a/tests/bugs/modalg_5/bug25354_03
+++ b/tests/bugs/modalg_5/bug25354_03
@@ -15,14 +15,5 @@ ttranslate b2 4 0 -4
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_04 b/tests/bugs/modalg_5/bug25354_04
index 1466b0e9d9..ab527a97d5 100644
--- a/tests/bugs/modalg_5/bug25354_04
+++ b/tests/bugs/modalg_5/bug25354_04
@@ -18,14 +18,5 @@ bopsection result
 
 set length 6
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_05 b/tests/bugs/modalg_5/bug25354_05
index ff6d85772e..0c234aeae2 100644
--- a/tests/bugs/modalg_5/bug25354_05
+++ b/tests/bugs/modalg_5/bug25354_05
@@ -14,14 +14,5 @@ restore [locate_data_file bug25354_f1.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_06 b/tests/bugs/modalg_5/bug25354_06
index b11b09ca22..1dabca2c2a 100644
--- a/tests/bugs/modalg_5/bug25354_06
+++ b/tests/bugs/modalg_5/bug25354_06
@@ -16,14 +16,5 @@ ttranslate b1 0 4 0
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_07 b/tests/bugs/modalg_5/bug25354_07
index c457c04ae1..97435ca417 100644
--- a/tests/bugs/modalg_5/bug25354_07
+++ b/tests/bugs/modalg_5/bug25354_07
@@ -16,14 +16,5 @@ ttranslate b1 0 4 -4
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_08 b/tests/bugs/modalg_5/bug25354_08
index 8a6984a089..e656ddcc12 100644
--- a/tests/bugs/modalg_5/bug25354_08
+++ b/tests/bugs/modalg_5/bug25354_08
@@ -16,14 +16,5 @@ ttranslate b1 4 4 -4
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_09 b/tests/bugs/modalg_5/bug25354_09
index 717ce29161..7535bb9eaa 100644
--- a/tests/bugs/modalg_5/bug25354_09
+++ b/tests/bugs/modalg_5/bug25354_09
@@ -16,14 +16,5 @@ ttranslate b1 4 4 0
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_10 b/tests/bugs/modalg_5/bug25354_10
index f3f51e2d7e..be641f7d16 100644
--- a/tests/bugs/modalg_5/bug25354_10
+++ b/tests/bugs/modalg_5/bug25354_10
@@ -18,14 +18,5 @@ bopsection result
 
 set length 8
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_11 b/tests/bugs/modalg_5/bug25354_11
index 664bda2c0d..fa1e4c283a 100644
--- a/tests/bugs/modalg_5/bug25354_11
+++ b/tests/bugs/modalg_5/bug25354_11
@@ -18,14 +18,5 @@ bopsection result
 
 set length 8
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_12 b/tests/bugs/modalg_5/bug25354_12
index 715a44af60..49421b2589 100644
--- a/tests/bugs/modalg_5/bug25354_12
+++ b/tests/bugs/modalg_5/bug25354_12
@@ -16,14 +16,5 @@ ttranslate b2 10 10 0
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_13 b/tests/bugs/modalg_5/bug25354_13
index 71443453fe..ca199b62de 100644
--- a/tests/bugs/modalg_5/bug25354_13
+++ b/tests/bugs/modalg_5/bug25354_13
@@ -18,14 +18,5 @@ bopsection result
 
 set length 6
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_14 b/tests/bugs/modalg_5/bug25354_14
index 037906a523..ac686dd746 100644
--- a/tests/bugs/modalg_5/bug25354_14
+++ b/tests/bugs/modalg_5/bug25354_14
@@ -18,14 +18,5 @@ bopsection result
 
 set length 26
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 9
-
+checknbshapes result -vertex 4 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_15 b/tests/bugs/modalg_5/bug25354_15
index b52413b4ee..198ff70143 100644
--- a/tests/bugs/modalg_5/bug25354_15
+++ b/tests/bugs/modalg_5/bug25354_15
@@ -16,14 +16,5 @@ ttranslate b2 -10 4  0
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_16 b/tests/bugs/modalg_5/bug25354_16
index 1d34896b82..c62bf15e73 100644
--- a/tests/bugs/modalg_5/bug25354_16
+++ b/tests/bugs/modalg_5/bug25354_16
@@ -18,14 +18,5 @@ bopsection result
 
 set length 4
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_17 b/tests/bugs/modalg_5/bug25354_17
index b102f9f14b..da12e2b926 100644
--- a/tests/bugs/modalg_5/bug25354_17
+++ b/tests/bugs/modalg_5/bug25354_17
@@ -18,14 +18,5 @@ bopsection result
 
 set length 4
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_18 b/tests/bugs/modalg_5/bug25354_18
index 191334dbe1..046f6b9142 100644
--- a/tests/bugs/modalg_5/bug25354_18
+++ b/tests/bugs/modalg_5/bug25354_18
@@ -18,14 +18,5 @@ bopsection result
 
 set length 4
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_19 b/tests/bugs/modalg_5/bug25354_19
index 56bab29ed1..dbdf1cd676 100644
--- a/tests/bugs/modalg_5/bug25354_19
+++ b/tests/bugs/modalg_5/bug25354_19
@@ -16,14 +16,5 @@ ttranslate b1 -10 0 10
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_20 b/tests/bugs/modalg_5/bug25354_20
index 5efaea3cd2..3184116228 100644
--- a/tests/bugs/modalg_5/bug25354_20
+++ b/tests/bugs/modalg_5/bug25354_20
@@ -16,14 +16,5 @@ ttranslate b1 4 0 0
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_21 b/tests/bugs/modalg_5/bug25354_21
index dc22ebf724..b56265a7d0 100644
--- a/tests/bugs/modalg_5/bug25354_21
+++ b/tests/bugs/modalg_5/bug25354_21
@@ -16,14 +16,5 @@ ttranslate b1 -10 3 0
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_22 b/tests/bugs/modalg_5/bug25354_22
index f77a121674..b6d1440b16 100644
--- a/tests/bugs/modalg_5/bug25354_22
+++ b/tests/bugs/modalg_5/bug25354_22
@@ -16,14 +16,5 @@ ttranslate b1 -10 3 4
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_23 b/tests/bugs/modalg_5/bug25354_23
index fa59d78b3f..1cee2ef984 100644
--- a/tests/bugs/modalg_5/bug25354_23
+++ b/tests/bugs/modalg_5/bug25354_23
@@ -16,14 +16,5 @@ ttranslate b1 -6 3 4
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_24 b/tests/bugs/modalg_5/bug25354_24
index 15be7be442..6fc7ebb161 100644
--- a/tests/bugs/modalg_5/bug25354_24
+++ b/tests/bugs/modalg_5/bug25354_24
@@ -16,14 +16,5 @@ ttranslate b1 -6 0 4
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_25 b/tests/bugs/modalg_5/bug25354_25
index 6d54a2d225..9921537e7d 100644
--- a/tests/bugs/modalg_5/bug25354_25
+++ b/tests/bugs/modalg_5/bug25354_25
@@ -16,14 +16,5 @@ ttranslate b1 -10 -10 0
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_26 b/tests/bugs/modalg_5/bug25354_26
index 1e44795c04..ec7d8d4150 100644
--- a/tests/bugs/modalg_5/bug25354_26
+++ b/tests/bugs/modalg_5/bug25354_26
@@ -17,14 +17,5 @@ box b2 10 10  10
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_27 b/tests/bugs/modalg_5/bug25354_27
index 0c4f3eac40..11c80b157c 100644
--- a/tests/bugs/modalg_5/bug25354_27
+++ b/tests/bugs/modalg_5/bug25354_27
@@ -16,14 +16,5 @@ ttranslate b1 3 -10 0
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_28 b/tests/bugs/modalg_5/bug25354_28
index e46471c6d7..de878ff18f 100644
--- a/tests/bugs/modalg_5/bug25354_28
+++ b/tests/bugs/modalg_5/bug25354_28
@@ -17,14 +17,5 @@ box b2 10 10  10
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_29 b/tests/bugs/modalg_5/bug25354_29
index ba7c479930..188d00f901 100644
--- a/tests/bugs/modalg_5/bug25354_29
+++ b/tests/bugs/modalg_5/bug25354_29
@@ -16,14 +16,5 @@ ttranslate b1 3 -10 6
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_30 b/tests/bugs/modalg_5/bug25354_30
index 55da787a50..8459ca5753 100644
--- a/tests/bugs/modalg_5/bug25354_30
+++ b/tests/bugs/modalg_5/bug25354_30
@@ -16,14 +16,5 @@ ttranslate b1 3 -5 6
 bop b1 b2
 bopsection result
 
-set nb_v_good 3
-set nb_e_good 2
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 6
-
+checknbshapes result -vertex 3 -edge 2 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 6
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_31 b/tests/bugs/modalg_5/bug25354_31
index 6993858346..c7425999a1 100644
--- a/tests/bugs/modalg_5/bug25354_31
+++ b/tests/bugs/modalg_5/bug25354_31
@@ -16,14 +16,5 @@ ttranslate b1 3 4 0
 bop b1 b2
 bopsection result
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 9
-
+checknbshapes result -vertex 4 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_32 b/tests/bugs/modalg_5/bug25354_32
index acc55b57f0..83c180028f 100644
--- a/tests/bugs/modalg_5/bug25354_32
+++ b/tests/bugs/modalg_5/bug25354_32
@@ -15,14 +15,5 @@ ttranslate b2 -10 -10 -10
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_33 b/tests/bugs/modalg_5/bug25354_33
index 36295b7227..b07394b7f3 100644
--- a/tests/bugs/modalg_5/bug25354_33
+++ b/tests/bugs/modalg_5/bug25354_33
@@ -16,14 +16,5 @@ trotate b2 5 0 0 0 0 1 -45
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_34 b/tests/bugs/modalg_5/bug25354_34
index 18c7a6c595..d0c03402a9 100644
--- a/tests/bugs/modalg_5/bug25354_34
+++ b/tests/bugs/modalg_5/bug25354_34
@@ -17,14 +17,5 @@ trotate b2 5 0 0  1 0 0 45
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_35 b/tests/bugs/modalg_5/bug25354_35
index d5a3fb320a..53661c9a71 100644
--- a/tests/bugs/modalg_5/bug25354_35
+++ b/tests/bugs/modalg_5/bug25354_35
@@ -15,14 +15,5 @@ ttranslate b2 -10 -10 -4
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_36 b/tests/bugs/modalg_5/bug25354_36
index 8c7259c8f1..451260c69a 100644
--- a/tests/bugs/modalg_5/bug25354_36
+++ b/tests/bugs/modalg_5/bug25354_36
@@ -16,14 +16,5 @@ trotate b2 5 0 0  0 0 1 -45
 bop b1 b2
 bopsection result
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_37 b/tests/bugs/modalg_5/bug25354_37
index 15b4e81f5a..94fe6f12ee 100644
--- a/tests/bugs/modalg_5/bug25354_37
+++ b/tests/bugs/modalg_5/bug25354_37
@@ -15,14 +15,5 @@ ttranslate b2 10 3 4
 bop b1 b2
 bopsection result
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 9
-
+checknbshapes result -vertex 4 -edge 4 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_38 b/tests/bugs/modalg_5/bug25354_38
index 405fd9f054..879ebcc7d1 100644
--- a/tests/bugs/modalg_5/bug25354_38
+++ b/tests/bugs/modalg_5/bug25354_38
@@ -15,14 +15,5 @@ ttranslate b2 5 3 4
 bop b1 b2
 bopsection result
 
-set nb_v_good 6
-set nb_e_good 6
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 13
-
+checknbshapes result -vertex 6 -edge 6 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 13
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_39 b/tests/bugs/modalg_5/bug25354_39
index 7008f4554f..0ae15d9af0 100644
--- a/tests/bugs/modalg_5/bug25354_39
+++ b/tests/bugs/modalg_5/bug25354_39
@@ -14,14 +14,5 @@ vertex b2 0 0 0
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_40 b/tests/bugs/modalg_5/bug25354_40
index 35bbcb2322..42806f1816 100644
--- a/tests/bugs/modalg_5/bug25354_40
+++ b/tests/bugs/modalg_5/bug25354_40
@@ -16,14 +16,5 @@ edge b2 ba bb
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_41 b/tests/bugs/modalg_5/bug25354_41
index f2000ec54e..2f6ae44bf5 100644
--- a/tests/bugs/modalg_5/bug25354_41
+++ b/tests/bugs/modalg_5/bug25354_41
@@ -16,14 +16,5 @@ edge b2 ba bb
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_42 b/tests/bugs/modalg_5/bug25354_42
index c074506451..9316e045af 100644
--- a/tests/bugs/modalg_5/bug25354_42
+++ b/tests/bugs/modalg_5/bug25354_42
@@ -14,14 +14,5 @@ restore [locate_data_file bug25354_f1.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_43 b/tests/bugs/modalg_5/bug25354_43
index 662fb8700c..815f860ddb 100644
--- a/tests/bugs/modalg_5/bug25354_43
+++ b/tests/bugs/modalg_5/bug25354_43
@@ -14,14 +14,5 @@ restore [locate_data_file bug25354_f1.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_44 b/tests/bugs/modalg_5/bug25354_44
index 646b601b89..843c7f27fb 100644
--- a/tests/bugs/modalg_5/bug25354_44
+++ b/tests/bugs/modalg_5/bug25354_44
@@ -14,14 +14,5 @@ restore [locate_data_file bug25354_f1.brep] b2
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_45 b/tests/bugs/modalg_5/bug25354_45
index bb0bbc67c2..5fed52a1de 100644
--- a/tests/bugs/modalg_5/bug25354_45
+++ b/tests/bugs/modalg_5/bug25354_45
@@ -14,14 +14,5 @@ box b2 10 10 10
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_46 b/tests/bugs/modalg_5/bug25354_46
index 25f7a8070e..0ebe00eab3 100644
--- a/tests/bugs/modalg_5/bug25354_46
+++ b/tests/bugs/modalg_5/bug25354_46
@@ -13,14 +13,5 @@ box b2 10 10 10
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_47 b/tests/bugs/modalg_5/bug25354_47
index d65d9211a7..eaf4a9eddc 100644
--- a/tests/bugs/modalg_5/bug25354_47
+++ b/tests/bugs/modalg_5/bug25354_47
@@ -14,14 +14,5 @@ box b2 10 10 10
 bop b1 b2
 bopsection result
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 2
-
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_48 b/tests/bugs/modalg_5/bug25354_48
index d4aeee35de..4ed210b52b 100644
--- a/tests/bugs/modalg_5/bug25354_48
+++ b/tests/bugs/modalg_5/bug25354_48
@@ -14,14 +14,5 @@ box b2 10 10 10
 bop b1 b2
 bopsection result
 
-set nb_v_good 0
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 1
-
+checknbshapes result -vertex 0 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 1
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_49 b/tests/bugs/modalg_5/bug25354_49
index 9f70892623..161d13a6a9 100644
--- a/tests/bugs/modalg_5/bug25354_49
+++ b/tests/bugs/modalg_5/bug25354_49
@@ -47,14 +47,5 @@ baddcompound q
 bfillds -t
 bbop result 4 -t
 
-set nb_v_good 2781
-set nb_e_good 7332
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 10114
-
+checknbshapes result -vertex 2781 -edge 7332 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10114
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25354_50 b/tests/bugs/modalg_5/bug25354_50
index 4efb6383be..46a298871d 100644
--- a/tests/bugs/modalg_5/bug25354_50
+++ b/tests/bugs/modalg_5/bug25354_50
@@ -30,14 +30,5 @@ baddtools q
 bfillds -t
 bbop result 4 -t
 
-set nb_v_good 530
-set nb_e_good 524
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 1055
-
+checknbshapes result -vertex 530 -edge 524 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 1055
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25406_1 b/tests/bugs/modalg_5/bug25406_1
index 73419c6728..94cc81919e 100644
--- a/tests/bugs/modalg_5/bug25406_1
+++ b/tests/bugs/modalg_5/bug25406_1
@@ -12,16 +12,7 @@ offsetshape result a 10
 
 set length 1875.31
 
-set nb_v_good 2
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 4 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 9
 smallview
 fit
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25406_2 b/tests/bugs/modalg_5/bug25406_2
index ad5325ef73..0b05f4aa32 100644
--- a/tests/bugs/modalg_5/bug25406_2
+++ b/tests/bugs/modalg_5/bug25406_2
@@ -12,16 +12,7 @@ offsetshape result a -10
 
 set length 1875.31
 
-set nb_v_good 2
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 4 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 9
 smallview
 fit
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25408 b/tests/bugs/modalg_5/bug25408
index 142edd735b..3e9c681cc1 100755
--- a/tests/bugs/modalg_5/bug25408
+++ b/tests/bugs/modalg_5/bug25408
@@ -27,14 +27,5 @@ bbuild result
 
 set square 57200.9
 
-set nb_v_good 54
-set nb_e_good 129
-set nb_w_good 95
-set nb_f_good 95
-set nb_sh_good 22
-set nb_sol_good 22
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 419
-
+checknbshapes result -vertex 54 -edge 129 -wire 95 -face 95 -shell 22 -solid 22 -compsolid 0 -compound 2 -shape 419
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25420 b/tests/bugs/modalg_5/bug25420
index 3f0903b13c..5f96cdbb6c 100644
--- a/tests/bugs/modalg_5/bug25420
+++ b/tests/bugs/modalg_5/bug25420
@@ -16,14 +16,5 @@ baddobjects b1 b2
 bfillds -t
 bbuild result -t
 
-set nb_v_good 1
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 3
-
+checknbshapes result -vertex 1 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 3
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25432 b/tests/bugs/modalg_5/bug25432
index c0baa1686e..3383ebfba2 100644
--- a/tests/bugs/modalg_5/bug25432
+++ b/tests/bugs/modalg_5/bug25432
@@ -20,14 +20,5 @@ checkreal "Volume" ${volume} ${expected_volume} ${tol_abs_volume} ${tol_rel_volu
 
 set square 3.59972
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 59
-
+checknbshapes result -vertex 12 -edge 20 -wire 11 -face 11 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 59
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25449 b/tests/bugs/modalg_5/bug25449
index e75c9ba9d1..22cb436f33 100755
--- a/tests/bugs/modalg_5/bug25449
+++ b/tests/bugs/modalg_5/bug25449
@@ -18,14 +18,5 @@ bbuild result
 
 set square 21.1115
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 11
-
+checknbshapes result -vertex 4 -edge 4 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 11
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25450_1 b/tests/bugs/modalg_5/bug25450_1
index 6fada1be7f..e0b16c6199 100644
--- a/tests/bugs/modalg_5/bug25450_1
+++ b/tests/bugs/modalg_5/bug25450_1
@@ -13,14 +13,5 @@ bcommon result a_1 a_2
 
 set square 142153
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 29
-
+checknbshapes result -vertex 8 -edge 12 -wire 4 -face 4 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 29
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25450_2 b/tests/bugs/modalg_5/bug25450_2
index 61b22fd50b..3c7cef65d3 100644
--- a/tests/bugs/modalg_5/bug25450_2
+++ b/tests/bugs/modalg_5/bug25450_2
@@ -14,14 +14,5 @@ bopcommon result
 
 set square 35538.3
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 11
-
+checknbshapes result -vertex 4 -edge 4 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 11
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25465_1 b/tests/bugs/modalg_5/bug25465_1
index af86af14c3..be9fd47911 100644
--- a/tests/bugs/modalg_5/bug25465_1
+++ b/tests/bugs/modalg_5/bug25465_1
@@ -15,17 +15,8 @@ set bug_info [bopcurves b1_3 b2_4]
 bop b1 b2
 bopcut result
 
-# It is strictly forbidden to change nb_v_good and nb_e_good values (see OCC25465)
-set nb_v_good 11
-set nb_e_good 17
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 47
-
+# It is strictly forbidden to change reference values of vertexes and edges (see OCC25465)
+checknbshapes result -vertex 11 -edge 17 -wire 8 -face 8 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 47
 if {[lindex $bug_info 2] != 3} {
   puts "ERROR: OCC25465 is reproduced."
 }
diff --git a/tests/bugs/modalg_5/bug25465_2 b/tests/bugs/modalg_5/bug25465_2
index fdf55c1971..884a8cf760 100644
--- a/tests/bugs/modalg_5/bug25465_2
+++ b/tests/bugs/modalg_5/bug25465_2
@@ -15,17 +15,8 @@ set bug_info [bopcurves b1_6 b2_1]
 bop b1 b2
 bopcut result
 
-# It is strictly forbidden to change nb_v_good and nb_e_good values (see OCC25465)
-set nb_v_good 13
-set nb_e_good 20
-set nb_w_good 11
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 55
-
+# It is strictly forbidden to change reference values of vertexes and edges (see OCC25465)
+checknbshapes result -vertex 13 -edge 20 -wire 11 -face 8 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 55
 if {[lindex $bug_info 2] != 2} {
   puts "ERROR: OCC25465 is reproduced."
 }
diff --git a/tests/bugs/modalg_5/bug25470 b/tests/bugs/modalg_5/bug25470
index c6ce67965f..43784c6a13 100644
--- a/tests/bugs/modalg_5/bug25470
+++ b/tests/bugs/modalg_5/bug25470
@@ -18,14 +18,5 @@ bbop result 0
 
 set square 893.011
 
-set nb_v_good 45
-set nb_e_good 77
-set nb_w_good 32
-set nb_f_good 32
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 189
-
+checknbshapes result -vertex 45 -edge 77 -wire 32 -face 32 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 189
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25477_1 b/tests/bugs/modalg_5/bug25477_1
index bf5c3ff55b..186fffe7cc 100644
--- a/tests/bugs/modalg_5/bug25477_1
+++ b/tests/bugs/modalg_5/bug25477_1
@@ -13,12 +13,4 @@ bfuzzyvalue 0.00002
 bop b1 b2 
 bopfuse result
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 55
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 55
\ No newline at end of file
diff --git a/tests/bugs/modalg_5/bug25480 b/tests/bugs/modalg_5/bug25480
index 1b04a15923..baa66806ff 100644
--- a/tests/bugs/modalg_5/bug25480
+++ b/tests/bugs/modalg_5/bug25480
@@ -13,14 +13,5 @@ pipe result b a 1
 
 set square 48441
 
-set nb_v_good 224
-set nb_e_good 392
-set nb_w_good 196
-set nb_f_good 196
-set nb_sh_good 14
-set nb_sol_good 14
-set nb_compsol_good 0
-set nb_compound_good 8
-set nb_shape_good 1044
-
+checknbshapes result -vertex 224 -edge 392 -wire 196 -face 196 -shell 14 -solid 14 -compsolid 0 -compound 8 -shape 1044
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25491 b/tests/bugs/modalg_5/bug25491
index 8a73d20d9b..1da09cddeb 100755
--- a/tests/bugs/modalg_5/bug25491
+++ b/tests/bugs/modalg_5/bug25491
@@ -15,15 +15,7 @@ if [catch { mkoffset resoffset a 1 -35 i } ] {
 
   set length 120
 
-  set nb_v_good 5
-  set nb_e_good 5
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 11
+  checknbshapes result -vertex 5 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 11
 }
 
 smallview
diff --git a/tests/bugs/modalg_5/bug25505 b/tests/bugs/modalg_5/bug25505
index 4ea26232e7..3dfcdc60c7 100755
--- a/tests/bugs/modalg_5/bug25505
+++ b/tests/bugs/modalg_5/bug25505
@@ -26,14 +26,5 @@ if {[string compare ${info} " This shape seems to be OK.\n"] == 0} {
 
 set square 68796.4
 
-set nb_v_good 14
-set nb_e_good 21
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 7
-set nb_sol_good 4
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 65
-
+checknbshapes result -vertex 14 -edge 21 -wire 9 -face 9 -shell 7 -solid 4 -compsolid 0 -compound 1 -shape 65
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25557_1 b/tests/bugs/modalg_5/bug25557_1
index 26afc7d66e..2609fdd4af 100755
--- a/tests/bugs/modalg_5/bug25557_1
+++ b/tests/bugs/modalg_5/bug25557_1
@@ -17,14 +17,5 @@ fit
 
 set length 97.766
 
-set nb_v_good 3
-set nb_e_good 2
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 6
-
+checknbshapes result -vertex 3 -edge 2 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 6
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25557_2 b/tests/bugs/modalg_5/bug25557_2
index 8003bad42e..1198501c9d 100755
--- a/tests/bugs/modalg_5/bug25557_2
+++ b/tests/bugs/modalg_5/bug25557_2
@@ -17,14 +17,5 @@ fit
 
 set length 87.7041
 
-set nb_v_good 3
-set nb_e_good 2
-set nb_w_good 1
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good  0
-set nb_shape_good 6
-
+checknbshapes result -vertex 3 -edge 2 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 6
 set only_screen_axo 1
diff --git a/tests/bugs/modalg_5/bug25600 b/tests/bugs/modalg_5/bug25600
index 307abc8181..8d23d1ccc8 100644
--- a/tests/bugs/modalg_5/bug25600
+++ b/tests/bugs/modalg_5/bug25600
@@ -18,14 +18,5 @@ bbop result 1
 
 set square 12.2258
 
-set nb_v_good 3
-set nb_e_good 6
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good  1
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 6 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 18
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25614_common b/tests/bugs/modalg_5/bug25614_common
index 42c5b195cc..b4ee8ff901 100755
--- a/tests/bugs/modalg_5/bug25614_common
+++ b/tests/bugs/modalg_5/bug25614_common
@@ -44,14 +44,5 @@ baddctools b2
 
 bapibop result 0
 
-set nb_v_good 1720
-set nb_e_good 4260
-set nb_w_good 3220
-set nb_f_good 3220
-set nb_sh_good 760
-set nb_sol_good 760
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 13941
-
+checknbshapes result -vertex 1720 -edge 4260 -wire 3220 -face 3220 -shell 760 -solid 760 -compsolid 0 -compound 1 -shape 13941
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25614_cut b/tests/bugs/modalg_5/bug25614_cut
index c321a580b2..e745cb10ea 100755
--- a/tests/bugs/modalg_5/bug25614_cut
+++ b/tests/bugs/modalg_5/bug25614_cut
@@ -44,14 +44,5 @@ baddctools b2
 
 bapibop result 2
 
-set nb_v_good 888
-set nb_e_good 1412
-set nb_w_good 726
-set nb_f_good 726
-set nb_sh_good 121
-set nb_sol_good 121
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 3995
-
+checknbshapes result -vertex 888 -edge 1412 -wire 726 -face 726 -shell 121 -solid 121 -compsolid 0 -compound 1 -shape 3995
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25614_cut21 b/tests/bugs/modalg_5/bug25614_cut21
index f44c178228..9f9cd73aed 100755
--- a/tests/bugs/modalg_5/bug25614_cut21
+++ b/tests/bugs/modalg_5/bug25614_cut21
@@ -44,14 +44,5 @@ baddctools b2
 
 bapibop result 3
 
-set nb_v_good 2640
-set nb_e_good 5960
-set nb_w_good 3720
-set nb_f_good 3720
-set nb_sh_good 560
-set nb_sol_good 560
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 17161
-
+checknbshapes result -vertex 2640 -edge 5960 -wire 3720 -face 3720 -shell 560 -solid 560 -compsolid 0 -compound 1 -shape 17161
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25614_fuse b/tests/bugs/modalg_5/bug25614_fuse
index f075ba84d0..759bc86033 100755
--- a/tests/bugs/modalg_5/bug25614_fuse
+++ b/tests/bugs/modalg_5/bug25614_fuse
@@ -44,14 +44,5 @@ baddctools b2
 
 bapibop result 1
 
-set nb_v_good 1808
-set nb_e_good 3392
-set nb_w_good 1586
-set nb_f_good 1586
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8375
-
+checknbshapes result -vertex 1808 -edge 3392 -wire 1586 -face 1586 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 8375
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25614_genfuse b/tests/bugs/modalg_5/bug25614_genfuse
index 2fef6c5005..7bc4e3c1d7 100755
--- a/tests/bugs/modalg_5/bug25614_genfuse
+++ b/tests/bugs/modalg_5/bug25614_genfuse
@@ -44,14 +44,5 @@ baddcompound b2
 
 bapibuild result
 
-set nb_v_good 2728
-set nb_e_good 7032
-set nb_w_good 5746
-set nb_f_good 5746
-set nb_sh_good 1441
-set nb_sol_good 1441
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 24135
-
+checknbshapes result -vertex 2728 -edge 7032 -wire 5746 -face 5746 -shell 1441 -solid 1441 -compsolid 0 -compound 1 -shape 24135
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25614_section b/tests/bugs/modalg_5/bug25614_section
index 5b35c4e6e7..56d733a027 100755
--- a/tests/bugs/modalg_5/bug25614_section
+++ b/tests/bugs/modalg_5/bug25614_section
@@ -44,14 +44,5 @@ baddctools b2
 
 bapibop result 4
 
-set nb_v_good 2700
-set nb_e_good 6000
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 8701
-
+checknbshapes result -vertex 2700 -edge 6000 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 8701
 set 3dviewer 1
diff --git a/tests/bugs/modalg_5/bug25625 b/tests/bugs/modalg_5/bug25625
index c78ba3699b..6eb38376b8 100644
--- a/tests/bugs/modalg_5/bug25625
+++ b/tests/bugs/modalg_5/bug25625
@@ -14,14 +14,5 @@ bopcommon result
 
 set square 0.985997
 
-set nb_v_good 10
-set nb_e_good 11
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 26
-
+checknbshapes result -vertex 10 -edge 11 -wire 2 -face 2 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 26
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25704_1 b/tests/bugs/modalg_5/bug25704_1
index c3f09d8dfc..1cade788e6 100644
--- a/tests/bugs/modalg_5/bug25704_1
+++ b/tests/bugs/modalg_5/bug25704_1
@@ -17,15 +17,7 @@ if [catch { mkoffset resoffset a 1 2. } ] {
 
   set length 75.3982
 
-  set nb_v_good 1
-  set nb_e_good 1
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 3
+  checknbshapes result -vertex 1 -edge 1 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 3
 }
 
 smallview
diff --git a/tests/bugs/modalg_5/bug25704_2 b/tests/bugs/modalg_5/bug25704_2
index 98061b8bda..adc1ac50e9 100644
--- a/tests/bugs/modalg_5/bug25704_2
+++ b/tests/bugs/modalg_5/bug25704_2
@@ -17,15 +17,7 @@ if [catch { mkoffset resoffset a 1 -3. } ] {
 
   set length 43.9823
 
-  set nb_v_good 1
-  set nb_e_good 1
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 3
+  checknbshapes result -vertex 1 -edge 1 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 3
 }
 
 smallview
diff --git a/tests/bugs/modalg_5/bug25704_3 b/tests/bugs/modalg_5/bug25704_3
index aa59ff3133..a69f395463 100644
--- a/tests/bugs/modalg_5/bug25704_3
+++ b/tests/bugs/modalg_5/bug25704_3
@@ -15,15 +15,7 @@ if [catch { mkoffset resoffset a 1 35. i } ] {
 
   set length 730
 
-  set nb_v_good 8
-  set nb_e_good 8
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 17
+  checknbshapes result -vertex 8 -edge 8 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 17
 }
 
 smallview
diff --git a/tests/bugs/modalg_5/bug25704_4 b/tests/bugs/modalg_5/bug25704_4
index 6441b0d1c2..1de198b06f 100644
--- a/tests/bugs/modalg_5/bug25704_4
+++ b/tests/bugs/modalg_5/bug25704_4
@@ -15,15 +15,7 @@ if [catch { mkoffset resoffset a 1 40. i } ] {
 
   set length 770
 
-  set nb_v_good 8
-  set nb_e_good 8
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 17
+  checknbshapes result -vertex 8 -edge 8 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 17
 }
 
 smallview
diff --git a/tests/bugs/modalg_5/bug25704_5 b/tests/bugs/modalg_5/bug25704_5
index ff471e18e4..0c50f3a199 100644
--- a/tests/bugs/modalg_5/bug25704_5
+++ b/tests/bugs/modalg_5/bug25704_5
@@ -15,15 +15,7 @@ if [catch { mkoffset resoffset a 1 1. i } ] {
 
   set length 38.9737
 
-  set nb_v_good 5
-  set nb_e_good 5
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 11
+  checknbshapes result -vertex 5 -edge 5 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 11
 }
 
 smallview
diff --git a/tests/bugs/modalg_5/bug25704_6 b/tests/bugs/modalg_5/bug25704_6
index 97d552ad4c..bc211b7a06 100644
--- a/tests/bugs/modalg_5/bug25704_6
+++ b/tests/bugs/modalg_5/bug25704_6
@@ -15,15 +15,7 @@ if [catch { openoffset resoffset a 5 5 i } ] {
 
   set length 169.12
 
-  set nb_v_good 4
-  set nb_e_good 3
-  set nb_w_good 1
-  set nb_f_good 0
-  set nb_sh_good 0
-  set nb_sol_good 0
-  set nb_compsol_good 0
-  set nb_compound_good 0
-  set nb_shape_good 8
+  checknbshapes result -vertex 4 -edge 3 -wire 1 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 8
 }
 
 smallview
diff --git a/tests/bugs/modalg_5/bug25715_1 b/tests/bugs/modalg_5/bug25715_1
index 3c98421a82..19497f1697 100644
--- a/tests/bugs/modalg_5/bug25715_1
+++ b/tests/bugs/modalg_5/bug25715_1
@@ -15,14 +15,5 @@ trotate s2 0 0 0 1 0 0 -45
 ttranslate s2 -0.2 0 0.48
 bcut result s1 s2
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 23
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 23
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25715_2 b/tests/bugs/modalg_5/bug25715_2
index 898464fcd8..a3fe5fcfd5 100644
--- a/tests/bugs/modalg_5/bug25715_2
+++ b/tests/bugs/modalg_5/bug25715_2
@@ -11,14 +11,5 @@ restore [locate_data_file bug25715_b14p9s1.brep] s1
 restore [locate_data_file bug25715_b14p9s2.brep] s2
 bfuse result s1 s2
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 24
-
+checknbshapes result -vertex 4 -edge 6 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 24
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25715_3 b/tests/bugs/modalg_5/bug25715_3
index 47aab08c39..9ba42a7919 100644
--- a/tests/bugs/modalg_5/bug25715_3
+++ b/tests/bugs/modalg_5/bug25715_3
@@ -1,4 +1,4 @@
-puts "TODO OCC24418 ALL: Error : Result shape is WRONG because it must contains"
+puts "TODO OCC24418 ALL: Error :  is WRONG because number of"
 puts "=========="
 puts "OCC25715"
 puts "=========="
@@ -12,14 +12,5 @@ restore [locate_data_file bug25715_p02c3s1.brep] s1
 restore [locate_data_file bug25715_p02c3s3.brep] s3
 bfuse result s1 s3
 
-set nb_v_good 8
-set nb_e_good 14
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 36
-
+checknbshapes result -vertex 8 -edge 14 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 36
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25721 b/tests/bugs/modalg_5/bug25721
index 8d52a802c7..3444fa4064 100644
--- a/tests/bugs/modalg_5/bug25721
+++ b/tests/bugs/modalg_5/bug25721
@@ -20,14 +20,5 @@ bfillds
 bbop result 0
 
 set square 181.203
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 3
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 10
-
+checknbshapes result -vertex 2 -edge 3 -wire 3 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25722 b/tests/bugs/modalg_5/bug25722
index 7f1c572ad9..74b6a5f47c 100644
--- a/tests/bugs/modalg_5/bug25722
+++ b/tests/bugs/modalg_5/bug25722
@@ -15,12 +15,8 @@ baddobjects b1
 baddtools b2
 bfillds
 bbop r 1
-regexp {SOLID +: +([-0-9.+eE]+)} [nbshapes r] full nb_sol
-if { ${nb_sol} != 1 } {
-  puts "Error : Result shape is WRONG because it must contains 1 solid instead of ${nb_sol}"
-} else {
-  puts "Result shape contains ${nb_sol} solids"
-}
+
+checknbshapes r -solid 1
 
 bfuzzyvalue 0.
 box b1 10 10 10
@@ -31,11 +27,7 @@ baddobjects b1
 baddtools b2
 bfillds
 bbop result 1
-regexp {SOLID +: +([-0-9.+eE]+)} [nbshapes result] full nb_sol
-if { ${nb_sol} != 2 } {
-  puts "Error : Result shape is WRONG because it must contains 2 solids instead of ${nb_sol}"
-} else {
-  puts "Result shape contains ${nb_sol} solids"
-}
+
+checknbshapes result -solid 2
 
 set 2dviewer 1
diff --git a/tests/bugs/modalg_5/bug25772 b/tests/bugs/modalg_5/bug25772
index 9cedf9e8b9..6af77a49e2 100644
--- a/tests/bugs/modalg_5/bug25772
+++ b/tests/bugs/modalg_5/bug25772
@@ -13,12 +13,7 @@ bcut result pl hl
 
 checkshape result
 
-# Analysis of "nbshapes res"
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
+checknbshapes result -face 2 -shell 1 -solid 0 -compsolid 0 -compound 1
 
 smallview
 donly result
diff --git a/tests/bugs/modalg_5/bug25951 b/tests/bugs/modalg_5/bug25951
index 4dd0adc57d..21c64c7430 100644
--- a/tests/bugs/modalg_5/bug25951
+++ b/tests/bugs/modalg_5/bug25951
@@ -12,12 +12,4 @@ copy q_1 b1
 copy q_2 b2
 bsection result b1 b2
 
-set nb_v_good 1
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 2
+checknbshapes result -vertex 1 -edge 0 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 2
\ No newline at end of file
diff --git a/tests/bugs/modalg_6/bug26621 b/tests/bugs/modalg_6/bug26621
index ad02fd8e05..c40bed3436 100644
--- a/tests/bugs/modalg_6/bug26621
+++ b/tests/bugs/modalg_6/bug26621
@@ -6,16 +6,6 @@ puts ""
 # Boolean Cut does not work on two solids
 ###########################################
 
-set nb_v_good 186
-set nb_e_good 360
-set nb_w_good 174
-set nb_f_good 174
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 897
-
 smallview
 
 restore [locate_data_file OCC26621-body.brep] body
@@ -26,6 +16,7 @@ bopargcheck cutter
 bcut result body cutter
 donly result
 fit
-nbshapes result
+
+checknbshapes result -vertex 186 -edge 360 -wire 174 -face 174 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 897
 
 set only_screen_axo 1
diff --git a/tests/bugs/moddata_1/bug10604_1 b/tests/bugs/moddata_1/bug10604_1
index a0a16e2d62..fd0b8069fd 100755
--- a/tests/bugs/moddata_1/bug10604_1
+++ b/tests/bugs/moddata_1/bug10604_1
@@ -24,14 +24,5 @@ puts "Finish boolean operation ..."
 set square 585.072
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
-set nb_e_good 12
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 31
-
+checknbshapes result -vertex 6 -edge 12 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 31
 set 2dviewer 0
diff --git a/tests/bugs/moddata_1/bug10604_2 b/tests/bugs/moddata_1/bug10604_2
index ee66d39432..9e2134f70d 100755
--- a/tests/bugs/moddata_1/bug10604_2
+++ b/tests/bugs/moddata_1/bug10604_2
@@ -24,15 +24,6 @@ puts "Finish boolean operation ..."
 set square 808.713
 
 # Analysis of "nbshapes res"
-set nb_v_good 8
-set nb_e_good 15
-set nb_w_good 8
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 41
-
+checknbshapes result -vertex 8 -edge 15 -wire 8 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 41
 set 2dviewer 0
 
diff --git a/tests/bugs/moddata_1/bug10604_3 b/tests/bugs/moddata_1/bug10604_3
index 6db8c36620..9aea817622 100755
--- a/tests/bugs/moddata_1/bug10604_3
+++ b/tests/bugs/moddata_1/bug10604_3
@@ -24,14 +24,5 @@ puts "Finish boolean operation ..."
 set square 893.394
 
 # Analysis of "nbshapes res"
-set nb_v_good 7
-set nb_e_good 15
-set nb_w_good 6
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 36
-
+checknbshapes result -vertex 7 -edge 15 -wire 6 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 36
 set 2dviewer 0
diff --git a/tests/bugs/moddata_1/bug10604_4 b/tests/bugs/moddata_1/bug10604_4
index 8b9571f924..72266cd763 100755
--- a/tests/bugs/moddata_1/bug10604_4
+++ b/tests/bugs/moddata_1/bug10604_4
@@ -24,15 +24,6 @@ puts "Finish boolean operation ..."
 set square 500.39
 
 # Analysis of "nbshapes res"
-set nb_v_good 7
-set nb_e_good 12
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 38
-
+checknbshapes result -vertex 7 -edge 12 -wire 7 -face 7 -shell 2 -solid 2 -compsolid 0 -compound 1 -shape 38
 set 2dviewer 0
 
diff --git a/tests/bugs/moddata_1/bug10604_5 b/tests/bugs/moddata_1/bug10604_5
index 08b5926ca6..a4fd124c69 100755
--- a/tests/bugs/moddata_1/bug10604_5
+++ b/tests/bugs/moddata_1/bug10604_5
@@ -24,15 +24,6 @@ puts "Finish boolean operation ..."
 set length 88.9912
 
 # Analysis of "nbshapes res"
-set nb_v_good 6
-set nb_e_good 6
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 13
-
+checknbshapes result -vertex 6 -edge 6 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 13
 set 2dviewer 0
 
diff --git a/tests/bugs/moddata_1/bug19777 b/tests/bugs/moddata_1/bug19777
index a41315facc..9d944c7725 100755
--- a/tests/bugs/moddata_1/bug19777
+++ b/tests/bugs/moddata_1/bug19777
@@ -13,16 +13,7 @@ if [catch { restore $filepath result} catch_result] {
   puts "Error ${BugNumber}: there is reading problem"
 } else {
 
-set nb_v_good 0
-set nb_e_good 0
-set nb_w_good 0
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 1
-
+checknbshapes result -vertex 0 -edge 0 -wire 0 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 1
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/moddata_1/bug20823 b/tests/bugs/moddata_1/bug20823
index 32254fedac..6886719736 100755
--- a/tests/bugs/moddata_1/bug20823
+++ b/tests/bugs/moddata_1/bug20823
@@ -17,16 +17,7 @@ if [catch { chfi2d result f f_1 f_2 CDD 10. 10. } ] {
 } else {
 set length 267.795
 
-set nb_v_good 4
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 4 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 9
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/moddata_1/bug21122 b/tests/bugs/moddata_1/bug21122
index cece00a315..9d471b3581 100755
--- a/tests/bugs/moddata_1/bug21122
+++ b/tests/bugs/moddata_1/bug21122
@@ -79,16 +79,7 @@ if { ${deflection_percent} > ${percent_max} } {
 
 set square 275.426
 
-set nb_v_good 964
-set nb_e_good 964
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 1931
-
+checknbshapes result -vertex 964 -edge 964 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 1931
 if { ${status} != 0 } {
    puts "Faulty ${BugNumber}"
 } else {
diff --git a/tests/bugs/moddata_1/bug21292 b/tests/bugs/moddata_1/bug21292
index 8da1da51c1..a83b3feb5c 100755
--- a/tests/bugs/moddata_1/bug21292
+++ b/tests/bugs/moddata_1/bug21292
@@ -31,16 +31,7 @@ puts "CPU_user_time=${CPU_user_time}"
 
 
 set square 1.40193e+07
-set nb_v_good 372
-set nb_e_good 369
-set nb_w_good 2
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 745
-
+checknbshapes result -vertex 372 -edge 369 -wire 2 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 745
 
 if {[string compare $tcl_platform(platform) "windows"] == 0} {
    puts "windows"
diff --git a/tests/bugs/moddata_1/bug21858 b/tests/bugs/moddata_1/bug21858
index e9a8b9e0aa..8ce27bbff6 100755
--- a/tests/bugs/moddata_1/bug21858
+++ b/tests/bugs/moddata_1/bug21858
@@ -12,16 +12,7 @@ restore [locate_data_file OCC21858.brep] result
 
 set length 6.48642
 
-set nb_v_good 9
-set nb_e_good 10
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 21
-
+checknbshapes result -vertex 9 -edge 10 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 21
 set only_screen 0
 
 vinit
diff --git a/tests/bugs/moddata_1/bug22694 b/tests/bugs/moddata_1/bug22694
index deae6f1742..001778e9f0 100755
--- a/tests/bugs/moddata_1/bug22694
+++ b/tests/bugs/moddata_1/bug22694
@@ -34,15 +34,6 @@ vfit
 
 set square 76338.8
 
-set nb_v_good 4
-set nb_e_good 4
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 10
-
+checknbshapes result -vertex 4 -edge 4 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 10
 set 2dviewer 1
 
diff --git a/tests/bugs/moddata_1/bug22761 b/tests/bugs/moddata_1/bug22761
index 3476f7aec1..b1651dfa2c 100755
--- a/tests/bugs/moddata_1/bug22761
+++ b/tests/bugs/moddata_1/bug22761
@@ -12,16 +12,7 @@ set BugNumber OCC22761
 
 restore [locate_data_file OCC22761-TransmissionTestModel5-notfixed.brep] result
 
-set nb_v_good 2171
-set nb_e_good 1210
-set nb_w_good 226
-set nb_f_good 213
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 3821
-
+checknbshapes result -vertex 2171 -edge 1210 -wire 226 -face 213 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 3821
 set length 217577
 set 3dviewer 0
 
diff --git a/tests/bugs/moddata_2/bug6278 b/tests/bugs/moddata_2/bug6278
index 5a3919f79e..0fc63f2d1b 100755
--- a/tests/bugs/moddata_2/bug6278
+++ b/tests/bugs/moddata_2/bug6278
@@ -14,7 +14,7 @@ restore [locate_data_file OCC6278-B.brep] b
 bfuse result a b
 explode result v
 
-set nb_v_good 4
+checknbshapes result -vertex 4
 
 set DumpList [dump result_2]
 if {[llength ${DumpList}] < 40} {
diff --git a/tests/bugs/moddata_3/bug20866 b/tests/bugs/moddata_3/bug20866
index c56a19dbc8..f9ab12198f 100644
--- a/tests/bugs/moddata_3/bug20866
+++ b/tests/bugs/moddata_3/bug20866
@@ -28,15 +28,7 @@ if [catch { buildsweep result } ] {
 
     set square 1.94998e+06
 
-    set nb_v_good 161
-    set nb_e_good 299
-    set nb_w_good 138
-    set nb_f_good 138
-    set nb_sh_good 1
-    set nb_sol_good 0
-    set nb_compsol_good 0
-    set nb_compound_good 0
-    set nb_shape_good 737
+    checknbshapes result -vertex 161 -edge 299 -wire 138 -face 138 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 737
 }
 set 2dviewer 0
 
diff --git a/tests/bugs/moddata_3/bug23738 b/tests/bugs/moddata_3/bug23738
index b6b8164f56..810a039059 100644
--- a/tests/bugs/moddata_3/bug23738
+++ b/tests/bugs/moddata_3/bug23738
@@ -21,14 +21,5 @@ puts "Finish boolean operation ..."
 set square 225009
 
 # Analysis of "nbshapes result"
-set nb_v_good 6
-set nb_e_good 10
-set nb_w_good 8
-set nb_f_good 6
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 31
-
+checknbshapes result -vertex 6 -edge 10 -wire 8 -face 6 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 31
 set 3dviewer 1
diff --git a/tests/bugs/moddata_3/bug24108 b/tests/bugs/moddata_3/bug24108
index b082f005cc..4b2a69e3eb 100644
--- a/tests/bugs/moddata_3/bug24108
+++ b/tests/bugs/moddata_3/bug24108
@@ -27,14 +27,5 @@ puts "Finish boolean operation ..."
 set square 1328.78
 
 # Analysis of "nbshapes result"
-set nb_v_good 37
-set nb_e_good 39
-set nb_w_good 4
-set nb_f_good 3
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 84
-
+checknbshapes result -vertex 37 -edge 39 -wire 4 -face 3 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 84
 set 3dviewer 1
diff --git a/tests/bugs/moddata_3/bug24108_2 b/tests/bugs/moddata_3/bug24108_2
index 6692bba19e..6e7a915aea 100644
--- a/tests/bugs/moddata_3/bug24108_2
+++ b/tests/bugs/moddata_3/bug24108_2
@@ -32,14 +32,5 @@ puts "Finish boolean operation ..."
 set square 1328.78
 
 # Analysis of "nbshapes result"
-set nb_v_good 37
-set nb_e_good 39
-set nb_w_good 4
-set nb_f_good 3
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 84
-
+checknbshapes result -vertex 37 -edge 39 -wire 4 -face 3 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 84
 set 3dviewer 1
diff --git a/tests/bugs/step/bug11856 b/tests/bugs/step/bug11856
index 2882f915e5..ed60243c47 100755
--- a/tests/bugs/step/bug11856
+++ b/tests/bugs/step/bug11856
@@ -16,14 +16,5 @@ decho on
 tpcompound result
 
 set square 653115
-set nb_v_good 684
-set nb_e_good 1222
-set nb_w_good 519
-set nb_f_good 512
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 2940
-
+checknbshapes result -vertex 684 -edge 1222 -wire 519 -face 512 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 2940
 set 2dviewer 0
diff --git a/tests/bugs/step/bug11857 b/tests/bugs/step/bug11857
index 53d742eb6a..8257f75ede 100755
--- a/tests/bugs/step/bug11857
+++ b/tests/bugs/step/bug11857
@@ -10,14 +10,5 @@ stepread [locate_data_file OCC11857.stp] a *
 tpcompound result
 
 set square 208019
-set nb_v_good 63
-set nb_e_good 102
-set nb_w_good 39
-set nb_f_good 39
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 246
-
+checknbshapes result -vertex 63 -edge 102 -wire 39 -face 39 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 246
 set 2dviewer 0
diff --git a/tests/bugs/step/bug22145 b/tests/bugs/step/bug22145
index 2f955de4d6..21f1d32bf9 100755
--- a/tests/bugs/step/bug22145
+++ b/tests/bugs/step/bug22145
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The square of result shape is "
-puts "TODO OCC12345 ALL: Error : Result shape is WRONG"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of"
 puts "============"
 puts "OCC22145"
 puts "============"
@@ -15,14 +15,5 @@ decho on
 tpcompound result
 
 set square 653115
-set nb_v_good 684
-set nb_e_good 1222
-set nb_w_good 519
-set nb_f_good 512
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 2940
-
+checknbshapes result -vertex 684 -edge 1222 -wire 519 -face 512 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 2940
 set 2dviewer 0
diff --git a/tests/bugs/step/bug22237 b/tests/bugs/step/bug22237
index 4f2e3e907a..0803fa4b86 100755
--- a/tests/bugs/step/bug22237
+++ b/tests/bugs/step/bug22237
@@ -18,16 +18,7 @@ if [catch { stepread $filepath a * } catch_result] {
 
 set square 1.50067e+07
 
-set nb_v_good 136
-set nb_e_good 236
-set nb_w_good 102
-set nb_f_good 102
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 579
-
+checknbshapes result -vertex 136 -edge 236 -wire 102 -face 102 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 579
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/step/bug22680 b/tests/bugs/step/bug22680
index 246b393cfe..369fd40e93 100644
--- a/tests/bugs/step/bug22680
+++ b/tests/bugs/step/bug22680
@@ -11,14 +11,5 @@ tpcompound result
 
 set square 33122.6
 
-set nb_v_good 52
-set nb_e_good 83
-set nb_w_good 41
-set nb_f_good 37
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 216
-
+checknbshapes result -vertex 52 -edge 83 -wire 41 -face 37 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 216
 set 3dviewer 1
diff --git a/tests/bugs/step/bug24601 b/tests/bugs/step/bug24601
index 60fa60ffc9..ba7f20af36 100644
--- a/tests/bugs/step/bug24601
+++ b/tests/bugs/step/bug24601
@@ -11,14 +11,5 @@ tpcompound result
 
 set square 38563.2
 
-set nb_v_good 150
-set nb_e_good 228
-set nb_w_good 135
-set nb_f_good 105
-set nb_sh_good 2
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 624
-
+checknbshapes result -vertex 150 -edge 228 -wire 135 -face 105 -shell 2 -solid 2 -compsolid 0 -compound 2 -shape 624
 set 3dviewer 1
diff --git a/tests/bugs/step/bug25166 b/tests/bugs/step/bug25166
index fe8e7036ee..d0910ba601 100644
--- a/tests/bugs/step/bug25166
+++ b/tests/bugs/step/bug25166
@@ -11,14 +11,5 @@ tpcompound result
 
 set square 46280.7
 
-set nb_v_good 176
-set nb_e_good 176
-set nb_w_good 176
-set nb_f_good 168
-set nb_sh_good 168
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 2
-set nb_shape_good 866
-
+checknbshapes result -vertex 176 -edge 176 -wire 176 -face 168 -shell 168 -solid 0 -compsolid 0 -compound 2 -shape 866
 set 3dviewer 1
diff --git a/tests/bugs/step/bug25167 b/tests/bugs/step/bug25167
index bb193517f7..9db648ba64 100644
--- a/tests/bugs/step/bug25167
+++ b/tests/bugs/step/bug25167
@@ -11,14 +11,5 @@ tpcompound result
 
 set square 20800
 
-set nb_v_good 26
-set nb_e_good 37
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 3
-set nb_sol_good 3
-set nb_compsol_good 0
-set nb_compound_good 5
-set nb_shape_good 110
-
+checknbshapes result -vertex 26 -edge 37 -wire 18 -face 18 -shell 3 -solid 3 -compsolid 0 -compound 5 -shape 110
 set 3dviewer 1
diff --git a/tests/bugs/step/bug25169 b/tests/bugs/step/bug25169
index d58ba06c68..8b998eb46f 100644
--- a/tests/bugs/step/bug25169
+++ b/tests/bugs/step/bug25169
@@ -11,14 +11,5 @@ tpcompound result
 
 set square 2400
 
-set nb_v_good 8
-set nb_e_good 12
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 35
-
+checknbshapes result -vertex 8 -edge 12 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 35
 set 3dviewer 1
diff --git a/tests/bugs/step/bug25523 b/tests/bugs/step/bug25523
index fb11b4c27e..c3b03d1fe1 100755
--- a/tests/bugs/step/bug25523
+++ b/tests/bugs/step/bug25523
@@ -7,7 +7,6 @@ puts ""
 #######################################################################
 
 restore [locate_data_file bug25523_bad_loopback_step.brep] a
-nbshapes a
 
 checknbshapes a -vertex 30 -edge 54 -wire 32 -face 27 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 145 -m "Stator model"
 
@@ -18,7 +17,6 @@ catch { file delete ${aFile} }
 stepwrite a a ${aFile}
 
 stepread ${aFile} b *
-nbshapes b_1 ;# empty compound
 checknbshapes b_1 -vertex 30 -edge 54 -wire 32 -face 27 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 145 -m "Stator model"
 
 tpstat c ;# reports exception
diff --git a/tests/bugs/step/bug3397 b/tests/bugs/step/bug3397
index 26b747535c..a8108c5e98 100755
--- a/tests/bugs/step/bug3397
+++ b/tests/bugs/step/bug3397
@@ -18,15 +18,7 @@ if [catch { stepread $filepath a * } res] {
     tpcompound result
     
     set square 1.48021e+06
-    set nb_v_good 1228
-    set nb_e_good 1938
-    set nb_w_good 762
-    set nb_f_good 696
-    set nb_sh_good 1
-    set nb_sol_good 1
-    set nb_compsol_good 0
-    set nb_compound_good 1
-    set nb_shape_good 4627
+    checknbshapes result -vertex 1228 -edge 1938 -wire 762 -face 696 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 4627
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/step/bug5027_2 b/tests/bugs/step/bug5027_2
index 9228dcf800..ec2f31f812 100755
--- a/tests/bugs/step/bug5027_2
+++ b/tests/bugs/step/bug5027_2
@@ -15,15 +15,7 @@ if [catch { stepread $filepath a * } res] {
     tpcompound result
     
     set square 159588
-    set nb_v_good 44
-    set nb_e_good 72
-    set nb_w_good 36
-    set nb_f_good 31
-    set nb_sh_good 1
-    set nb_sol_good 1
-    set nb_compsol_good 0 
-    set nb_compound_good 1
-    set nb_shape_good 186
+    checknbshapes result -vertex 44 -edge 72 -wire 36 -face 31 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 186
 }
 
 set 2dviewer 0
diff --git a/tests/bugs/step/bug926 b/tests/bugs/step/bug926
index c9be90b2a2..7842bac85d 100755
--- a/tests/bugs/step/bug926
+++ b/tests/bugs/step/bug926
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error on Record"
-puts "TODO OCC12345 ALL: OCC926 Faulty"
+puts "TODO OCC12345 ALL: Error : OCC926 is WRONG because number of "
 
 puts "================"
 puts "OCC926"
@@ -9,31 +9,7 @@ puts ""
 stepread [locate_data_file OCC926.stp] a *
 
 tpcompound result
-set list [nbshapes result]
 
-regexp {VERTEX +: +([-0-9.+eE]+)} $list full VERTEX
-regexp {EDGE +: +([-0-9.+eE]+)} $list full EDGE
-regexp {WIRE +: +([-0-9.+eE]+)} $list full WIRE
-regexp {FACE +: +([-0-9.+eE]+)} $list full FACE
-regexp {SHELL +: +([-0-9.+eE]+)} $list full SHELL
-regexp {SOLID +: +([-0-9.+eE]+)} $list full SOLID
-regexp {COMPSOLID +: +([-0-9.+eE]+)} $list full COMPSOLID
-regexp {COMPOUND +: +([-0-9.+eE]+)} $list full COMPOUND
-regexp {SHAPE +: +([-0-9.+eE]+)} $list full SHAPE
-
-if { $VERTEX != 4474 || \
-    $EDGE != 6907 || \
-    $WIRE != 3823 || \
-    $FACE != 3085 || \
-    $SHELL != 196 || \
-    $SOLID != 154 || \
-    $COMPSOLID != 0 || \
-    $COMPOUND != 32 || \
-    $SHAPE != 18671 } {
-    puts "OCC926 Faulty"
-} else {
-    puts "OCC926 OK"
-}
+checknbshapes result -vertex 4474 -edge 6907 -wire 3823 -face 3085 -shell 196 -solid 154 -compsolid 0 -compound 32 -shape 18671 -m "OCC926"
 
 set 2dviewer 0
-
diff --git a/tests/bugs/stlvrml/bug22092 b/tests/bugs/stlvrml/bug22092
index 0e4c169469..121d547c15 100755
--- a/tests/bugs/stlvrml/bug22092
+++ b/tests/bugs/stlvrml/bug22092
@@ -8,14 +8,5 @@ puts ""
 
 loadvrml result [locate_data_file OCC22092-sk97.wrl]
 
-set nb_v_good 16
-set nb_e_good 25
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 2
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 10
-set nb_shape_good 79
-
+checknbshapes result -vertex 16 -edge 25 -wire 13 -face 13 -shell 2 -solid 0 -compsolid 0 -compound 10 -shape 79
 set 3dviewer 0
diff --git a/tests/bugs/vis/bug21970 b/tests/bugs/vis/bug21970
index b95c5a1e09..da8b7895d5 100755
--- a/tests/bugs/vis/bug21970
+++ b/tests/bugs/vis/bug21970
@@ -1,7 +1,7 @@
 puts "TODO OCC11111 ALL: Faulty OCC21970"
 puts "TODO OCC11111 ALL: Error : The command is not valid. The square is"
 puts "TODO OCC11111 ALL: Error : The square of result shape is 0"
-puts "TODO OCC11111 ALL: Error : Result shape is WRONG"
+puts "TODO OCC11111 ALL: Error :  is WRONG because number of"
 
 puts "============"
 puts "OCC21970"
@@ -25,16 +25,7 @@ if {$r == 1} {
 
 set square 624989
 
-set nb_v_good 3806
-set nb_e_good 3808
-set nb_w_good 756
-set nb_f_good 730
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 9101
-
+checknbshapes result -vertex 3806 -edge 3808 -wire 756 -face 730 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 9101
 if { ${status1} != 0} {
    puts "Faulty ${BugNumber}"
 } else {
diff --git a/tests/bugs/vis/bug22188 b/tests/bugs/vis/bug22188
index cf6edd9008..65e69c5f99 100755
--- a/tests/bugs/vis/bug22188
+++ b/tests/bugs/vis/bug22188
@@ -77,16 +77,7 @@ if { ${deflection_percent} > ${percent_max} } {
 
 set square 32416.7
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 if { ${status} != 0 } {
    puts "Faulty ${BugNumber}"
 } else {
diff --git a/tests/bugs/vis/bug23153 b/tests/bugs/vis/bug23153
index a4cea94dda..cad4751fa3 100755
--- a/tests/bugs/vis/bug23153
+++ b/tests/bugs/vis/bug23153
@@ -16,16 +16,7 @@ decho on
 tpcompound result
 
 set square 14684.4
-set nb_v_good 1152
-set nb_e_good 1735
-set nb_w_good 635
-set nb_f_good 581
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 4106
-
+checknbshapes result -vertex 1152 -edge 1735 -wire 635 -face 581 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 4106
 vinit
 vsetdispmode 1
 vdisplay result
diff --git a/tests/bugs/vis/bug288_10 b/tests/bugs/vis/bug288_10
index 0ce4cc2711..680d166f0c 100755
--- a/tests/bugs/vis/bug288_10
+++ b/tests/bugs/vis/bug288_10
@@ -12,16 +12,7 @@ restore [locate_data_file shading_151.brep] result
 
 set square 52620.1
 
-set nb_v_good 20
-set nb_e_good 37
-set nb_w_good 21
-set nb_f_good 19
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 98
-
+checknbshapes result -vertex 20 -edge 37 -wire 21 -face 19 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 98
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/vis/bug288_6 b/tests/bugs/vis/bug288_6
index ccf0cfc56f..be9ae72c80 100755
--- a/tests/bugs/vis/bug288_6
+++ b/tests/bugs/vis/bug288_6
@@ -15,16 +15,7 @@ restore [locate_data_file OCC288-shading_176.brep] result
 
 set square 1.21055e+07
 
-set nb_v_good 667
-set nb_e_good 941
-set nb_w_good 368
-set nb_f_good 289
-set nb_sh_good 6
-set nb_sol_good 6
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 2278
-
+checknbshapes result -vertex 667 -edge 941 -wire 368 -face 289 -shell 6 -solid 6 -compsolid 0 -compound 1 -shape 2278
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/vis/bug288_7 b/tests/bugs/vis/bug288_7
index 6fc9c0f62a..58eee839b6 100755
--- a/tests/bugs/vis/bug288_7
+++ b/tests/bugs/vis/bug288_7
@@ -12,16 +12,7 @@ restore [locate_data_file shading_058.brep] result
 
 set square 14125.5
 
-set nb_v_good 23
-set nb_e_good 40
-set nb_w_good 19
-set nb_f_good 19
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 104
-
+checknbshapes result -vertex 23 -edge 40 -wire 19 -face 19 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 104
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/vis/bug288_8 b/tests/bugs/vis/bug288_8
index 5ee2b6db01..b53f292129 100755
--- a/tests/bugs/vis/bug288_8
+++ b/tests/bugs/vis/bug288_8
@@ -12,16 +12,7 @@ restore [locate_data_file shading_105.brep] result
 
 set length 265.239
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 7
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 7
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/vis/bug288_9 b/tests/bugs/vis/bug288_9
index e59dc018b2..489c30360e 100755
--- a/tests/bugs/vis/bug288_9
+++ b/tests/bugs/vis/bug288_9
@@ -12,16 +12,7 @@ restore [locate_data_file shading_107.brep] result
 
 set square 329710
 
-set nb_v_good 18
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 91
-
+checknbshapes result -vertex 18 -edge 36 -wire 18 -face 18 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 91
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/xde/bug12905 b/tests/bugs/xde/bug12905
index 54b0329a1b..fd313e355f 100755
--- a/tests/bugs/xde/bug12905
+++ b/tests/bugs/xde/bug12905
@@ -23,15 +23,7 @@ if {[catch { brepiges e1 ${EdgeFile} } ]} {
    if {[catch { igesbrep ${EdgeFile} result * } ]} {
       set IsOk 0
    } else {
-      set nb_v_good 2
-      set nb_e_good 1
-      set nb_w_good 0
-      set nb_f_good 0
-      set nb_sh_good 0
-      set nb_sol_good 0
-      set nb_compsol_good 0
-      set nb_compound_good 0
-      set nb_shape_good 3
+      checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 0 -shape 3
    }
 }
 
diff --git a/tests/bugs/xde/bug184 b/tests/bugs/xde/bug184
index 7e5554d7a1..da59d81780 100755
--- a/tests/bugs/xde/bug184
+++ b/tests/bugs/xde/bug184
@@ -10,17 +10,6 @@ puts "========"
 restore [locate_data_file OCC184.brep] FaceBrep 
 checkshape FaceBrep
 
-set dum1 [nbshapes FaceBrep]
-regexp {VERTEX +: +([-0-9.+eE]+)} $dum1 full nb_v1
-regexp {EDGE +: +([-0-9.+eE]+)} $dum1 full nb_e1
-regexp {WIRE +: +([-0-9.+eE]+)} $dum1 full nb_w1
-regexp {FACE +: +([-0-9.+eE]+)} $dum1 full nb_f1
-regexp {SHELL +: +([-0-9.+eE]+)} $dum1 full nb_sh1
-regexp {SOLID +: +([-0-9.+eE]+)} $dum1 full nb_sol1
-regexp {COMPSOLID +: +([-0-9.+eE]+)} $dum1 full nb_compsol1
-regexp {COMPOUND +: +([-0-9.+eE]+)} $dum1 full nb_compound1
-regexp {SHAPE +: +([-0-9.+eE]+)} $dum1 full nb_shape1
-
 regexp {Mass +: +([-0-9.+eE]+)} [sprops FaceBrep] full square1
 
 catch {exec rm ${imagedir}/OCC184.igs}
@@ -32,31 +21,9 @@ igesbrep ${imagedir}/OCC184.igs FaceIGES *
 sewing result FaceIGES
 checkshape result
 
-set dum2 [nbshapes result]
-regexp {VERTEX +: +([-0-9.+eE]+)} $dum2 full nb_v2
-regexp {EDGE +: +([-0-9.+eE]+)} $dum2 full nb_e2
-regexp {WIRE +: +([-0-9.+eE]+)} $dum2 full nb_w2
-regexp {FACE +: +([-0-9.+eE]+)} $dum2 full nb_f2
-regexp {SHELL +: +([-0-9.+eE]+)} $dum2 full nb_sh2
-regexp {SOLID +: +([-0-9.+eE]+)} $dum2 full nb_sol2
-regexp {COMPSOLID +: +([-0-9.+eE]+)} $dum2 full nb_compsol2
-regexp {COMPOUND +: +([-0-9.+eE]+)} $dum2 full nb_compound2
-regexp {SHAPE +: +([-0-9.+eE]+)} $dum2 full nb_shape2
-
 regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full square2
 
-
-if { ${nb_v2} != ${nb_v1} 
-    || ${nb_e2} != ${nb_e1} 
-    || ${nb_w2} != ${nb_w1} 
-    || ${nb_f2} != ${nb_f1} 
-    || ${nb_sh2} != ${nb_sh1} 
-    || ${nb_sol2} != ${nb_sol1} 
-    || ${nb_compsol2} != ${nb_compsol1} 
-    || ${nb_compound2} != ${nb_compound1} 
-    || ${nb_shape2} != ${nb_shape1} } {
-    puts "Error : Number of shapes is faulty"
-}
+checknbshapes result -ref [nbshapes FaceBrep]
 
 if { ${square2} != ${square1} } {
    puts "Error : Square is not valid"
diff --git a/tests/bugs/xde/bug22492 b/tests/bugs/xde/bug22492
index 4ebef2d7a7..b3c6e36ded 100755
--- a/tests/bugs/xde/bug22492
+++ b/tests/bugs/xde/bug22492
@@ -21,14 +21,5 @@ renamevar sc2 result
 
 set square 271280
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 10
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 1 -shape 10
 set 2dviewer 0
diff --git a/tests/bugs/xde/bug22535_1 b/tests/bugs/xde/bug22535_1
index f958faa47b..05b9895a01 100755
--- a/tests/bugs/xde/bug22535_1
+++ b/tests/bugs/xde/bug22535_1
@@ -18,14 +18,5 @@ vfit
 
 set square 14217.2
 
-set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 3
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 22
-
+checknbshapes result -vertex 6 -edge 9 -wire 3 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 22
 set 3dviewer 1
diff --git a/tests/bugs/xde/bug22535_2 b/tests/bugs/xde/bug22535_2
index bc216c97d6..55171e4a2a 100755
--- a/tests/bugs/xde/bug22535_2
+++ b/tests/bugs/xde/bug22535_2
@@ -18,14 +18,5 @@ vfit
 
 set square 50201.3
 
-set nb_v_good 15
-set nb_e_good 24
-set nb_w_good 9
-set nb_f_good 8
-set nb_sh_good 5
-set nb_sol_good 4
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 24 -wire 9 -face 8 -shell 5 -solid 4 -compsolid 0 -compound 1 -shape 66
 set 3dviewer 1
diff --git a/tests/bugs/xde/bug22670_1 b/tests/bugs/xde/bug22670_1
index ff3cb0591a..5c93d6005e 100755
--- a/tests/bugs/xde/bug22670_1
+++ b/tests/bugs/xde/bug22670_1
@@ -21,14 +21,5 @@ catch {exec chmod 777 ${aFile}}
 
 readstl result ${aFile}
 
-set nb_v_good 8
-set nb_e_good 18
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 51
-
+checknbshapes result -vertex 8 -edge 18 -wire 12 -face 12 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 51
 set 2dviewer 0
diff --git a/tests/bugs/xde/bug22670_2 b/tests/bugs/xde/bug22670_2
index 818b62a3cf..9cbafdb206 100755
--- a/tests/bugs/xde/bug22670_2
+++ b/tests/bugs/xde/bug22670_2
@@ -21,8 +21,6 @@ set filepath [locate_data_file OMF6391_box.stl]
 if { [catch { readstl res_mesh $filepath } catch_result] } {
     puts "Faulty ${BugNumber}: here is reading problem"
 } else {
-    set nbshapes_res_mesh [nbshapes res_mesh]
-
     set aFile $imagedir/${test_image}.stl
     catch {exec rm -f ${aFile}}
      
@@ -34,15 +32,7 @@ if { [catch { readstl res_mesh $filepath } catch_result] } {
 
     readstl result ${aFile}
 
-    set nb_v_good 8
-    set nb_e_good 18
-    set nb_w_good 12
-    set nb_f_good 12
-    set nb_sh_good 1
-    set nb_sol_good 0
-    set nb_compsol_good 0
-    set nb_compound_good 0
-    set nb_shape_good 51
+    checknbshapes result -vertex 8 -edge 18 -wire 12 -face 12 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 51
 }
 set square 600
 set 3dviewer 0
diff --git a/tests/bugs/xde/bug23182 b/tests/bugs/xde/bug23182
index b2251f4f3a..eaa05120c3 100755
--- a/tests/bugs/xde/bug23182
+++ b/tests/bugs/xde/bug23182
@@ -14,16 +14,7 @@ set CheckShape_status 0
 
 set square 1.24252
 
-set nb_v_good 98
-set nb_e_good 98
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 199
-
+checknbshapes result -vertex 98 -edge 98 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 199
 set aClosed [lindex [whatis result] end]
 if { ${aClosed} != "Orientable" } {
    set CheckShape_status 1
diff --git a/tests/bugs/xde/bug4648 b/tests/bugs/xde/bug4648
index 2305b49c8e..16b1aa3a85 100755
--- a/tests/bugs/xde/bug4648
+++ b/tests/bugs/xde/bug4648
@@ -1,4 +1,4 @@
-puts "TODO OCC12345 ALL: Faulty OCC4648"
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 
 puts "================"
 puts "OCC4648"
@@ -11,17 +11,6 @@ puts ""
 set BugNumber OCC4648
 
 igesbrep [locate_data_file annie_surf.igs] a *
-set info [nbshapes a]
-regexp {Mass +: +([-0-9.+eE]+)} [sprops a] full good_square
-regexp {VERTEX +: +([-0-9.+eE]+)} $info full good_vertex
-regexp {EDGE +: +([-0-9.+eE]+)} $info full good_edge
-regexp {WIRE +: +([-0-9.+eE]+)} $info full good_wire
-regexp {FACE +: +([-0-9.+eE]+)} $info full good_face
-regexp {SHELL +: +([-0-9.+eE]+)} $info full good_shell
-regexp {SOLID +: +([-0-9.+eE]+)} $info full good_solid
-regexp {COMPSOLID +: +([-0-9.+eE]+)} $info full good_compsolid
-regexp {COMPOUND +: +([-0-9.+eE]+)} $info full good_compound
-regexp {SHAPE +: +([-0-9.+eE]+)} $info full good_shape
 
 file delete ${imagedir}/annie
 stepwrite 0 a ${imagedir}/annie
@@ -34,30 +23,7 @@ if [catch { stepread ${imagedir}/annie b *} res] {
     puts "Faulty ${BugNumber} : stepread is wrong"
 } else {
     renamevar b_1 res
-    set info1 [nbshapes res]
-    regexp {Mass +: +([-0-9.+eE]+)} [sprops res] full sq
-    regexp {VERTEX +: +([-0-9.+eE]+)} $info1 full vertex
-    regexp {EDGE +: +([-0-9.+eE]+)} $info1 full edge
-    regexp {WIRE +: +([-0-9.+eE]+)} $info1 full wire
-    regexp {FACE +: +([-0-9.+eE]+)} $info1 full face
-    regexp {SHELL +: +([-0-9.+eE]+)} $info1 full shell
-    regexp {SOLID +: +([-0-9.+eE]+)} $info1 full solid
-    regexp {COMPSOLID +: +([-0-9.+eE]+)} $info1 full compsolid
-    regexp {COMPOUND +: +([-0-9.+eE]+)} $info1 full compound
-    regexp {SHAPE +: +([-0-9.+eE]+)} $info1 full shape
-	
-    if { $sq != $good_square
-	|| $vertex != $good_vertex
-	|| $edge != $good_edge
-	|| $wire != $good_wire
-	|| $face != $good_face
-	|| $shell != $good_shell
-	|| $solid != $good_solid
-	|| $compsolid != $good_compsolid
-	|| $compound != $good_compound
-	|| $shape != $good_shape } {
-	    puts "Faulty ${BugNumber}"
-    }
+    checknbshapes res -ref [nbshapes a]
 }
 
 file delete ${imagedir}/annie
diff --git a/tests/bugs/xde/bug6307 b/tests/bugs/xde/bug6307
index 3ec53eec4f..73dfae9573 100755
--- a/tests/bugs/xde/bug6307
+++ b/tests/bugs/xde/bug6307
@@ -27,14 +27,5 @@ vfit
 
 set square 141051
 
-set nb_v_good 84
-set nb_e_good 126
-set nb_w_good 76
-set nb_f_good 53
-set nb_sh_good 5
-set nb_sol_good 5
-set nb_compsol_good 0
-set nb_compound_good 4
-set nb_shape_good 353
-
+checknbshapes result -vertex 84 -edge 126 -wire 76 -face 53 -shell 5 -solid 5 -compsolid 0 -compound 4 -shape 353
 set only_screen 1
diff --git a/tests/bugs/xde/bug6491 b/tests/bugs/xde/bug6491
index 139ffe351f..d1e932cf47 100755
--- a/tests/bugs/xde/bug6491
+++ b/tests/bugs/xde/bug6491
@@ -13,16 +13,9 @@ restore [locate_data_file OCC6491.brep] a
 set tolerance 1000
 
 sewing result ${tolerance} a
-regexp {FACE +: +([-0-9.+eE]+)} [nbshapes result] full res_faces
-
-set good_faces 263
-
-if { ${res_faces} != ${good_faces} } {
-    puts "Faulty ${BugNumber}"
-}
 
+checknbshapes result -face 263 -shell 1
 checkmaxtol result -ref 185.91005891234283
-checknbshapes result -shell 1
 checkfreebounds result 73
 
 set 2dviewer 0
diff --git a/tests/bugs/xde/bug9490 b/tests/bugs/xde/bug9490
index 98dcde0142..9f254ddc83 100755
--- a/tests/bugs/xde/bug9490
+++ b/tests/bugs/xde/bug9490
@@ -38,63 +38,18 @@ if { ${IsOk} == 1} {
    if { ${Tolerance_percent}  > ${percent_max} } {
       set IsOk 0
    }
-
    set good_square 36259
-   set good_vertex 1770
-   set good_edge 1237
-   set good_wire 140
-   set good_face 123
-   set good_shell 0
-   set good_solid 0
-   set good_compsolid 0
-   set good_compound 1
-   set good_shape 3271
+   checknbshapes OCC9490a -vertex 1770 -edge 1237 -wire 140 -face 123 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 3271
 
-   set nb_info [nbshapes OCC9490a]
    regexp {Mass +: +([-0-9.+eE]+)} [sprops OCC9490a] full sq1
-   regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v1
-   regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full nb_e1
-   regexp {WIRE +: +([-0-9.+eE]+)} $nb_info full nb_w1
-   regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_f1
-   regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_sh1
-   regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_sol1
-   regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nb_compsol1
-   regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound1
-   regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_shape1
-   if {$sq1 != $good_square
-      || $nb_v1 != $good_vertex
-      || $nb_e1 != $good_edge
-      || $nb_w1 != $good_wire
-      || $nb_f1 != $good_face
-      || $nb_sh1 != $good_shell
-      || $nb_sol1 != $good_solid
-      || $nb_compsol1 != $good_compsolid
-      || $nb_compound1 != $good_compound
-      || $nb_shape1 != $good_shape } {
+   if {$sq1 != $good_square} {
       	 set IsOk 0
    }	
 
-   set nb_info [nbshapes OCC9490b]
+   checknbshapes OCC9490b -vertex 1770 -edge 1237 -wire 140 -face 123 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 3271
+
    regexp {Mass +: +([-0-9.+eE]+)} [sprops OCC9490b] full sq2
-   regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v2
-   regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full nb_e2
-   regexp {WIRE +: +([-0-9.+eE]+)} $nb_info full nb_w2
-   regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_f2
-   regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_sh2
-   regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_sol2
-   regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nb_compsol2
-   regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound2
-   regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_shape2
-   if {$sq2 != $good_square
-      || $nb_v2 != $good_vertex
-      || $nb_e2 != $good_edge
-      || $nb_w2 != $good_wire
-      || $nb_f2 != $good_face
-      || $nb_sh2 != $good_shell
-      || $nb_sol2 != $good_solid
-      || $nb_compsol2 != $good_compsolid
-      || $nb_compound2 != $good_compound
-      || $nb_shape2 != $good_shape } {
+   if {$sq2 != $good_square} {
       	 set IsOk 0
    }	
 
diff --git a/tests/bugs/xde/bug9531 b/tests/bugs/xde/bug9531
index d6468d9096..2dd203097b 100755
--- a/tests/bugs/xde/bug9531
+++ b/tests/bugs/xde/bug9531
@@ -1,3 +1,4 @@
+puts "TODO OCC12345 ALL: Error :  is WRONG because number of "
 puts "TODO OCC12345 ALL: OCC9531: Faulty"
 
 puts "============"
@@ -42,61 +43,19 @@ if { ${IsOk} == 1} {
    }
 
    set good_square 5236.89
-   set good_vertex 5748
-   set good_edge 5680
-   set good_wire 915
-   set good_face 899
-   set good_shell 0
-   set good_solid 0
-   set good_compsolid 0
-   set good_compound 1
-   set good_shape 13243
 
-   set nb_info [nbshapes OCC9531a]
+   checknbshapes OCC9531a -vertex 5748 -edge 5680 -wire 915 -face 899 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 13243
+
    regexp {Mass +: +([-0-9.+eE]+)} [sprops OCC9531a] full sq1
-   regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v1
-   regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full nb_e1
-   regexp {WIRE +: +([-0-9.+eE]+)} $nb_info full nb_w1
-   regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_f1
-   regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_sh1
-   regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_sol1
-   regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nb_compsol1
-   regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound1
-   regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_shape1
-   if {$sq1 != $good_square
-      || $nb_v1 != $good_vertex
-      || $nb_e1 != $good_edge
-      || $nb_w1 != $good_wire
-      || $nb_f1 != $good_face
-      || $nb_sh1 != $good_shell
-      || $nb_sol1 != $good_solid
-      || $nb_compsol1 != $good_compsolid
-      || $compound1 != $good_compound
-      || $nb_shape1 != $good_shape } {
+
+   if {$sq1 != $good_square} {
       	 set IsOk 0
    }	
 
-   set nb_info [nbshapes OCC9531b]
+   checknbshapes OCC9531b -vertex 5748 -edge 5680 -wire 915 -face 899 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 13243
+
    regexp {Mass +: +([-0-9.+eE]+)} [sprops OCC9531b] full sq2
-   regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v2
-   regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full nb_e2
-   regexp {WIRE +: +([-0-9.+eE]+)} $nb_info full nb_w2
-   regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_f2
-   regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_sh2
-   regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_sol2
-   regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nb_compsol2
-   regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound2
-   regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_shape2
-   if {$sq2 != $good_square
-      || $nb_v2 != $good_vertex
-      || $nb_e2 != $good_edge
-      || $nb_w2 != $good_wire
-      || $nb_f2 != $good_face
-      || $nb_sh2 != $good_shell
-      || $nb_sol2 != $good_solid
-      || $nb_compsol2 != $good_compsolid
-      || $compound2 != $good_compound
-      || $nb_shape2 != $good_shape } {
+   if {$sq2 != $good_square} {
       	 set IsOk 0
    }	
 
diff --git a/tests/fillet2d/end b/tests/fillet2d/end
index 0e6aecd50f..5ff14dd695 100644
--- a/tests/fillet2d/end
+++ b/tests/fillet2d/end
@@ -39,104 +39,6 @@ if { [info exists mass] } {
     }
 }
 
-set glob_inf [info global nb_*_good]
-if { [regexp "nb_.*_good" $glob_inf] == 1 } {
-    if { [info exists nbsh_t] } {
-      set nb_info [nbshapes result -t]
-    } else {
-      set nb_info [nbshapes result]
-    }
-}
-
-if { [info exists nb_v_good] } {
-    regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v
-    if { ${nb_v} != ${nb_v_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_v_good} vertices instead of ${nb_v}"
-    } else {
-        puts "Result shape contains ${nb_v} vertices"
-    }
-}
-
-if { [info exists nb_e_good] } {
-    regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full nb_e
-    if { ${nb_e} != ${nb_e_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_e_good} edges instead of ${nb_e}"
-    } else {
-        puts "Result shape contains ${nb_e} edges"
-    }
-}
-
-if { [info exists nb_w_good] } {
-    regexp {WIRE +: +([-0-9.+eE]+)} $nb_info full nb_w
-    if { ${nb_w} != ${nb_w_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_w_good} wires instead of ${nb_w}"
-    } else {
-        puts "Result shape contains ${nb_w} wires"
-    }
-}
-
-if { [info exists nb_f_good] } {
-    regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_f
-    if { ${nb_f} != ${nb_f_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_f_good} faces instead of ${nb_f}"
-    } else {
-        puts "Result shape contains ${nb_f} faces"
-    }
-}
-
-if { [info exists nb_sh_good] } {
-    regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_sh
-    if { ${nb_sh} != ${nb_sh_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_sh_good} shells instead of ${nb_sh}"
-    } else {
-        puts "Result shape contains ${nb_sh} shells"
-    }
-}
-
-if { [info exists nb_sol_good] } {
-    regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_sol
-    if { ${nb_sol} != ${nb_sol_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_sol_good} solids instead of ${nb_sol}"
-    } else {
-        puts "Result shape contains ${nb_sol} solids"
-    }
-}
-
-if { [info exists nb_compsol_good] } {
-    regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nb_compsol
-    if { ${nb_compsol} != ${nb_compsol_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_compsol_good} compsolids instead of ${nb_compsol}"
-    } else {
-        puts "Result shape contains ${nb_compsol} compsolids"
-    }
-}
-
-if { [info exists nb_compound_good] } {
-    regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound
-    if { ${nb_compound} != ${nb_compound_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_compound_good} compounds instead of ${nb_compound}"
-    } else {
-        puts "Result shape contains ${nb_compound} compounds"
-    }
-}
-
-if { [info exists nb_shape_good] } {
-    regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_shape
-    if { ${nb_shape} != ${nb_shape_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_shape_good} shapes instead of ${nb_shape}"
-    } else {
-        puts "Result shape contains ${nb_shape} shapes"
-    }
-}
-
-if { [info exists nb_fe_good] && [info exists nb_fe] } {
-    if { ${nb_fe} != ${nb_fe_good} } {
-        puts "Error : Result shape is WRONG because it must contains ${nb_shape_good} shapes instead of ${nb_shape}"
-    } else {
-        puts "Result shape contains ${nb_fe} free edges"
-    }
-}
-
 if { [info exists rel_tol] } {
    puts "\nChecking triangulation area (triarea command)..."
    set rel_err [expr abs([CheckTriArea result $area_eps])]
diff --git a/tests/nproject/base/bug24827_1 b/tests/nproject/base/bug24827_1
index ea3d2c991e..0d8ba1b811 100755
--- a/tests/nproject/base/bug24827_1
+++ b/tests/nproject/base/bug24827_1
@@ -11,14 +11,5 @@ explode c
 
 nproject result c_2 c_1 1.e-7
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set length 0.0008
diff --git a/tests/nproject/base/bug24827_2 b/tests/nproject/base/bug24827_2
index c71d086d96..2a13d7fffd 100755
--- a/tests/nproject/base/bug24827_2
+++ b/tests/nproject/base/bug24827_2
@@ -11,14 +11,5 @@ explode c
 
 nproject result c_3 c_1 1.e-7
 
-set nb_v_good 2
-set nb_e_good 1
-set nb_w_good 0
-set nb_f_good 0
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 4
-
+checknbshapes result -vertex 2 -edge 1 -wire 0 -face 0 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 4
 set length 0.0008
diff --git a/tests/offset/end b/tests/offset/end
index b62d11fdaa..6cb6790e94 100644
--- a/tests/offset/end
+++ b/tests/offset/end
@@ -39,7 +39,6 @@ if { [isdraw result] && $mist == 0} {
 		puts [format "Error : The resulting shape is an empty COMPOUND"]
 	    }
 	    puts [whatis result]
-	    puts [nbshapes result]
 	    puts [checksection result]
 	} else {
 	    puts [format "The resulting shape contains %s wires" $ll_w]
diff --git a/tests/perf/bop/buildfaces b/tests/perf/bop/buildfaces
index 05592f15b3..851c242edf 100644
--- a/tests/perf/bop/buildfaces
+++ b/tests/perf/bop/buildfaces
@@ -53,61 +53,8 @@ set info2 [bbuild rs -s -t]
 regexp {Tps: +([-0-9.+eE]+)} ${info2} full Tps2
 puts "Tps2=${Tps2}"
 
-set nb_v_good 23060
-set nb_e_good 35880
-set nb_w_good 11704
-set nb_f_good 11704
-set nb_sh_good 0
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 82349
-
-set dump1 [nbshapes rp]
-regexp {VERTEX +: +([-0-9.+eE]+)} ${dump1} full nb_v1
-regexp {EDGE +: +([-0-9.+eE]+)} ${dump1} full nb_e1
-regexp {WIRE +: +([-0-9.+eE]+)} ${dump1} full nb_w1
-regexp {FACE +: +([-0-9.+eE]+)} ${dump1} full nb_f1
-regexp {SHELL +: +([-0-9.+eE]+)} ${dump1} full nb_sh1
-regexp {SOLID +: +([-0-9.+eE]+)} ${dump1} full nb_sol1
-regexp {COMPSOLID +: +([-0-9.+eE]+)} ${dump1} full nb_compsol1
-regexp {COMPOUND +: +([-0-9.+eE]+)} ${dump1} full nb_compound1
-regexp {SHAPE +: +([-0-9.+eE]+)} ${dump1} full nb_shape1
-
-set dump2 [nbshapes rp]
-regexp {VERTEX +: +([-0-9.+eE]+)} ${dump2} full nb_v2
-regexp {EDGE +: +([-0-9.+eE]+)} ${dump2} full nb_e2
-regexp {WIRE +: +([-0-9.+eE]+)} ${dump2} full nb_w2
-regexp {FACE +: +([-0-9.+eE]+)} ${dump2} full nb_f2
-regexp {SHELL +: +([-0-9.+eE]+)} ${dump2} full nb_sh2
-regexp {SOLID +: +([-0-9.+eE]+)} ${dump2} full nb_sol2
-regexp {COMPSOLID +: +([-0-9.+eE]+)} ${dump2} full nb_compsol2
-regexp {COMPOUND +: +([-0-9.+eE]+)} ${dump2} full nb_compound2
-regexp {SHAPE +: +([-0-9.+eE]+)} ${dump2} full nb_shape2
-
-if { ${nb_v_good} != ${nb_v1} 
-    || ${nb_e_good} != ${nb_e1} 
-    || ${nb_w_good} != ${nb_w1} 
-    || ${nb_f_good} != ${nb_f1} 
-    || ${nb_sh_good} != ${nb_sh1} 
-    || ${nb_sol_good} != ${nb_sol1} 
-    || ${nb_compsol_good} != ${nb_compsol1} 
-    || ${nb_compound_good} != ${nb_compound1} 
-    || ${nb_shape_good} != ${nb_shape1} } {
-    puts "Error : Number of shapes is faulty"
-}
-
-if { ${nb_v2} != ${nb_v1} 
-    || ${nb_e2} != ${nb_e1} 
-    || ${nb_w2} != ${nb_w1} 
-    || ${nb_f2} != ${nb_f1} 
-    || ${nb_sh2} != ${nb_sh1} 
-    || ${nb_sol2} != ${nb_sol1} 
-    || ${nb_compsol2} != ${nb_compsol1} 
-    || ${nb_compound2} != ${nb_compound1} 
-    || ${nb_shape2} != ${nb_shape1} } {
-    puts "Error : Number of shapes is bad"
-}
+checknbshapes rp -vertex 23060 -edge 35880 -wire 11704 -face 11704 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 82349
+checknbshapes rs -vertex 23060 -edge 35880 -wire 11704 -face 11704 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 82349
 
 vinit
 vdisplay rs
diff --git a/tests/pipe/specific/A1 b/tests/pipe/specific/A1
index b905b05ae6..d5c7367b2c 100755
--- a/tests/pipe/specific/A1
+++ b/tests/pipe/specific/A1
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26820.4
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 39
-
+checknbshapes result -vertex 13 -edge 17 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 39
 set 2dviewer 0
diff --git a/tests/pipe/specific/A2 b/tests/pipe/specific/A2
index c36f766d64..741749329e 100755
--- a/tests/pipe/specific/A2
+++ b/tests/pipe/specific/A2
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26254.1
 
-set nb_v_good 11
-set nb_e_good 25
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 53
-
+checknbshapes result -vertex 11 -edge 25 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 53
 set 2dviewer 0
diff --git a/tests/pipe/specific/A3 b/tests/pipe/specific/A3
index 2697e8e29e..1f42526b93 100755
--- a/tests/pipe/specific/A3
+++ b/tests/pipe/specific/A3
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27236.9
 set volume 109187
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 44
-
+checknbshapes result -vertex 13 -edge 17 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 44
 set 2dviewer 0
diff --git a/tests/pipe/specific/A4 b/tests/pipe/specific/A4
index 46da9e6205..0a01ee8035 100755
--- a/tests/pipe/specific/A4
+++ b/tests/pipe/specific/A4
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26670.6
 set volume 107650
 
-set nb_v_good 11
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 11 -edge 25 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 58
 set 2dviewer 0
diff --git a/tests/pipe/specific/A5 b/tests/pipe/specific/A5
index aef808b696..b2fa7ce56d 100755
--- a/tests/pipe/specific/A5
+++ b/tests/pipe/specific/A5
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27409.5
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 39
-
+checknbshapes result -vertex 13 -edge 17 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 39
 set 2dviewer 0
 
diff --git a/tests/pipe/specific/A6 b/tests/pipe/specific/A6
index 028a97796c..dce97c7686 100755
--- a/tests/pipe/specific/A6
+++ b/tests/pipe/specific/A6
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26526.5
 
-set nb_v_good 10
-set nb_e_good 23
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 48
-
+checknbshapes result -vertex 10 -edge 23 -wire 7 -face 7 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 48
 set 2dviewer 0
diff --git a/tests/pipe/specific/A7 b/tests/pipe/specific/A7
index 7446a26f31..3b2bcb5804 100755
--- a/tests/pipe/specific/A7
+++ b/tests/pipe/specific/A7
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27826
 set volume 111585
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 44
-
+checknbshapes result -vertex 13 -edge 17 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 44
 set 2dviewer 0
diff --git a/tests/pipe/specific/A8 b/tests/pipe/specific/A8
index 9bfbacb8c6..4420df81cf 100755
--- a/tests/pipe/specific/A8
+++ b/tests/pipe/specific/A8
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26943
 set volume 108359
 
-set nb_v_good 10
-set nb_e_good 23
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 53
-
+checknbshapes result -vertex 10 -edge 23 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 53
 set 2dviewer 0
diff --git a/tests/pipe/specific/A9 b/tests/pipe/specific/A9
index 9682f7adda..ad524b1478 100755
--- a/tests/pipe/specific/A9
+++ b/tests/pipe/specific/A9
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26820.4
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 39
-
+checknbshapes result -vertex 13 -edge 17 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 39
 set 2dviewer 0
diff --git a/tests/pipe/specific/B1 b/tests/pipe/specific/B1
index 97b20253b1..111f65591e 100755
--- a/tests/pipe/specific/B1
+++ b/tests/pipe/specific/B1
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26254.1
 
-set nb_v_good 11
-set nb_e_good 25
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 53
-
+checknbshapes result -vertex 11 -edge 25 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 53
 set 2dviewer 0
diff --git a/tests/pipe/specific/B2 b/tests/pipe/specific/B2
index 7928918cd7..89fc5017e0 100755
--- a/tests/pipe/specific/B2
+++ b/tests/pipe/specific/B2
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27236.9
 set volume 109187
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 44
-
+checknbshapes result -vertex 13 -edge 17 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 44
 set 2dviewer 0
diff --git a/tests/pipe/specific/B3 b/tests/pipe/specific/B3
index 810c99c852..9500305ac0 100755
--- a/tests/pipe/specific/B3
+++ b/tests/pipe/specific/B3
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26670.6
 set volume 107650
 
-set nb_v_good 11
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 11 -edge 25 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 58
 set 2dviewer 0
diff --git a/tests/pipe/specific/B4 b/tests/pipe/specific/B4
index 4baf2bc061..5f61d9f6a1 100755
--- a/tests/pipe/specific/B4
+++ b/tests/pipe/specific/B4
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27409.5
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 39
-
+checknbshapes result -vertex 13 -edge 17 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 39
 set 2dviewer 0
diff --git a/tests/pipe/specific/B5 b/tests/pipe/specific/B5
index 68f56d6b83..4345986030 100755
--- a/tests/pipe/specific/B5
+++ b/tests/pipe/specific/B5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26526.5
 
-set nb_v_good 10
-set nb_e_good 23
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 48
-
+checknbshapes result -vertex 10 -edge 23 -wire 7 -face 7 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 48
 set 2dviewer 0
diff --git a/tests/pipe/specific/B6 b/tests/pipe/specific/B6
index 5212301ebc..f98efc5d57 100755
--- a/tests/pipe/specific/B6
+++ b/tests/pipe/specific/B6
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27826
 set volume 111585
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 44
-
+checknbshapes result -vertex 13 -edge 17 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 44
 set 2dviewer 0
diff --git a/tests/pipe/specific/B7 b/tests/pipe/specific/B7
index 71e2e8266d..8869663933 100755
--- a/tests/pipe/specific/B7
+++ b/tests/pipe/specific/B7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26943
 set volume 108359
 
-set nb_v_good 10
-set nb_e_good 23
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 53
-
+checknbshapes result -vertex 10 -edge 23 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 53
 set 2dviewer 0
diff --git a/tests/pipe/specific/B8 b/tests/pipe/specific/B8
index cc7e7063c8..5aa9050ef4 100755
--- a/tests/pipe/specific/B8
+++ b/tests/pipe/specific/B8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26820.4
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 39
-
+checknbshapes result -vertex 13 -edge 17 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 39
 set 2dviewer 0
diff --git a/tests/pipe/specific/B9 b/tests/pipe/specific/B9
index 23fbc33b03..5f8d86c0ec 100755
--- a/tests/pipe/specific/B9
+++ b/tests/pipe/specific/B9
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26254.1
 
-set nb_v_good 11
-set nb_e_good 25
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 53
-
+checknbshapes result -vertex 11 -edge 25 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 53
 set 2dviewer 0
diff --git a/tests/pipe/specific/C1 b/tests/pipe/specific/C1
index e7b38981df..2c7111ab07 100755
--- a/tests/pipe/specific/C1
+++ b/tests/pipe/specific/C1
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27236.9
 set volume 109187
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 44
-
+checknbshapes result -vertex 13 -edge 17 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 44
 set 2dviewer 0
diff --git a/tests/pipe/specific/C2 b/tests/pipe/specific/C2
index 05b204cb27..0b6b9fa208 100755
--- a/tests/pipe/specific/C2
+++ b/tests/pipe/specific/C2
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26670.6
 set volume 107650
 
-set nb_v_good 11
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 11 -edge 25 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 58
 set 2dviewer 0
diff --git a/tests/pipe/specific/C3 b/tests/pipe/specific/C3
index c8e7b3574e..cc29c56992 100755
--- a/tests/pipe/specific/C3
+++ b/tests/pipe/specific/C3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27409.5
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 39
-
+checknbshapes result -vertex 13 -edge 17 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 39
 set 2dviewer 0
diff --git a/tests/pipe/specific/C4 b/tests/pipe/specific/C4
index ab1bb93b84..80eb106494 100755
--- a/tests/pipe/specific/C4
+++ b/tests/pipe/specific/C4
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26526.5
 
-set nb_v_good 10
-set nb_e_good 23
-set nb_w_good 7
-set nb_f_good 7
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 48
-
+checknbshapes result -vertex 10 -edge 23 -wire 7 -face 7 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 48
 set 2dviewer 0
diff --git a/tests/pipe/specific/C5 b/tests/pipe/specific/C5
index 7a151878f8..f71c74333a 100755
--- a/tests/pipe/specific/C5
+++ b/tests/pipe/specific/C5
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27826
 set volume 111585
 
-set nb_v_good 13
-set nb_e_good 17
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 44
-
+checknbshapes result -vertex 13 -edge 17 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 44
 set 2dviewer 0
diff --git a/tests/pipe/specific/C6 b/tests/pipe/specific/C6
index 4b8da7c3c9..0306fb7adc 100755
--- a/tests/pipe/specific/C6
+++ b/tests/pipe/specific/C6
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26943
 set volume 108359
 
-set nb_v_good 10
-set nb_e_good 23
-set nb_w_good 9
-set nb_f_good 9
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 53
-
+checknbshapes result -vertex 10 -edge 23 -wire 9 -face 9 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 53
 set 2dviewer 0
diff --git a/tests/pipe/specific/C7 b/tests/pipe/specific/C7
index 2467a82c44..35c775fa9e 100755
--- a/tests/pipe/specific/C7
+++ b/tests/pipe/specific/C7
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 21356.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/C8 b/tests/pipe/specific/C8
index 39c5fe2826..10f9547941 100755
--- a/tests/pipe/specific/C8
+++ b/tests/pipe/specific/C8
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 21665
 set volume 57222.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/C9 b/tests/pipe/specific/C9
index 17483b4a75..58323c7ebd 100755
--- a/tests/pipe/specific/C9
+++ b/tests/pipe/specific/C9
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 23559.7
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/D1 b/tests/pipe/specific/D1
index 914a1d4a08..15d340bb4f 100755
--- a/tests/pipe/specific/D1
+++ b/tests/pipe/specific/D1
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 23868.4
 set volume 63128.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/D2 b/tests/pipe/specific/D2
index 0f1b83d0ef..746d4318c6 100755
--- a/tests/pipe/specific/D2
+++ b/tests/pipe/specific/D2
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24829.1
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/D3 b/tests/pipe/specific/D3
index 875535cb16..5957692548 100755
--- a/tests/pipe/specific/D3
+++ b/tests/pipe/specific/D3
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24374.6
 
-set nb_v_good 38
-set nb_e_good 74
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 173
-
+checknbshapes result -vertex 38 -edge 74 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 173
 set 2dviewer 0
diff --git a/tests/pipe/specific/D4 b/tests/pipe/specific/D4
index 5719dcbb57..72d178db14 100755
--- a/tests/pipe/specific/D4
+++ b/tests/pipe/specific/D4
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 25137.8
 set volume 80924.4
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/D5 b/tests/pipe/specific/D5
index 9a9e9fb0e2..6e97488757 100755
--- a/tests/pipe/specific/D5
+++ b/tests/pipe/specific/D5
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24683.4
 set volume 79937
 
-set nb_v_good 38
-set nb_e_good 74
-set nb_w_good 32
-set nb_f_good 32
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 178
-
+checknbshapes result -vertex 38 -edge 74 -wire 32 -face 32 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 178
 set 2dviewer 0
diff --git a/tests/pipe/specific/D6 b/tests/pipe/specific/D6
index 4f6a7ac431..69dc85163e 100755
--- a/tests/pipe/specific/D6
+++ b/tests/pipe/specific/D6
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27410
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/D7 b/tests/pipe/specific/D7
index 87fd139ea0..a1a0cb11f8 100755
--- a/tests/pipe/specific/D7
+++ b/tests/pipe/specific/D7
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26300.3
 
-set nb_v_good 43
-set nb_e_good 84
-set nb_w_good 35
-set nb_f_good 35
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 198
-
+checknbshapes result -vertex 43 -edge 84 -wire 35 -face 35 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 198
 set 2dviewer 0
diff --git a/tests/pipe/specific/D8 b/tests/pipe/specific/D8
index 2b38422ff8..309fa38506 100755
--- a/tests/pipe/specific/D8
+++ b/tests/pipe/specific/D8
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27718.7
 set volume 89336.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/D9 b/tests/pipe/specific/D9
index 8e8950d303..d4e2ae8645 100755
--- a/tests/pipe/specific/D9
+++ b/tests/pipe/specific/D9
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26609
 set volume 85867.7
 
-set nb_v_good 43
-set nb_e_good 84
-set nb_w_good 37
-set nb_f_good 37
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 203
-
+checknbshapes result -vertex 43 -edge 84 -wire 37 -face 37 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 203
 set 2dviewer 0
diff --git a/tests/pipe/specific/E1 b/tests/pipe/specific/E1
index 65d43c6b8f..4b6c008f73 100755
--- a/tests/pipe/specific/E1
+++ b/tests/pipe/specific/E1
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 21356.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/E2 b/tests/pipe/specific/E2
index ce5e5666bb..5711bcb6df 100755
--- a/tests/pipe/specific/E2
+++ b/tests/pipe/specific/E2
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 21665
 set volume 57222.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/E3 b/tests/pipe/specific/E3
index 7d31ef2975..6ceaac7894 100755
--- a/tests/pipe/specific/E3
+++ b/tests/pipe/specific/E3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 23559.7
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/E4 b/tests/pipe/specific/E4
index 43dd4d664a..eb7e0c1b3e 100755
--- a/tests/pipe/specific/E4
+++ b/tests/pipe/specific/E4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 23868.4
 set volume 63128.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/E5 b/tests/pipe/specific/E5
index e3ef3b2c89..0d1206b311 100755
--- a/tests/pipe/specific/E5
+++ b/tests/pipe/specific/E5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24829.1
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/E6 b/tests/pipe/specific/E6
index 9c69aabcc4..863a948fba 100755
--- a/tests/pipe/specific/E6
+++ b/tests/pipe/specific/E6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24374.6
 
-set nb_v_good 38
-set nb_e_good 74
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 173
-
+checknbshapes result -vertex 38 -edge 74 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 173
 set 2dviewer 0
diff --git a/tests/pipe/specific/E7 b/tests/pipe/specific/E7
index ba10f8fbbc..22c3b2270d 100755
--- a/tests/pipe/specific/E7
+++ b/tests/pipe/specific/E7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 25137.8
 set volume 80924.4
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/E8 b/tests/pipe/specific/E8
index 2e7ee7b431..bb8593028a 100755
--- a/tests/pipe/specific/E8
+++ b/tests/pipe/specific/E8
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24683.4
 set volume 79937
 
-set nb_v_good 38
-set nb_e_good 74
-set nb_w_good 32
-set nb_f_good 32
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 178
-
+checknbshapes result -vertex 38 -edge 74 -wire 32 -face 32 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 178
 set 2dviewer 0
diff --git a/tests/pipe/specific/E9 b/tests/pipe/specific/E9
index 83ccd59989..613b1036e8 100755
--- a/tests/pipe/specific/E9
+++ b/tests/pipe/specific/E9
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27410
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/F1 b/tests/pipe/specific/F1
index fadae01794..48fdf56bda 100755
--- a/tests/pipe/specific/F1
+++ b/tests/pipe/specific/F1
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26300.3
 
-set nb_v_good 43
-set nb_e_good 84
-set nb_w_good 35
-set nb_f_good 35
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 198
-
+checknbshapes result -vertex 43 -edge 84 -wire 35 -face 35 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 198
 set 2dviewer 0
diff --git a/tests/pipe/specific/F2 b/tests/pipe/specific/F2
index 7e5bbf07a6..d8b46a3408 100755
--- a/tests/pipe/specific/F2
+++ b/tests/pipe/specific/F2
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27718.7
 set volume 89336.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/F3 b/tests/pipe/specific/F3
index dafbfe87b4..33fa0b4e3a 100755
--- a/tests/pipe/specific/F3
+++ b/tests/pipe/specific/F3
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26609
 set volume 85867.7
 
-set nb_v_good 43
-set nb_e_good 84
-set nb_w_good 37
-set nb_f_good 37
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 203
-
+checknbshapes result -vertex 43 -edge 84 -wire 37 -face 37 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 203
 set 2dviewer 0
diff --git a/tests/pipe/specific/F4 b/tests/pipe/specific/F4
index 46c1d69e9f..d44ac29f6a 100755
--- a/tests/pipe/specific/F4
+++ b/tests/pipe/specific/F4
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 21356.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/F5 b/tests/pipe/specific/F5
index a53cd2a88e..a67f398c86 100755
--- a/tests/pipe/specific/F5
+++ b/tests/pipe/specific/F5
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 21665
 set volume 57222.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/F6 b/tests/pipe/specific/F6
index cc69674c84..640b9cfa87 100755
--- a/tests/pipe/specific/F6
+++ b/tests/pipe/specific/F6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 23559.7
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/F7 b/tests/pipe/specific/F7
index 51ffb3145a..a0b92df81f 100755
--- a/tests/pipe/specific/F7
+++ b/tests/pipe/specific/F7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 23868.4
 set volume 63128.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/F8 b/tests/pipe/specific/F8
index 3dc88585e2..325280608c 100755
--- a/tests/pipe/specific/F8
+++ b/tests/pipe/specific/F8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24829.1
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/F9 b/tests/pipe/specific/F9
index 1d7c49f0d2..f1c2805499 100755
--- a/tests/pipe/specific/F9
+++ b/tests/pipe/specific/F9
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24374.6
 
-set nb_v_good 38
-set nb_e_good 74
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 173
-
+checknbshapes result -vertex 38 -edge 74 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 173
 set 2dviewer 0
diff --git a/tests/pipe/specific/G1 b/tests/pipe/specific/G1
index 10e4a829e0..ca954d2d73 100755
--- a/tests/pipe/specific/G1
+++ b/tests/pipe/specific/G1
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 25137.8
 set volume 80924.4
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/G2 b/tests/pipe/specific/G2
index b772e2e957..0c11be02b6 100755
--- a/tests/pipe/specific/G2
+++ b/tests/pipe/specific/G2
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24683.4
 set volume 79937
 
-set nb_v_good 38
-set nb_e_good 74
-set nb_w_good 32
-set nb_f_good 32
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 178
-
+checknbshapes result -vertex 38 -edge 74 -wire 32 -face 32 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 178
 set 2dviewer 0
diff --git a/tests/pipe/specific/G3 b/tests/pipe/specific/G3
index b0e562d54c..1a2a508b3d 100755
--- a/tests/pipe/specific/G3
+++ b/tests/pipe/specific/G3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27410
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 20
-set nb_f_good 20
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 111
-
+checknbshapes result -vertex 25 -edge 45 -wire 20 -face 20 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 111
 set 2dviewer 0
diff --git a/tests/pipe/specific/G4 b/tests/pipe/specific/G4
index 757fb85b9b..bb17724a6f 100755
--- a/tests/pipe/specific/G4
+++ b/tests/pipe/specific/G4
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26300.3
 
-set nb_v_good 43
-set nb_e_good 84
-set nb_w_good 35
-set nb_f_good 35
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 198
-
+checknbshapes result -vertex 43 -edge 84 -wire 35 -face 35 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 198
 set 2dviewer 0
diff --git a/tests/pipe/specific/G5 b/tests/pipe/specific/G5
index 30b7d78547..92afe23a3f 100755
--- a/tests/pipe/specific/G5
+++ b/tests/pipe/specific/G5
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27718.7
 set volume 89336.2
 
-set nb_v_good 25
-set nb_e_good 45
-set nb_w_good 22
-set nb_f_good 22
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 116
-
+checknbshapes result -vertex 25 -edge 45 -wire 22 -face 22 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 116
 set 2dviewer 0
diff --git a/tests/pipe/specific/G6 b/tests/pipe/specific/G6
index 630b8374dd..b3aeafcbc3 100755
--- a/tests/pipe/specific/G6
+++ b/tests/pipe/specific/G6
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 26609
 set volume 85867.7
 
-set nb_v_good 43
-set nb_e_good 84
-set nb_w_good 37
-set nb_f_good 37
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 203
-
+checknbshapes result -vertex 43 -edge 84 -wire 37 -face 37 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 203
 set 2dviewer 0
diff --git a/tests/pipe/specific/G7 b/tests/pipe/specific/G7
index ba0ea7c788..866a986b67 100755
--- a/tests/pipe/specific/G7
+++ b/tests/pipe/specific/G7
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20489.7
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/G8 b/tests/pipe/specific/G8
index 74e3c1b9c6..1c8a0a7984 100755
--- a/tests/pipe/specific/G8
+++ b/tests/pipe/specific/G8
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20709.4
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/G9 b/tests/pipe/specific/G9
index 26204a6fbe..056fa96308 100755
--- a/tests/pipe/specific/G9
+++ b/tests/pipe/specific/G9
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20971.7
 set volume 49125.1
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/H1 b/tests/pipe/specific/H1
index 153f471ed7..1a7379f6cb 100755
--- a/tests/pipe/specific/H1
+++ b/tests/pipe/specific/H1
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24005.2
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/H2 b/tests/pipe/specific/H2
index cebe1c917e..fa51c5cf95 100755
--- a/tests/pipe/specific/H2
+++ b/tests/pipe/specific/H2
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24267.6
 set volume 68736.5
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/H3 b/tests/pipe/specific/H3
index 0c4289c226..dbdec0c74d 100755
--- a/tests/pipe/specific/H3
+++ b/tests/pipe/specific/H3
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24371.2
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/H4 b/tests/pipe/specific/H4
index 061a62adff..5027bb1877 100755
--- a/tests/pipe/specific/H4
+++ b/tests/pipe/specific/H4
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 23772.9
 
-set nb_v_good 32
-set nb_e_good 61
-set nb_w_good 25
-set nb_f_good 25
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 144
-
+checknbshapes result -vertex 32 -edge 61 -wire 25 -face 25 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 144
 set 2dviewer 0
diff --git a/tests/pipe/specific/H5 b/tests/pipe/specific/H5
index bac2ca2164..7d08c4e38f 100755
--- a/tests/pipe/specific/H5
+++ b/tests/pipe/specific/H5
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24633.6
 set volume 69784.6
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/H6 b/tests/pipe/specific/H6
index 57985bdfcb..29dd4dea32 100755
--- a/tests/pipe/specific/H6
+++ b/tests/pipe/specific/H6
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24035.3
 set volume 68299.1
 
-set nb_v_good 32
-set nb_e_good 61
-set nb_w_good 27
-set nb_f_good 27
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 149
-
+checknbshapes result -vertex 32 -edge 61 -wire 27 -face 27 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 149
 set 2dviewer 0
diff --git a/tests/pipe/specific/H7 b/tests/pipe/specific/H7
index 42705675e0..8f05164b83 100755
--- a/tests/pipe/specific/H7
+++ b/tests/pipe/specific/H7
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20489.7
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/H8 b/tests/pipe/specific/H8
index b3f299cc65..53c8ea6fff 100755
--- a/tests/pipe/specific/H8
+++ b/tests/pipe/specific/H8
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20752.1
 set volume 48604.1
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/H9 b/tests/pipe/specific/H9
index 9dd2d7a2a0..08bf403003 100755
--- a/tests/pipe/specific/H9
+++ b/tests/pipe/specific/H9
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20709.4
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/I1 b/tests/pipe/specific/I1
index fc5324ad0f..ef272fe47a 100755
--- a/tests/pipe/specific/I1
+++ b/tests/pipe/specific/I1
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20971.7
 set volume 49125.1
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/I2 b/tests/pipe/specific/I2
index 99282293f4..53f6c93cde 100755
--- a/tests/pipe/specific/I2
+++ b/tests/pipe/specific/I2
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24005.2
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/I3 b/tests/pipe/specific/I3
index 42ee2ae612..33b7dfa557 100755
--- a/tests/pipe/specific/I3
+++ b/tests/pipe/specific/I3
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24267.6
 set volume 68736.5
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/I4 b/tests/pipe/specific/I4
index ce671cdd11..393f087839 100755
--- a/tests/pipe/specific/I4
+++ b/tests/pipe/specific/I4
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24371.2
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/I5 b/tests/pipe/specific/I5
index da618459df..5d802c8a30 100755
--- a/tests/pipe/specific/I5
+++ b/tests/pipe/specific/I5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 23772.9
 
-set nb_v_good 32
-set nb_e_good 61
-set nb_w_good 25
-set nb_f_good 25
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 144
-
+checknbshapes result -vertex 32 -edge 61 -wire 25 -face 25 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 144
 set 2dviewer 0
diff --git a/tests/pipe/specific/I6 b/tests/pipe/specific/I6
index 167ea9300f..9442b32000 100755
--- a/tests/pipe/specific/I6
+++ b/tests/pipe/specific/I6
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24633.6
 set volume 69784.6
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/I7 b/tests/pipe/specific/I7
index b0caf1662f..4cd3bed7ce 100755
--- a/tests/pipe/specific/I7
+++ b/tests/pipe/specific/I7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24035.3
 set volume 68299.1
 
-set nb_v_good 32
-set nb_e_good 61
-set nb_w_good 27
-set nb_f_good 27
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 149
-
+checknbshapes result -vertex 32 -edge 61 -wire 27 -face 27 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 149
 set 2dviewer 0
diff --git a/tests/pipe/specific/I8 b/tests/pipe/specific/I8
index 5b43be83ad..5211ad748d 100755
--- a/tests/pipe/specific/I8
+++ b/tests/pipe/specific/I8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20489.7
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/I9 b/tests/pipe/specific/I9
index 79a099cd15..8ea3bdd711 100755
--- a/tests/pipe/specific/I9
+++ b/tests/pipe/specific/I9
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20752.1
 set volume 48604.1
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/J1 b/tests/pipe/specific/J1
index 950f3e30f1..d4277c2bfc 100755
--- a/tests/pipe/specific/J1
+++ b/tests/pipe/specific/J1
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20709.4
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/J2 b/tests/pipe/specific/J2
index b56dfd048f..858de176f8 100755
--- a/tests/pipe/specific/J2
+++ b/tests/pipe/specific/J2
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 20971.7
 set volume 49125.1
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/J3 b/tests/pipe/specific/J3
index bcc832c914..bf2ffad54c 100755
--- a/tests/pipe/specific/J3
+++ b/tests/pipe/specific/J3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24005.2
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/J4 b/tests/pipe/specific/J4
index 9f4eb0ddf2..c423d2759c 100755
--- a/tests/pipe/specific/J4
+++ b/tests/pipe/specific/J4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24267.6
 set volume 68736.5
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/J5 b/tests/pipe/specific/J5
index 861e424a23..15807182dc 100755
--- a/tests/pipe/specific/J5
+++ b/tests/pipe/specific/J5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24371.2
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 16
-set nb_f_good 16
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 89
-
+checknbshapes result -vertex 20 -edge 36 -wire 16 -face 16 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 89
 set 2dviewer 0
diff --git a/tests/pipe/specific/J6 b/tests/pipe/specific/J6
index a529c0e2c9..ca9f7b323a 100755
--- a/tests/pipe/specific/J6
+++ b/tests/pipe/specific/J6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 23772.9
 
-set nb_v_good 32
-set nb_e_good 61
-set nb_w_good 25
-set nb_f_good 25
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 144
-
+checknbshapes result -vertex 32 -edge 61 -wire 25 -face 25 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 144
 set 2dviewer 0
diff --git a/tests/pipe/specific/J7 b/tests/pipe/specific/J7
index 1c9ac09de7..f31e1dff83 100755
--- a/tests/pipe/specific/J7
+++ b/tests/pipe/specific/J7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24633.6
 set volume 69784.6
 
-set nb_v_good 20
-set nb_e_good 36
-set nb_w_good 18
-set nb_f_good 18
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 94
-
+checknbshapes result -vertex 20 -edge 36 -wire 18 -face 18 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 94
 set 2dviewer 0
diff --git a/tests/pipe/specific/J8 b/tests/pipe/specific/J8
index a5d42958b5..bb424b3241 100755
--- a/tests/pipe/specific/J8
+++ b/tests/pipe/specific/J8
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 24035.3
 set volume 68299.1
 
-set nb_v_good 32
-set nb_e_good 61
-set nb_w_good 27
-set nb_f_good 27
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 149
-
+checknbshapes result -vertex 32 -edge 61 -wire 27 -face 27 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 149
 set 2dviewer 0
diff --git a/tests/pipe/specific/J9 b/tests/pipe/specific/J9
index e7404e36e9..1380babdb1 100755
--- a/tests/pipe/specific/J9
+++ b/tests/pipe/specific/J9
@@ -22,20 +22,17 @@ puts "##########################################################################
 puts "# (case /-/-/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 2570.32
 
-set nb_v_good 6
-set nb_e_good 7
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 6 -edge 7 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/K1 b/tests/pipe/specific/K1
index 2c6d4b8645..eff01ac64a 100755
--- a/tests/pipe/specific/K1
+++ b/tests/pipe/specific/K1
@@ -16,21 +16,19 @@ puts "##########################################################################
 puts "# (case /-CF/-/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 929.097
 set volume 939.398
 
-set nb_v_good 48
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 42
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 223
-
+checknbshapes result -vertex 48 -edge 90 -wire 42 -face 42 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 223
 set 2dviewer 0
diff --git a/tests/pipe/specific/K2 b/tests/pipe/specific/K2
index 89bd045d69..07f3ccdb46 100755
--- a/tests/pipe/specific/K2
+++ b/tests/pipe/specific/K2
@@ -20,20 +20,18 @@ puts "##########################################################################
 puts "# (case /-G/-/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-G w2 0 0"
-set addsweepOptions ""
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -G w2 0 0
+addsweep s2
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 242.434
 
-set nb_v_good 7
-set nb_e_good 13
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 29
-
+checknbshapes result -vertex 7 -edge 13 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 29
 set 2dviewer 0
diff --git a/tests/pipe/specific/K3 b/tests/pipe/specific/K3
index 457b83f90e..560ef6ad30 100755
--- a/tests/pipe/specific/K3
+++ b/tests/pipe/specific/K3
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30253.5
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/K4 b/tests/pipe/specific/K4
index 34ea3e4e0b..ede8561c06 100755
--- a/tests/pipe/specific/K4
+++ b/tests/pipe/specific/K4
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 32493.7
 set volume 108899
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/K5 b/tests/pipe/specific/K5
index 7f9f3bccb2..86c780893a 100755
--- a/tests/pipe/specific/K5
+++ b/tests/pipe/specific/K5
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 32349.5
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/K6 b/tests/pipe/specific/K6
index 577876ee07..b9b0a3d180 100755
--- a/tests/pipe/specific/K6
+++ b/tests/pipe/specific/K6
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 33467.5
 
-set nb_v_good 3
-set nb_e_good 8
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 8 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/K7 b/tests/pipe/specific/K7
index de905b47e8..627e3f26e9 100755
--- a/tests/pipe/specific/K7
+++ b/tests/pipe/specific/K7
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 34206.6
 set volume 117501
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/K8 b/tests/pipe/specific/K8
index 3147072ce4..eccfdea6f2 100755
--- a/tests/pipe/specific/K8
+++ b/tests/pipe/specific/K8
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 35327.9
 set volume 124779
 
-set nb_v_good 3
-set nb_e_good 8
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 3 -edge 8 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 set 2dviewer 0
diff --git a/tests/pipe/specific/K9 b/tests/pipe/specific/K9
index 4cbbeaad19..0e8f85d3f8 100755
--- a/tests/pipe/specific/K9
+++ b/tests/pipe/specific/K9
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30131.6
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/L1 b/tests/pipe/specific/L1
index 18d01831db..3945616f7a 100755
--- a/tests/pipe/specific/L1
+++ b/tests/pipe/specific/L1
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 32535.9
 set volume 103756
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/L2 b/tests/pipe/specific/L2
index ca68a5e34c..672509d1d0 100755
--- a/tests/pipe/specific/L2
+++ b/tests/pipe/specific/L2
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 32064.4
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/L3 b/tests/pipe/specific/L3
index dac18dc65e..ff56f24f03 100755
--- a/tests/pipe/specific/L3
+++ b/tests/pipe/specific/L3
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 36309.2
 
-set nb_v_good 4
-set nb_e_good 9
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 20
-
+checknbshapes result -vertex 4 -edge 9 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 20
 set 2dviewer 0
diff --git a/tests/pipe/specific/L4 b/tests/pipe/specific/L4
index 77c1164d7c..86c31812c4 100755
--- a/tests/pipe/specific/L4
+++ b/tests/pipe/specific/L4
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 34072.6
 set volume 112329
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/L5 b/tests/pipe/specific/L5
index 9059820569..3fab03f6b5 100755
--- a/tests/pipe/specific/L5
+++ b/tests/pipe/specific/L5
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 38315.9
 set volume 147866
 
-set nb_v_good 4
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 25
-
+checknbshapes result -vertex 4 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 25
 set 2dviewer 0
diff --git a/tests/pipe/specific/L6 b/tests/pipe/specific/L6
index baf7c49f21..8b85867a78 100755
--- a/tests/pipe/specific/L6
+++ b/tests/pipe/specific/L6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27860.8
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/L7 b/tests/pipe/specific/L7
index 7c973884e0..2ee1d335cd 100755
--- a/tests/pipe/specific/L7
+++ b/tests/pipe/specific/L7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30092.2
 set volume 80775.2
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/L8 b/tests/pipe/specific/L8
index d2d3a322cb..bed7ef8176 100755
--- a/tests/pipe/specific/L8
+++ b/tests/pipe/specific/L8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30617.5
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/L9 b/tests/pipe/specific/L9
index 9ac1d656b5..bebdf0497c 100755
--- a/tests/pipe/specific/L9
+++ b/tests/pipe/specific/L9
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 32179.2
 set volume 90680.2
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/M1 b/tests/pipe/specific/M1
index 06573b600b..ead3d8e944 100755
--- a/tests/pipe/specific/M1
+++ b/tests/pipe/specific/M1
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30131.6
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/M2 b/tests/pipe/specific/M2
index d3c9909187..c21728b681 100755
--- a/tests/pipe/specific/M2
+++ b/tests/pipe/specific/M2
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 32535.9
 set volume 103756
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/M3 b/tests/pipe/specific/M3
index 0ba5f78f43..8c2a8c3d73 100755
--- a/tests/pipe/specific/M3
+++ b/tests/pipe/specific/M3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 32800.5
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/M4 b/tests/pipe/specific/M4
index e51fe24f4f..158768daac 100755
--- a/tests/pipe/specific/M4
+++ b/tests/pipe/specific/M4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 34439.8
 set volume 112768
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/M5 b/tests/pipe/specific/M5
index 1af117f5f4..a2cc14b526 100755
--- a/tests/pipe/specific/M5
+++ b/tests/pipe/specific/M5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30253.5
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/M6 b/tests/pipe/specific/M6
index ac33320b06..c88e77b830 100755
--- a/tests/pipe/specific/M6
+++ b/tests/pipe/specific/M6
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 32493.7
 set volume 108899
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/M7 b/tests/pipe/specific/M7
index 8900034167..cb396c9a65 100755
--- a/tests/pipe/specific/M7
+++ b/tests/pipe/specific/M7
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 32349.5
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/M8 b/tests/pipe/specific/M8
index 6d2cc425b6..83120ed5c9 100755
--- a/tests/pipe/specific/M8
+++ b/tests/pipe/specific/M8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 33467.5
 
-set nb_v_good 3
-set nb_e_good 8
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 8 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/M9 b/tests/pipe/specific/M9
index d85968cce0..5b680cdced 100755
--- a/tests/pipe/specific/M9
+++ b/tests/pipe/specific/M9
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 34206.6
 set volume 117501
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/N1 b/tests/pipe/specific/N1
index 8e786a2d7d..96167db2a7 100755
--- a/tests/pipe/specific/N1
+++ b/tests/pipe/specific/N1
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 35327.9
 set volume 124779
 
-set nb_v_good 3
-set nb_e_good 8
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 23
-
+checknbshapes result -vertex 3 -edge 8 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 23
 set 2dviewer 0
diff --git a/tests/pipe/specific/N2 b/tests/pipe/specific/N2
index 4ef007393f..5b8a7408f3 100755
--- a/tests/pipe/specific/N2
+++ b/tests/pipe/specific/N2
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30131.6
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 set 2dviewer 0
diff --git a/tests/pipe/specific/N3 b/tests/pipe/specific/N3
index df82af09b8..5ebfaadf4f 100755
--- a/tests/pipe/specific/N3
+++ b/tests/pipe/specific/N3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 36309.2
 
-set nb_v_good 4
-set nb_e_good 9
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 20
-
+checknbshapes result -vertex 4 -edge 9 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 20
 set 2dviewer 0
diff --git a/tests/pipe/specific/N4 b/tests/pipe/specific/N4
index de1cf5d960..fbaef8137c 100755
--- a/tests/pipe/specific/N4
+++ b/tests/pipe/specific/N4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 34072.6
 set volume 112329
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 3 -edge 5 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 18
 set 2dviewer 0
diff --git a/tests/pipe/specific/N5 b/tests/pipe/specific/N5
index cc5eaae2df..917fcbc0fb 100755
--- a/tests/pipe/specific/N5
+++ b/tests/pipe/specific/N5
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 38315.9
 set volume 147866
 
-set nb_v_good 4
-set nb_e_good 9
-set nb_w_good 5
-set nb_f_good 5
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 25
-
+checknbshapes result -vertex 4 -edge 9 -wire 5 -face 5 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 25
 set 2dviewer 0
diff --git a/tests/pipe/specific/N6 b/tests/pipe/specific/N6
index a9c662ef36..5ff7ff37a0 100755
--- a/tests/pipe/specific/N6
+++ b/tests/pipe/specific/N6
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 28006.9
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/N7 b/tests/pipe/specific/N7
index 6948b440d0..87ac8f3f49 100755
--- a/tests/pipe/specific/N7
+++ b/tests/pipe/specific/N7
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30006.2
 set volume 80709.6
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/N8 b/tests/pipe/specific/N8
index 2ff36f6058..12f18e5e0d 100755
--- a/tests/pipe/specific/N8
+++ b/tests/pipe/specific/N8
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 29295.4
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/N9 b/tests/pipe/specific/N9
index 965ea8921e..7441f78b7a 100755
--- a/tests/pipe/specific/N9
+++ b/tests/pipe/specific/N9
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30965.4
 set volume 84188.2
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/O1 b/tests/pipe/specific/O1
index feb7d20687..3922d83268 100755
--- a/tests/pipe/specific/O1
+++ b/tests/pipe/specific/O1
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27924.2
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/O2 b/tests/pipe/specific/O2
index eb5d98ebf4..957858a44d 100755
--- a/tests/pipe/specific/O2
+++ b/tests/pipe/specific/O2
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30073
 set volume 76901
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/O3 b/tests/pipe/specific/O3
index b87c2f611c..b6c5a260c2 100755
--- a/tests/pipe/specific/O3
+++ b/tests/pipe/specific/O3
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 29267.5
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/O4 b/tests/pipe/specific/O4
index 00791649f9..3b975380b4 100755
--- a/tests/pipe/specific/O4
+++ b/tests/pipe/specific/O4
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 31054.5
 set volume 80305.2
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/O5 b/tests/pipe/specific/O5
index 4bf5fe843a..da378438cc 100755
--- a/tests/pipe/specific/O5
+++ b/tests/pipe/specific/O5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 25814.6
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/O6 b/tests/pipe/specific/O6
index f820487885..15c01bc26c 100755
--- a/tests/pipe/specific/O6
+++ b/tests/pipe/specific/O6
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27815.3
 set volume 59871
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/O7 b/tests/pipe/specific/O7
index 68d4cc0b6a..9e628f9bee 100755
--- a/tests/pipe/specific/O7
+++ b/tests/pipe/specific/O7
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 25419.9
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/O8 b/tests/pipe/specific/O8
index dd9d17647e..f37dc371a0 100755
--- a/tests/pipe/specific/O8
+++ b/tests/pipe/specific/O8
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27676
 set volume 59042
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/O9 b/tests/pipe/specific/O9
index 3ff5140944..f773ec8bc6 100755
--- a/tests/pipe/specific/O9
+++ b/tests/pipe/specific/O9
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27882.1
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/P1 b/tests/pipe/specific/P1
index 4e22952a75..6b50609e39 100755
--- a/tests/pipe/specific/P1
+++ b/tests/pipe/specific/P1
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30041.6
 set volume 76900.9
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/P2 b/tests/pipe/specific/P2
index ab8997ecd1..76d47a3ea0 100755
--- a/tests/pipe/specific/P2
+++ b/tests/pipe/specific/P2
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27282.7
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/P3 b/tests/pipe/specific/P3
index 9b63ea5791..d22ee1b3f3 100755
--- a/tests/pipe/specific/P3
+++ b/tests/pipe/specific/P3
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 29572.9
 set volume 74167.4
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/P4 b/tests/pipe/specific/P4
index 8a1693804b..8e64ed0431 100755
--- a/tests/pipe/specific/P4
+++ b/tests/pipe/specific/P4
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 28006.9
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/P5 b/tests/pipe/specific/P5
index cc622781c1..ee4ef5f125 100755
--- a/tests/pipe/specific/P5
+++ b/tests/pipe/specific/P5
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30006.2
 set volume 80709.6
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/P6 b/tests/pipe/specific/P6
index 0480585717..a29c207b54 100755
--- a/tests/pipe/specific/P6
+++ b/tests/pipe/specific/P6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 29295.4
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/P7 b/tests/pipe/specific/P7
index aa9a197b42..2f6d88693b 100755
--- a/tests/pipe/specific/P7
+++ b/tests/pipe/specific/P7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30965.4
 set volume 84188.2
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/P8 b/tests/pipe/specific/P8
index 39609b2b37..fc8dc61d4a 100755
--- a/tests/pipe/specific/P8
+++ b/tests/pipe/specific/P8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27924.2
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/P9 b/tests/pipe/specific/P9
index de3d629f32..2a772cbadb 100755
--- a/tests/pipe/specific/P9
+++ b/tests/pipe/specific/P9
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30073
 set volume 76901
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/Q1 b/tests/pipe/specific/Q1
index 6740af080d..9a7e43c502 100755
--- a/tests/pipe/specific/Q1
+++ b/tests/pipe/specific/Q1
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 29267.5
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 61
-
+checknbshapes result -vertex 15 -edge 25 -wire 10 -face 10 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 61
 set 2dviewer 0
diff --git a/tests/pipe/specific/Q2 b/tests/pipe/specific/Q2
index be3e653b79..50c081e92f 100755
--- a/tests/pipe/specific/Q2
+++ b/tests/pipe/specific/Q2
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 31054.5
 set volume 80305.2
 
-set nb_v_good 15
-set nb_e_good 25
-set nb_w_good 12
-set nb_f_good 12
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 15 -edge 25 -wire 12 -face 12 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/Q3 b/tests/pipe/specific/Q3
index 40694d46e5..c40f498009 100755
--- a/tests/pipe/specific/Q3
+++ b/tests/pipe/specific/Q3
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27135.6
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/Q4 b/tests/pipe/specific/Q4
index 0b77bd0cd7..eb1bf52bc9 100755
--- a/tests/pipe/specific/Q4
+++ b/tests/pipe/specific/Q4
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 29030.2
 set volume 68648
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/Q5 b/tests/pipe/specific/Q5
index a7e473c59d..5e58ec55a2 100755
--- a/tests/pipe/specific/Q5
+++ b/tests/pipe/specific/Q5
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 28434.6
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/Q6 b/tests/pipe/specific/Q6
index 53882b7794..b0699241d9 100755
--- a/tests/pipe/specific/Q6
+++ b/tests/pipe/specific/Q6
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30092
 set volume 72386.2
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/Q7 b/tests/pipe/specific/Q7
index e932fab717..123defcded 100755
--- a/tests/pipe/specific/Q7
+++ b/tests/pipe/specific/Q7
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27289.6
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/Q8 b/tests/pipe/specific/Q8
index de377557a0..8badded9c6 100755
--- a/tests/pipe/specific/Q8
+++ b/tests/pipe/specific/Q8
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 29331.9
 set volume 65400.7
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/Q9 b/tests/pipe/specific/Q9
index 1398d0aa2b..1bb3a0c4dd 100755
--- a/tests/pipe/specific/Q9
+++ b/tests/pipe/specific/Q9
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 28489.1
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/R1 b/tests/pipe/specific/R1
index 1bcf369e62..79b8db2233 100755
--- a/tests/pipe/specific/R1
+++ b/tests/pipe/specific/R1
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30287
 set volume 69136.9
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/R2 b/tests/pipe/specific/R2
index 6ed21cff62..160cfcb020 100755
--- a/tests/pipe/specific/R2
+++ b/tests/pipe/specific/R2
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 25522.2
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/R3 b/tests/pipe/specific/R3
index b611af7249..3f8b6a1bbe 100755
--- a/tests/pipe/specific/R3
+++ b/tests/pipe/specific/R3
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27417.2
 set volume 50977.6
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/R4 b/tests/pipe/specific/R4
index 49f89afff9..405e2b7c79 100755
--- a/tests/pipe/specific/R4
+++ b/tests/pipe/specific/R4
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27210.9
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/R5 b/tests/pipe/specific/R5
index 4241e42c50..69a8756b8d 100755
--- a/tests/pipe/specific/R5
+++ b/tests/pipe/specific/R5
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 28684.4
 set volume 55282.1
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/R6 b/tests/pipe/specific/R6
index 70508b6176..673e1c2ed9 100755
--- a/tests/pipe/specific/R6
+++ b/tests/pipe/specific/R6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27294.9
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/R7 b/tests/pipe/specific/R7
index 13a1e8b872..b6b099d068 100755
--- a/tests/pipe/specific/R7
+++ b/tests/pipe/specific/R7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 29343.7
 set volume 65439.6
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/R8 b/tests/pipe/specific/R8
index 2e7b843b0d..17f9dc5632 100755
--- a/tests/pipe/specific/R8
+++ b/tests/pipe/specific/R8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 28939
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/R9 b/tests/pipe/specific/R9
index 495b8647a1..7ec91eb7ff 100755
--- a/tests/pipe/specific/R9
+++ b/tests/pipe/specific/R9
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30505.5
 set volume 69371.6
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/S1 b/tests/pipe/specific/S1
index 1c8b70e397..504180a323 100755
--- a/tests/pipe/specific/S1
+++ b/tests/pipe/specific/S1
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27135.6
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/S2 b/tests/pipe/specific/S2
index 68c5673fa9..a0d8025b24 100755
--- a/tests/pipe/specific/S2
+++ b/tests/pipe/specific/S2
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 29030.2
 set volume 68648
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/S3 b/tests/pipe/specific/S3
index cec0b807dc..1a29257fec 100755
--- a/tests/pipe/specific/S3
+++ b/tests/pipe/specific/S3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 28434.6
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/S4 b/tests/pipe/specific/S4
index ef214c1311..1870d0d4c5 100755
--- a/tests/pipe/specific/S4
+++ b/tests/pipe/specific/S4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30092
 set volume 72386.2
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/S5 b/tests/pipe/specific/S5
index 707b8888c8..4e4dc1a7df 100755
--- a/tests/pipe/specific/S5
+++ b/tests/pipe/specific/S5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 27289.6
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 8
-set nb_f_good 8
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 49
-
+checknbshapes result -vertex 12 -edge 20 -wire 8 -face 8 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 49
 set 2dviewer 0
diff --git a/tests/pipe/specific/S6 b/tests/pipe/specific/S6
index 73493f4c22..099a61d079 100755
--- a/tests/pipe/specific/S6
+++ b/tests/pipe/specific/S6
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 29331.9
 set volume 65400.7
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/S7 b/tests/pipe/specific/S7
index 96fe742b65..dbfed0347a 100755
--- a/tests/pipe/specific/S7
+++ b/tests/pipe/specific/S7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 30287
 set volume 69136.9
 
-set nb_v_good 12
-set nb_e_good 20
-set nb_w_good 10
-set nb_f_good 10
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 54
-
+checknbshapes result -vertex 12 -edge 20 -wire 10 -face 10 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 54
 set 2dviewer 0
diff --git a/tests/pipe/specific/S8 b/tests/pipe/specific/S8
index 4aa8e051fe..c4c1203814 100755
--- a/tests/pipe/specific/S8
+++ b/tests/pipe/specific/S8
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57570.1
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 65
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 65
 set 2dviewer 0
diff --git a/tests/pipe/specific/S9 b/tests/pipe/specific/S9
index ed47ddbeff..a72d388c3d 100755
--- a/tests/pipe/specific/S9
+++ b/tests/pipe/specific/S9
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57281.5
 
-set nb_v_good 19
-set nb_e_good 44
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 90
-
+checknbshapes result -vertex 19 -edge 44 -wire 13 -face 13 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 90
 set 2dviewer 0
diff --git a/tests/pipe/specific/T1 b/tests/pipe/specific/T1
index 5db357f3b1..909c87b931 100755
--- a/tests/pipe/specific/T1
+++ b/tests/pipe/specific/T1
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57570.1
 set volume 234370
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/T2 b/tests/pipe/specific/T2
index 989a32d995..f7b6ce5662 100755
--- a/tests/pipe/specific/T2
+++ b/tests/pipe/specific/T2
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57281.5
 set volume 233587
 
-set nb_v_good 19
-set nb_e_good 44
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 91
-
+checknbshapes result -vertex 19 -edge 44 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 91
 set 2dviewer 0
diff --git a/tests/pipe/specific/T3 b/tests/pipe/specific/T3
index f7eeac530f..d6c86eac7e 100755
--- a/tests/pipe/specific/T3
+++ b/tests/pipe/specific/T3
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 61084.5
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 65
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 65
 set 2dviewer 0
diff --git a/tests/pipe/specific/T4 b/tests/pipe/specific/T4
index d2c7266963..4ddefc9390 100755
--- a/tests/pipe/specific/T4
+++ b/tests/pipe/specific/T4
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 61084.5
 set volume 248677
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/T5 b/tests/pipe/specific/T5
index 960cd2d993..4a640e9981 100755
--- a/tests/pipe/specific/T5
+++ b/tests/pipe/specific/T5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57570.1
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 65
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 65
 set 2dviewer 0
diff --git a/tests/pipe/specific/T6 b/tests/pipe/specific/T6
index 66e2bbe2e0..2bd332ff26 100755
--- a/tests/pipe/specific/T6
+++ b/tests/pipe/specific/T6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57281.5
 
-set nb_v_good 19
-set nb_e_good 44
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 90
-
+checknbshapes result -vertex 19 -edge 44 -wire 13 -face 13 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 90
 set 2dviewer 0
diff --git a/tests/pipe/specific/T7 b/tests/pipe/specific/T7
index 746691db79..e699ca6145 100755
--- a/tests/pipe/specific/T7
+++ b/tests/pipe/specific/T7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57570.1
 set volume 234370
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/T8 b/tests/pipe/specific/T8
index d12f36de47..cc19bee62e 100755
--- a/tests/pipe/specific/T8
+++ b/tests/pipe/specific/T8
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57281.5
 set volume 233587
 
-set nb_v_good 19
-set nb_e_good 44
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 91
-
+checknbshapes result -vertex 19 -edge 44 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 91
 set 2dviewer 0
diff --git a/tests/pipe/specific/T9 b/tests/pipe/specific/T9
index f9afc49dc8..2c973c745b 100755
--- a/tests/pipe/specific/T9
+++ b/tests/pipe/specific/T9
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 61084.5
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 65
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 65
 set 2dviewer 0
diff --git a/tests/pipe/specific/U1 b/tests/pipe/specific/U1
index 9d9150ac65..7667b50526 100755
--- a/tests/pipe/specific/U1
+++ b/tests/pipe/specific/U1
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 61084.5
 set volume 248677
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/U2 b/tests/pipe/specific/U2
index 87a7ccbc61..69b5d040f6 100755
--- a/tests/pipe/specific/U2
+++ b/tests/pipe/specific/U2
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57570.1
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 65
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 65
 set 2dviewer 0
diff --git a/tests/pipe/specific/U3 b/tests/pipe/specific/U3
index 8c044a19c1..6490ea0a6d 100755
--- a/tests/pipe/specific/U3
+++ b/tests/pipe/specific/U3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57281.5
 
-set nb_v_good 19
-set nb_e_good 44
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 90
-
+checknbshapes result -vertex 19 -edge 44 -wire 13 -face 13 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 90
 set 2dviewer 0
diff --git a/tests/pipe/specific/U4 b/tests/pipe/specific/U4
index e6e9671fad..ba3e4b3f41 100755
--- a/tests/pipe/specific/U4
+++ b/tests/pipe/specific/U4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57570.1
 set volume 234370
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/U5 b/tests/pipe/specific/U5
index 5afc1f1c33..bf5bf4eef7 100755
--- a/tests/pipe/specific/U5
+++ b/tests/pipe/specific/U5
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 57281.5
 set volume 233587
 
-set nb_v_good 19
-set nb_e_good 44
-set nb_w_good 13
-set nb_f_good 13
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 91
-
+checknbshapes result -vertex 19 -edge 44 -wire 13 -face 13 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 91
 set 2dviewer 0
diff --git a/tests/pipe/specific/U6 b/tests/pipe/specific/U6
index cbfc2e4cdb..341ea0155c 100755
--- a/tests/pipe/specific/U6
+++ b/tests/pipe/specific/U6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 61084.5
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 65
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 65
 set 2dviewer 0
diff --git a/tests/pipe/specific/U7 b/tests/pipe/specific/U7
index cdb18d12d3..bedddbdd1f 100755
--- a/tests/pipe/specific/U7
+++ b/tests/pipe/specific/U7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 61084.5
 set volume 248677
 
-set nb_v_good 23
-set nb_e_good 29
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 66
-
+checknbshapes result -vertex 23 -edge 29 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 66
 set 2dviewer 0
diff --git a/tests/pipe/specific/U8 b/tests/pipe/specific/U8
index a0cdb89dd1..f63dfe322e 100755
--- a/tests/pipe/specific/U8
+++ b/tests/pipe/specific/U8
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51164.1
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/U9 b/tests/pipe/specific/U9
index 27a6b0f2ef..896627655b 100755
--- a/tests/pipe/specific/U9
+++ b/tests/pipe/specific/U9
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51164.1
 set volume 159660
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/V1 b/tests/pipe/specific/V1
index 68c0d720d7..9c61d5d158 100755
--- a/tests/pipe/specific/V1
+++ b/tests/pipe/specific/V1
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T/-/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions ""
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result } res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 44321.1
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/V2 b/tests/pipe/specific/V2
index 2ecf0b4cfa..52d6fd7b4b 100755
--- a/tests/pipe/specific/V2
+++ b/tests/pipe/specific/V2
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51491.9
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/V3 b/tests/pipe/specific/V3
index 03c483a17e..3daad2e72a 100755
--- a/tests/pipe/specific/V3
+++ b/tests/pipe/specific/V3
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51491.9
 set volume 160683
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/V4 b/tests/pipe/specific/V4
index ff33c9beea..343ddb62f4 100755
--- a/tests/pipe/specific/V4
+++ b/tests/pipe/specific/V4
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53295.7
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/V5 b/tests/pipe/specific/V5
index 4732905421..64449905b6 100755
--- a/tests/pipe/specific/V5
+++ b/tests/pipe/specific/V5
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53064.2
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 290
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 290
 set 2dviewer 0
diff --git a/tests/pipe/specific/V6 b/tests/pipe/specific/V6
index 8d71dfaef9..3dc25d0737 100755
--- a/tests/pipe/specific/V6
+++ b/tests/pipe/specific/V6
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53295.7
 set volume 173704
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/V7 b/tests/pipe/specific/V7
index 88e9e65c34..4dc5d32982 100755
--- a/tests/pipe/specific/V7
+++ b/tests/pipe/specific/V7
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53064.2
 set volume 173202
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 291
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 291
 set 2dviewer 0
diff --git a/tests/pipe/specific/V8 b/tests/pipe/specific/V8
index fd5665d91d..e8ede0b555 100755
--- a/tests/pipe/specific/V8
+++ b/tests/pipe/specific/V8
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53667.2
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/V9 b/tests/pipe/specific/V9
index 6491cc0e5b..bdd1e9eda2 100755
--- a/tests/pipe/specific/V9
+++ b/tests/pipe/specific/V9
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53385.6
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 290
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 290
 set 2dviewer 0
diff --git a/tests/pipe/specific/W1 b/tests/pipe/specific/W1
index b5c9142eb4..0728c05376 100755
--- a/tests/pipe/specific/W1
+++ b/tests/pipe/specific/W1
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53667.2
 set volume 174915
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/W2 b/tests/pipe/specific/W2
index d3db471a84..4350d24680 100755
--- a/tests/pipe/specific/W2
+++ b/tests/pipe/specific/W2
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53385.6
 set volume 174243
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 291
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 291
 set 2dviewer 0
diff --git a/tests/pipe/specific/W3 b/tests/pipe/specific/W3
index 33d4e77f2f..9297491c61 100755
--- a/tests/pipe/specific/W3
+++ b/tests/pipe/specific/W3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51164.1
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/W4 b/tests/pipe/specific/W4
index 015ec48313..63da6a3649 100755
--- a/tests/pipe/specific/W4
+++ b/tests/pipe/specific/W4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51164.1
 set volume 159660
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/W5 b/tests/pipe/specific/W5
index 6a10084f7a..07957ae100 100755
--- a/tests/pipe/specific/W5
+++ b/tests/pipe/specific/W5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51491.9
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/W6 b/tests/pipe/specific/W6
index cb39c6889d..372f5d1464 100755
--- a/tests/pipe/specific/W6
+++ b/tests/pipe/specific/W6
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51491.9
 set volume 160683
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/W7 b/tests/pipe/specific/W7
index e466ebc20f..3724b29e3a 100755
--- a/tests/pipe/specific/W7
+++ b/tests/pipe/specific/W7
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53295.7
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/W8 b/tests/pipe/specific/W8
index dedef89713..3b8d3707cf 100755
--- a/tests/pipe/specific/W8
+++ b/tests/pipe/specific/W8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53064.2
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 290
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 290
 set 2dviewer 0
diff --git a/tests/pipe/specific/W9 b/tests/pipe/specific/W9
index 6c2dd0f66b..45c9bd8167 100755
--- a/tests/pipe/specific/W9
+++ b/tests/pipe/specific/W9
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53295.7
 set volume 173704
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/X1 b/tests/pipe/specific/X1
index 7fa4c3bf88..5e320784c2 100755
--- a/tests/pipe/specific/X1
+++ b/tests/pipe/specific/X1
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53064.2
 set volume 173202
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 291
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 291
 set 2dviewer 0
diff --git a/tests/pipe/specific/X2 b/tests/pipe/specific/X2
index 55bc5be724..cb9a991cab 100755
--- a/tests/pipe/specific/X2
+++ b/tests/pipe/specific/X2
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53667.2
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/X3 b/tests/pipe/specific/X3
index fc42eb7f43..906dd3f822 100755
--- a/tests/pipe/specific/X3
+++ b/tests/pipe/specific/X3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53385.6
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 290
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 290
 set 2dviewer 0
diff --git a/tests/pipe/specific/X4 b/tests/pipe/specific/X4
index 77e081392d..d627d770e3 100755
--- a/tests/pipe/specific/X4
+++ b/tests/pipe/specific/X4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53667.2
 set volume 174915
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/X5 b/tests/pipe/specific/X5
index fad0731084..766e328b9a 100755
--- a/tests/pipe/specific/X5
+++ b/tests/pipe/specific/X5
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53385.6
 set volume 174243
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 291
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 291
 set 2dviewer 0
diff --git a/tests/pipe/specific/X6 b/tests/pipe/specific/X6
index db49e53e82..d2b9b0bc58 100755
--- a/tests/pipe/specific/X6
+++ b/tests/pipe/specific/X6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51164.1
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/X7 b/tests/pipe/specific/X7
index a0cc330b3a..5a8099a94d 100755
--- a/tests/pipe/specific/X7
+++ b/tests/pipe/specific/X7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51164.1
 set volume 159660
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/X8 b/tests/pipe/specific/X8
index 933b7e492d..ac00d93ce6 100755
--- a/tests/pipe/specific/X8
+++ b/tests/pipe/specific/X8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51491.9
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/X9 b/tests/pipe/specific/X9
index e3592bde1f..f954c4edcc 100755
--- a/tests/pipe/specific/X9
+++ b/tests/pipe/specific/X9
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51491.9
 set volume 160683
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/Y1 b/tests/pipe/specific/Y1
index 65b5265bf4..2631f48d30 100755
--- a/tests/pipe/specific/Y1
+++ b/tests/pipe/specific/Y1
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53295.7
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/Y2 b/tests/pipe/specific/Y2
index c35adb2e9e..7a61cc6bbe 100755
--- a/tests/pipe/specific/Y2
+++ b/tests/pipe/specific/Y2
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53064.2
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 290
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 290
 set 2dviewer 0
diff --git a/tests/pipe/specific/Y3 b/tests/pipe/specific/Y3
index be5b281d97..59f5ab3be7 100755
--- a/tests/pipe/specific/Y3
+++ b/tests/pipe/specific/Y3
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53295.7
 set volume 173704
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/Y4 b/tests/pipe/specific/Y4
index ef3b878e3c..59b3d0ceef 100755
--- a/tests/pipe/specific/Y4
+++ b/tests/pipe/specific/Y4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53064.2
 set volume 173202
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 291
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 291
 set 2dviewer 0
diff --git a/tests/pipe/specific/Y5 b/tests/pipe/specific/Y5
index c4fd5cf247..bc241d5bec 100755
--- a/tests/pipe/specific/Y5
+++ b/tests/pipe/specific/Y5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53667.2
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 151
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 151
 set 2dviewer 0
diff --git a/tests/pipe/specific/Y6 b/tests/pipe/specific/Y6
index d95b97d926..c041190352 100755
--- a/tests/pipe/specific/Y6
+++ b/tests/pipe/specific/Y6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53385.6
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 290
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 290
 set 2dviewer 0
diff --git a/tests/pipe/specific/Y7 b/tests/pipe/specific/Y7
index 2b1b2f85b7..988c9894df 100755
--- a/tests/pipe/specific/Y7
+++ b/tests/pipe/specific/Y7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53667.2
 set volume 174915
 
-set nb_v_good 30
-set nb_e_good 60
-set nb_w_good 30
-set nb_f_good 30
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 152
-
+checknbshapes result -vertex 30 -edge 60 -wire 30 -face 30 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 152
 set 2dviewer 0
diff --git a/tests/pipe/specific/Y8 b/tests/pipe/specific/Y8
index 17f3f9cf26..627a2aa727 100755
--- a/tests/pipe/specific/Y8
+++ b/tests/pipe/specific/Y8
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53385.6
 set volume 174243
 
-set nb_v_good 59
-set nb_e_good 124
-set nb_w_good 53
-set nb_f_good 53
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 291
-
+checknbshapes result -vertex 59 -edge 124 -wire 53 -face 53 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 291
 set 2dviewer 0
diff --git a/tests/pipe/specific/Y9 b/tests/pipe/specific/Y9
index 5ba10c094f..9dd5d0f6f6 100755
--- a/tests/pipe/specific/Y9
+++ b/tests/pipe/specific/Y9
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 49509.6
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/Z1 b/tests/pipe/specific/Z1
index ed5c8392a3..8b41bef513 100755
--- a/tests/pipe/specific/Z1
+++ b/tests/pipe/specific/Z1
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 49509.6
 set volume 135793
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/Z2 b/tests/pipe/specific/Z2
index c38fbe4dbf..f8528460c9 100755
--- a/tests/pipe/specific/Z2
+++ b/tests/pipe/specific/Z2
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51424.7
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/Z3 b/tests/pipe/specific/Z3
index 806b49e55d..c32c15a4b6 100755
--- a/tests/pipe/specific/Z3
+++ b/tests/pipe/specific/Z3
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51424.7
 set volume 141046
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/Z4 b/tests/pipe/specific/Z4
index 2cef0d1f28..c444d08ea9 100755
--- a/tests/pipe/specific/Z4
+++ b/tests/pipe/specific/Z4
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51595.5
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/Z5 b/tests/pipe/specific/Z5
index 29c24fa016..de8a423a22 100755
--- a/tests/pipe/specific/Z5
+++ b/tests/pipe/specific/Z5
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51376.4
 
-set nb_v_good 48
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 42
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 223
-
+checknbshapes result -vertex 48 -edge 90 -wire 42 -face 42 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 223
 set 2dviewer 0
diff --git a/tests/pipe/specific/Z6 b/tests/pipe/specific/Z6
index 9498ccd402..52fbc0833d 100755
--- a/tests/pipe/specific/Z6
+++ b/tests/pipe/specific/Z6
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51595.5
 set volume 147739
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/Z7 b/tests/pipe/specific/Z7
index 26af616617..9a9af51ce4 100755
--- a/tests/pipe/specific/Z7
+++ b/tests/pipe/specific/Z7
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51376.4
 set volume 147316
 
-set nb_v_good 48
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 42
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 224
-
+checknbshapes result -vertex 48 -edge 90 -wire 42 -face 42 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 224
 set 2dviewer 0
diff --git a/tests/pipe/specific/Z8 b/tests/pipe/specific/Z8
index 2d088cfa90..aaa9119736 100755
--- a/tests/pipe/specific/Z8
+++ b/tests/pipe/specific/Z8
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53770.3
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/Z9 b/tests/pipe/specific/Z9
index 77bc1a7cad..2d72124f49 100755
--- a/tests/pipe/specific/Z9
+++ b/tests/pipe/specific/Z9
@@ -15,20 +15,17 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53202.2
 
-set nb_v_good 34
-set nb_e_good 73
-set nb_w_good 39
-set nb_f_good 39
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 186
-
+checknbshapes result -vertex 34 -edge 73 -wire 39 -face 39 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 186
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZA1 b/tests/pipe/specific/ZA1
index e2e261632f..304a9e7ab8 100755
--- a/tests/pipe/specific/ZA1
+++ b/tests/pipe/specific/ZA1
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53770.3
 set volume 153966
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZA2 b/tests/pipe/specific/ZA2
index 0550aedb21..663667e618 100755
--- a/tests/pipe/specific/ZA2
+++ b/tests/pipe/specific/ZA2
@@ -15,21 +15,18 @@ puts "##########################################################################
 puts "# (case /-/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions ""
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53202.2
 set volume 152339
 
-set nb_v_good 34
-set nb_e_good 73
-set nb_w_good 39
-set nb_f_good 39
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 187
-
+checknbshapes result -vertex 34 -edge 73 -wire 39 -face 39 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 187
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZA3 b/tests/pipe/specific/ZA3
index 62a65f3c4b..5b37b74b0f 100755
--- a/tests/pipe/specific/ZA3
+++ b/tests/pipe/specific/ZA3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 49509.6
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZA4 b/tests/pipe/specific/ZA4
index 40f6331e28..e204b67011 100755
--- a/tests/pipe/specific/ZA4
+++ b/tests/pipe/specific/ZA4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 49509.6
 set volume 135793
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZA5 b/tests/pipe/specific/ZA5
index 42df5a96b8..b6e3632446 100755
--- a/tests/pipe/specific/ZA5
+++ b/tests/pipe/specific/ZA5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51424.7
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZA6 b/tests/pipe/specific/ZA6
index 1a27f60b1c..4b1fcff2b9 100755
--- a/tests/pipe/specific/ZA6
+++ b/tests/pipe/specific/ZA6
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51424.7
 set volume 141046
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZA7 b/tests/pipe/specific/ZA7
index 34615bb86d..86e35d8d31 100755
--- a/tests/pipe/specific/ZA7
+++ b/tests/pipe/specific/ZA7
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51595.5
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZA8 b/tests/pipe/specific/ZA8
index c865d0934e..3239cacde5 100755
--- a/tests/pipe/specific/ZA8
+++ b/tests/pipe/specific/ZA8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51376.4
 
-set nb_v_good 48
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 42
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 223
-
+checknbshapes result -vertex 48 -edge 90 -wire 42 -face 42 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 223
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZA9 b/tests/pipe/specific/ZA9
index 45578ad49c..6ad2a3d2c6 100755
--- a/tests/pipe/specific/ZA9
+++ b/tests/pipe/specific/ZA9
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51595.5
 set volume 147739
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZB1 b/tests/pipe/specific/ZB1
index 688455d714..50d1a9eb5c 100755
--- a/tests/pipe/specific/ZB1
+++ b/tests/pipe/specific/ZB1
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51376.4
 set volume 147316
 
-set nb_v_good 48
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 42
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 224
-
+checknbshapes result -vertex 48 -edge 90 -wire 42 -face 42 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 224
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZB2 b/tests/pipe/specific/ZB2
index bafca78c1c..9a86bf4d5f 100755
--- a/tests/pipe/specific/ZB2
+++ b/tests/pipe/specific/ZB2
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53770.3
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZB3 b/tests/pipe/specific/ZB3
index 2acc447801..95126b2541 100755
--- a/tests/pipe/specific/ZB3
+++ b/tests/pipe/specific/ZB3
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53202.2
 
-set nb_v_good 34
-set nb_e_good 73
-set nb_w_good 39
-set nb_f_good 39
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 186
-
+checknbshapes result -vertex 34 -edge 73 -wire 39 -face 39 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 186
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZB4 b/tests/pipe/specific/ZB4
index 5830984430..f2e1e44690 100755
--- a/tests/pipe/specific/ZB4
+++ b/tests/pipe/specific/ZB4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53770.3
 set volume 153966
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZB5 b/tests/pipe/specific/ZB5
index f6a53d7071..6b79a3e2c8 100755
--- a/tests/pipe/specific/ZB5
+++ b/tests/pipe/specific/ZB5
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-FR/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-FR"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -FR
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53202.2
 set volume 152339
 
-set nb_v_good 34
-set nb_e_good 73
-set nb_w_good 39
-set nb_f_good 39
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 187
-
+checknbshapes result -vertex 34 -edge 73 -wire 39 -face 39 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 187
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZB6 b/tests/pipe/specific/ZB6
index abb5117f89..24479a6529 100755
--- a/tests/pipe/specific/ZB6
+++ b/tests/pipe/specific/ZB6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 49509.6
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZB7 b/tests/pipe/specific/ZB7
index 523594810c..914dc42fc9 100755
--- a/tests/pipe/specific/ZB7
+++ b/tests/pipe/specific/ZB7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions ""
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 49509.6
 set volume 135793
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZB8 b/tests/pipe/specific/ZB8
index 148435c18a..e2a96d7581 100755
--- a/tests/pipe/specific/ZB8
+++ b/tests/pipe/specific/ZB8
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51424.7
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZB9 b/tests/pipe/specific/ZB9
index 01b58bb372..ee58df6122 100755
--- a/tests/pipe/specific/ZB9
+++ b/tests/pipe/specific/ZB9
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51424.7
 set volume 141046
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZC1 b/tests/pipe/specific/ZC1
index 3d4a9492a9..0089830821 100755
--- a/tests/pipe/specific/ZC1
+++ b/tests/pipe/specific/ZC1
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51595.5
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZC2 b/tests/pipe/specific/ZC2
index 09d0eb9c98..a4747e8733 100755
--- a/tests/pipe/specific/ZC2
+++ b/tests/pipe/specific/ZC2
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51376.4
 
-set nb_v_good 48
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 42
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 223
-
+checknbshapes result -vertex 48 -edge 90 -wire 42 -face 42 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 223
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZC3 b/tests/pipe/specific/ZC3
index ef4238627c..c874387b0a 100755
--- a/tests/pipe/specific/ZC3
+++ b/tests/pipe/specific/ZC3
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51595.5
 set volume 147739
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZC4 b/tests/pipe/specific/ZC4
index 3310dd1843..c14123a87f 100755
--- a/tests/pipe/specific/ZC4
+++ b/tests/pipe/specific/ZC4
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 51376.4
 set volume 147316
 
-set nb_v_good 48
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 42
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 224
-
+checknbshapes result -vertex 48 -edge 90 -wire 42 -face 42 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 224
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZC5 b/tests/pipe/specific/ZC5
index eeaf0fe5d7..1e68da77f0 100755
--- a/tests/pipe/specific/ZC5
+++ b/tests/pipe/specific/ZC5
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53770.3
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 121
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 121
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZC6 b/tests/pipe/specific/ZC6
index 2d060bce84..bf9ce48f42 100755
--- a/tests/pipe/specific/ZC6
+++ b/tests/pipe/specific/ZC6
@@ -15,20 +15,18 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53202.2
 
-set nb_v_good 34
-set nb_e_good 73
-set nb_w_good 39
-set nb_f_good 39
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 186
-
+checknbshapes result -vertex 34 -edge 73 -wire 39 -face 39 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 186
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZC7 b/tests/pipe/specific/ZC7
index 9e4d0f7ff9..7328374d79 100755
--- a/tests/pipe/specific/ZC7
+++ b/tests/pipe/specific/ZC7
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-C -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-C -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -C -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53770.3
 set volume 153966
 
-set nb_v_good 24
-set nb_e_good 48
-set nb_w_good 24
-set nb_f_good 24
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 122
-
+checknbshapes result -vertex 24 -edge 48 -wire 24 -face 24 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 122
 set 2dviewer 0
diff --git a/tests/pipe/specific/ZC8 b/tests/pipe/specific/ZC8
index e846d5658b..3dfe48a5cb 100755
--- a/tests/pipe/specific/ZC8
+++ b/tests/pipe/specific/ZC8
@@ -15,21 +15,19 @@ puts "##########################################################################
 puts "# (case /-CF/-T -R/-R -S/)"
 puts "###############################################################################"
 
-set setsweepOptions "-CF"
-set addsweepOptions "-T -R"
-set buildsweepOptions "-R -S"
+checkshape s1
+checkshape s2
+
+mksweep s1
+
+setsweep -CF
+addsweep s2 -T -R
+if [catch { buildsweep result -R -S} res] {
+  puts "Faulty OCC1477: buildsweep is wrong"
+}
 
 set square 53202.2
 set volume 152339
 
-set nb_v_good 34
-set nb_e_good 73
-set nb_w_good 39
-set nb_f_good 39
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 187
-
+checknbshapes result -vertex 34 -edge 73 -wire 39 -face 39 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 187
 set 2dviewer 0
diff --git a/tests/pipe/specific/end b/tests/pipe/specific/end
index 913b421bca..3fe55db889 100755
--- a/tests/pipe/specific/end
+++ b/tests/pipe/specific/end
@@ -1,51 +1,14 @@
-set result [checkshape s1]
-set index [lsearch $result Faulty]
-if {$index > -1} {
-    puts "Faulty OCC1477 (case 1) : checkshape is wrong for s1"
-}
-
-set result [checkshape s2]
-set index [lsearch $result Faulty]
-if {$index > -1} {
-    puts "Faulty OCC1477 (case 2) : checkshape is wrong for s2"
-}
-
-mksweep s1
-
-if {[string length [string trim ${setsweepOptions}]] > 0} {
-    eval setsweep ${setsweepOptions}
-}
-
 ###############################################################################
 # setsweep options [arg1 [arg2 [...]]] : options are :
 #    -FR : Tangent and Normal are given by Frenet trihedron
 #    -CF : Tangente is given by Frenet,
 #          the Normal is computed to minimize the torsion 
-###############################################################################
-if {[string length [string trim ${addsweepOptions}]] > 0} {
-    eval addsweep s2 ${addsweepOptions}
-} else {
-    addsweep s2
-}
-
 ###############################################################################
 # addsweep wire [Vertex] [-T] [-R] [u0 v0 u1 v1 [...[uN vN]]] : options are :
 #    -T : the wire have to be translated to assume contact
 #         with the spine
 #    -R : the wire have to be rotated to assume orthogonality
 #         with the spine's tangent
-###############################################################################
-set bad_buildsweep 0
-if {[string length [string trim ${buildsweepOptions}]] > 0} {
-    if [catch {eval buildsweep result ${buildsweepOptions}} res] {
-	set bad_buildsweep 1
-    }
-} else {
-    if [catch {buildsweep result} res] {
-	set bad_buildsweep 1
-    }
-}
-
 ###############################################################################
 # buildsweep result [-M/-C/-R] [-S] [tol] : options are
 # -M : Discontinuities are treated by Modfication of
@@ -55,159 +18,67 @@ if {[string length [string trim ${buildsweepOptions}]] > 0} {
 #    -R : Discontinuities are treated like Round Corner
 #         Treatement is Intersect and Fill
 ###############################################################################
-if {${bad_buildsweep} == 1} {
-    puts "Faulty OCC1477 (case 3) : buildsweep is wrong"
-} else {
-    if { [info exists square] } {
-	set prop "square"
-	set mass $square
-	if { [info exists tol_square] } {
-	    regexp {Mass +: +([-0-9.+eE]+)} [sprops result $tol_square] full m
-	} else {
-	    regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m
-	}
-    }
-    if { [info exists volume] } {
-	set prop "volume"
-	set mass $volume
-	regexp {Mass +: +([-0-9.+eE]+)} [vprops result] full m
-    }
-    if { [info exists length] } {
-	set prop "length"
-	set mass $length
-	regexp {Mass +: +([-0-9.+eE]+)} [lprops result] full m      
-	puts "checksection"
-	puts [checksection result]
-    }
 
-    #if mass (length or square) is empty in test case then result should be an empty shape.
-    if { [info exists mass] } {
-	checkshape result
-      
-	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 square is < 1%
-      	    if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
-      		puts "Error : The $prop of result shape is $m"
-      	    }
-	} else {
-      	    if { $m != 0 } {
-       		puts "Error : The command is not valid. The $prop is $m"
-      	    }
-	}
-    }
-
-    set glob_inf [info global nb_*_good]
-    if { [regexp "nb_.*_good" $glob_inf] == 1 } {
-	if { [info exists nbsh_t] } {
-	    set nb_info [nbshapes result -t]
-	} else {
-    	    set nb_info [nbshapes result]
-	}
-    }
-
-    if { [info exists nb_v_good] } {
-	regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v
-	if { ${nb_v} != ${nb_v_good} } {
-    	    puts "Error : Result shape is WRONG because it must contains ${nb_v_good} vertexes instead of ${nb_v}"
-	} else {
-    	    puts "Result shape contains ${nb_v} vertexes"
-	}
-    }
-
-    if { [info exists nb_e_good] } {
-	regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full nb_e
-	if { ${nb_e} != ${nb_e_good} } {
-    	    puts "Error : Result shape is WRONG because it must contains ${nb_e_good} edges instead of ${nb_e}"
-	} else {
-    	    puts "Result shape contains ${nb_e} edges"
-	}
-    }
-
-    if { [info exists nb_w_good] } {
-	regexp {WIRE +: +([-0-9.+eE]+)} $nb_info full nb_w
-	if { ${nb_w} != ${nb_w_good} } {
-    	    puts "Error : Result shape is WRONG because it must contains ${nb_w_good} wires instead of ${nb_w}"
-	} else {
-    	    puts "Result shape contains ${nb_w} wires"
-	}
-    }
-
-    if { [info exists nb_f_good] } {
-	regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_f
-	if { ${nb_f} != ${nb_f_good} } {
-    	    puts "Error : Result shape is WRONG because it must contains ${nb_f_good} faces instead of ${nb_f}"
-	} else {
-    	    puts "Result shape contains ${nb_f} faces"
-	}
-    }
-
-    if { [info exists nb_sh_good] } {
-	regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_sh
-	if { ${nb_sh} != ${nb_sh_good} } {
-    	    puts "Error : Result shape is WRONG because it must contains ${nb_sh_good} shells instead of ${nb_sh}"
-	} else {
-    	    puts "Result shape contains ${nb_sh} shells"
-	}
-    }
-
-    if { [info exists nb_sol_good] } {
-	regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_sol
-	if { ${nb_sol} != ${nb_sol_good} } {
-    	    puts "Error : Result shape is WRONG because it must contains ${nb_sol_good} solids instead of ${nb_sol}"
-	} else {
-    	    puts "Result shape contains ${nb_sol} solids"
-	}
-    }
-
-    if { [info exists nb_compsol_good] } {
-	regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nb_compsol
-	if { ${nb_compsol} != ${nb_compsol_good} } {
-    	    puts "Error : Result shape is WRONG because it must contains ${nb_compsol_good} compsolids instead of ${nb_compsol}"
-	} else {
-    	    puts "Result shape contains ${nb_compsol} compsolids"
-	}
-    }
-
-    if { [info exists nb_compound_good] } {
-	regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound
-	if { ${nb_compound} != ${nb_compound_good} } {
-    	    puts "Error : Result shape is WRONG because it must contains ${nb_compound_good} compounds instead of ${nb_compound}"
-	} else {
-    	    puts "Result shape contains ${nb_compound} compounds"
-	}
-    }
-
-    if { [info exists nb_shape_good] } {
-	regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_shape
-	if { ${nb_shape} != ${nb_shape_good} } {
-    	    puts "Error : Result shape is WRONG because it must contains ${nb_shape_good} shapes instead of ${nb_shape}"
-	} else {
-    	    puts "Result shape contains ${nb_shape} shapes"
-	}
-    }
+if { [info exists square] } {
+  set prop "square"
+  set mass $square
+  if { [info exists tol_square] } {
+      regexp {Mass +: +([-0-9.+eE]+)} [sprops result $tol_square] full m
+  } else {
+      regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m
+  }
 }
+if { [info exists volume] } {
+  set prop "volume"
+  set mass $volume
+  regexp {Mass +: +([-0-9.+eE]+)} [vprops result] full m
+}
+if { [info exists length] } {
+  set prop "length"
+  set mass $length
+  regexp {Mass +: +([-0-9.+eE]+)} [lprops result] full m      
+  puts "checksection"
+  puts [checksection result]
+}
+
+#if mass (length or square) is empty in test case then result should be an empty shape.
+if { [info exists mass] } {
+  checkshape result
+  
+  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 square is < 1%
+      if { ($mass != 0 && [expr 1.*abs($mass - $m)/$mass] > 0.01) || ($mass == 0 && $m != 0) } {
+          puts "Error : The $prop of result shape is $m"
+      }
+  } else {
+      if { $m != 0 } {
+          puts "Error : The command is not valid. The $prop is $m"
+      }
+  }
+}
+
 if { [isdraw result] } {
     if { [info exists 2dviewer] } {
-	clear
-	smallview
-	donly result
-	fit
-	xwd $imagedir/${test_image}.png
+        clear
+        smallview
+        donly result
+        fit
+        xwd $imagedir/${test_image}.png
     }
     if { [info exists 3dviewer] } {
-	vinit
-	vclear
-	vdisplay result
-	vsetdispmode 1
-	vfit
-	vzfit
-	vdump $imagedir/${test_image}.png
+        vinit
+        vclear
+        vdisplay result
+        vsetdispmode 1
+        vfit
+        vzfit
+        vdump $imagedir/${test_image}.png
     }
 }
 
diff --git a/tests/thrusection/end b/tests/thrusection/end
index 476221de80..d2f607ab66 100755
--- a/tests/thrusection/end
+++ b/tests/thrusection/end
@@ -24,97 +24,6 @@ if { [isdraw result] } {
       }
    }
 
-   set glob_inf [info global nb_*_good]
-   if { [regexp "nb_.*_good" $glob_inf] == 1 } {
-      if { [info exists nbsh_t] } {
-      	 set nb_info [nbshapes result -t]
-      } else {
-      	 set nb_info [nbshapes result]
-      }
-   }
-
-   if { [info exists nb_v_good] } {
-      regexp {VERTEX +: +([-0-9.+eE]+)} $nb_info full nb_v
-      if { ${nb_v} != ${nb_v_good} } {
-      	 puts "Error : The resulting shape is WRONG because it must contains ${nb_v_good} vertexes instead of ${nb_v}"
-      } else {
-         puts "The resulting shape contains ${nb_v} vertexes"
-      }
-   }
-
-   if { [info exists nb_e_good] } {
-      regexp {EDGE +: +([-0-9.+eE]+)} $nb_info full nb_e
-      if { ${nb_e} != ${nb_e_good} } {
-      	 puts "Error : The resulting shape is WRONG because it must contains ${nb_e_good} edges instead of ${nb_e}"
-      } else {
-      	 puts "The resulting shape contains ${nb_e} edges"
-      }
-   }
-
-   if { [info exists nb_w_good] } {
-      regexp {WIRE +: +([-0-9.+eE]+)} $nb_info full nb_w
-      if { ${nb_w} != ${nb_w_good} } {
-      	 puts "Error : The resulting shape is WRONG because it must contains ${nb_w_good} wires instead of ${nb_w}"
-      } else {
-      	 puts "The resulting shape contains ${nb_w} wires"
-      }
-   }
-
-   if { [info exists nb_f_good] } {
-      regexp {FACE +: +([-0-9.+eE]+)} $nb_info full nb_f
-      if { ${nb_f} != ${nb_f_good} } {
-      	 puts "Error : The resulting shape is WRONG because it must contains ${nb_f_good} faces instead of ${nb_f}"
-      } else {
-       	 puts "The resulting shape contains ${nb_f} faces"
-      }
-   }
-
-   if { [info exists nb_sh_good] } {
-      regexp {SHELL +: +([-0-9.+eE]+)} $nb_info full nb_sh
-      if { ${nb_sh} != ${nb_sh_good} } {
-      	 puts "Error : The resulting shape is WRONG because it must contains ${nb_sh_good} shells instead of ${nb_sh}"
-      } else {
-      	 puts "The resulting shape contains ${nb_sh} shells"
-      }
-   }
-
-   if { [info exists nb_sol_good] } {
-      regexp {SOLID +: +([-0-9.+eE]+)} $nb_info full nb_sol
-      if { ${nb_sol} != ${nb_sol_good} } {
-      	 puts "Error : The resulting shape is WRONG because it must contains ${nb_sol_good} solids instead of ${nb_sol}"
-      } else {
-      	 puts "The resulting shape contains ${nb_sol} solids"
-      }
-   }
-
-   if { [info exists nb_compsol_good] } {
-      regexp {COMPSOLID +: +([-0-9.+eE]+)} $nb_info full nb_compsol
-      if { ${nb_compsol} != ${nb_compsol_good} } {
-      	 puts "Error : The resulting shape is WRONG because it must contains ${nb_compsol_good} compsolids instead of ${nb_compsol}"
-      } else {
-      	 puts "The resulting shape contains ${nb_compsol} compsolids"
-      }
-   }
-
-   if { [info exists nb_compound_good] } {
-      regexp {COMPOUND +: +([-0-9.+eE]+)} $nb_info full nb_compound
-      if { ${nb_compound} != ${nb_compound_good} } {
-      	 puts "Error : The resulting shape is WRONG because it must contains ${nb_compound_good} compounds instead of ${nb_compound}"
-      } else {
-      	 puts "The resulting shape contains ${nb_compound} compounds"
-      }
-   }
-
-   if { [info exists nb_shape_good] } {
-      regexp {SHAPE +: +([-0-9.+eE]+)} $nb_info full nb_shape
-      if { ${nb_shape} != ${nb_shape_good} } {
-      	 puts "Error : The resulting shape is WRONG because it must contains ${nb_shape_good} shapes instead of ${nb_shape}"
-      } else {
-      	 puts "The resulting shape contains ${nb_shape} shapes"
-      }
-   }
-
-
    if { $m > 0 } {
       smallview
       clear
diff --git a/tests/thrusection/specific/A1 b/tests/thrusection/specific/A1
index 33230d732d..e5992a5e62 100755
--- a/tests/thrusection/specific/A1
+++ b/tests/thrusection/specific/A1
@@ -42,16 +42,7 @@ thrusections result ${issolid} ${isruled} v4 w1 v5
 
 set square 490.101
 
-set nb_v_good 5
-set nb_e_good 9
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 5 -edge 9 -wire 6 -face 6 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 27
 set index [lsearch [whatis result] Closed]
 if {$index == -1} {
   puts "Faulty ${BugNumber} : result is not Closed shape"
diff --git a/tests/thrusection/specific/A2 b/tests/thrusection/specific/A2
index c9aad1d68c..9f011fcbd7 100755
--- a/tests/thrusection/specific/A2
+++ b/tests/thrusection/specific/A2
@@ -43,16 +43,7 @@ thrusections result ${issolid} ${isruled} v4 w1 v5
 set square 490.101
 
 
-set nb_v_good 5
-set nb_e_good 9
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 28
-
+checknbshapes result -vertex 5 -edge 9 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 28
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/A3 b/tests/thrusection/specific/A3
index db4b712227..614a80dd17 100755
--- a/tests/thrusection/specific/A3
+++ b/tests/thrusection/specific/A3
@@ -42,16 +42,7 @@ thrusections result ${issolid} ${isruled} v4 w1 v5
 
 set square 651.466
 
-set nb_v_good 2
-set nb_e_good 9
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 2 -edge 9 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 18
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/A4 b/tests/thrusection/specific/A4
index 59012a2e1d..6cf3bca4b1 100755
--- a/tests/thrusection/specific/A4
+++ b/tests/thrusection/specific/A4
@@ -43,16 +43,7 @@ thrusections result ${issolid} ${isruled} v4 w1 v5
 set square 651.466
 
 
-set nb_v_good 2
-set nb_e_good 9
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 19
-
+checknbshapes result -vertex 2 -edge 9 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 19
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/A5 b/tests/thrusection/specific/A5
index 34a754b2ef..131d5accd0 100755
--- a/tests/thrusection/specific/A5
+++ b/tests/thrusection/specific/A5
@@ -38,16 +38,7 @@ thrusections result ${issolid} ${isruled} v4 w1 v5
 
 set square 485.502
 
-set nb_v_good 5
-set nb_e_good 9
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 27
-
+checknbshapes result -vertex 5 -edge 9 -wire 6 -face 6 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 27
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/A6 b/tests/thrusection/specific/A6
index 5eb68bf939..3973ee0dbc 100755
--- a/tests/thrusection/specific/A6
+++ b/tests/thrusection/specific/A6
@@ -39,16 +39,7 @@ thrusections result ${issolid} ${isruled} v4 w1 v5
 set square 485.502
 
 
-set nb_v_good 5
-set nb_e_good 9
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 28
-
+checknbshapes result -vertex 5 -edge 9 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 28
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/A7 b/tests/thrusection/specific/A7
index a8bece43a2..439fc8d8f0 100755
--- a/tests/thrusection/specific/A7
+++ b/tests/thrusection/specific/A7
@@ -38,16 +38,7 @@ thrusections result ${issolid} ${isruled} v4 w1 v5
 
 set square 646.621
 
-set nb_v_good 2
-set nb_e_good 9
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 2 -edge 9 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 18
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/A8 b/tests/thrusection/specific/A8
index 2585f950a6..bcf65fe90b 100755
--- a/tests/thrusection/specific/A8
+++ b/tests/thrusection/specific/A8
@@ -39,16 +39,7 @@ thrusections result ${issolid} ${isruled} v4 w1 v5
 set square 646.621
 
 
-set nb_v_good 2
-set nb_e_good 9
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 19
-
+checknbshapes result -vertex 2 -edge 9 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 19
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/A9 b/tests/thrusection/specific/A9
index f32a29def8..9ebd2bb69b 100755
--- a/tests/thrusection/specific/A9
+++ b/tests/thrusection/specific/A9
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 1404.96
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/B1 b/tests/thrusection/specific/B1
index 89b082b5c2..9a32c2d9a1 100755
--- a/tests/thrusection/specific/B1
+++ b/tests/thrusection/specific/B1
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 set square 1404.96
 
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 14
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/B2 b/tests/thrusection/specific/B2
index 01ec58385a..defd63afa1 100755
--- a/tests/thrusection/specific/B2
+++ b/tests/thrusection/specific/B2
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 1829.23
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/B3 b/tests/thrusection/specific/B3
index 7110d2ce19..45913435a6 100755
--- a/tests/thrusection/specific/B3
+++ b/tests/thrusection/specific/B3
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 set square 1829.23
 
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/B4 b/tests/thrusection/specific/B4
index 96a5eb2ed1..3f80087ca9 100755
--- a/tests/thrusection/specific/B4
+++ b/tests/thrusection/specific/B4
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 2160.94
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/B5 b/tests/thrusection/specific/B5
index eeccab3cc2..ea4a0d638e 100755
--- a/tests/thrusection/specific/B5
+++ b/tests/thrusection/specific/B5
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 set square 2160.94
 
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 14
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/B6 b/tests/thrusection/specific/B6
index 085b9f56b0..89d6feb823 100755
--- a/tests/thrusection/specific/B6
+++ b/tests/thrusection/specific/B6
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 2556.25
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/B7 b/tests/thrusection/specific/B7
index 9c9b6c3747..dd10283951 100755
--- a/tests/thrusection/specific/B7
+++ b/tests/thrusection/specific/B7
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 set square 2556.25
 
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/B8 b/tests/thrusection/specific/B8
index 8872a570d9..442b6d0f04 100755
--- a/tests/thrusection/specific/B8
+++ b/tests/thrusection/specific/B8
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 1021.13
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/B9 b/tests/thrusection/specific/B9
index 9dc6c0ee4c..234154af90 100755
--- a/tests/thrusection/specific/B9
+++ b/tests/thrusection/specific/B9
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 set square 1021.13
 
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 14
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/C1 b/tests/thrusection/specific/C1
index 103cf6b87c..2fd2134575 100755
--- a/tests/thrusection/specific/C1
+++ b/tests/thrusection/specific/C1
@@ -20,16 +20,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 1346.42
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/C2 b/tests/thrusection/specific/C2
index 1914609588..a850afbdce 100755
--- a/tests/thrusection/specific/C2
+++ b/tests/thrusection/specific/C2
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 set square 1346.42
 
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/C3 b/tests/thrusection/specific/C3
index 4e8bc03f24..7af48867c4 100755
--- a/tests/thrusection/specific/C3
+++ b/tests/thrusection/specific/C3
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 1353.78
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/C4 b/tests/thrusection/specific/C4
index 350d4e1c1b..785d7c26ce 100755
--- a/tests/thrusection/specific/C4
+++ b/tests/thrusection/specific/C4
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 set square 1353.78
 
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 14
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/C5 b/tests/thrusection/specific/C5
index 3e98fa64cf..fdb08d16ad 100755
--- a/tests/thrusection/specific/C5
+++ b/tests/thrusection/specific/C5
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 1683.87
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/C6 b/tests/thrusection/specific/C6
index a40afe9893..b8d4626db3 100755
--- a/tests/thrusection/specific/C6
+++ b/tests/thrusection/specific/C6
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 set square 1683.87
 
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/C7 b/tests/thrusection/specific/C7
index a517fb0d08..d12c0d3968 100755
--- a/tests/thrusection/specific/C7
+++ b/tests/thrusection/specific/C7
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 449.295
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/C8 b/tests/thrusection/specific/C8
index a4e83b605e..f29e719590 100755
--- a/tests/thrusection/specific/C8
+++ b/tests/thrusection/specific/C8
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 set square 449.295
 
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 14
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/C9 b/tests/thrusection/specific/C9
index 1b34d24682..5b4fe7543b 100755
--- a/tests/thrusection/specific/C9
+++ b/tests/thrusection/specific/C9
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 597.473
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/D1 b/tests/thrusection/specific/D1
index c4c2afc7b5..053fd03c83 100755
--- a/tests/thrusection/specific/D1
+++ b/tests/thrusection/specific/D1
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 set square 597.473
 
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/D2 b/tests/thrusection/specific/D2
index d8563d0089..3e0bde753f 100755
--- a/tests/thrusection/specific/D2
+++ b/tests/thrusection/specific/D2
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 740.079
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/D3 b/tests/thrusection/specific/D3
index ef75aa7f7f..f247c96827 100755
--- a/tests/thrusection/specific/D3
+++ b/tests/thrusection/specific/D3
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 set square 740.079
 
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 14
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/D4 b/tests/thrusection/specific/D4
index a71b075c21..9b8df85cd5 100755
--- a/tests/thrusection/specific/D4
+++ b/tests/thrusection/specific/D4
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 881.045
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/D5 b/tests/thrusection/specific/D5
index 23acfb37a5..52ba49eb1a 100755
--- a/tests/thrusection/specific/D5
+++ b/tests/thrusection/specific/D5
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 set square 881.045
 
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 set index [lsearch [whatis result] Closed]
 if {$index == -1} {
   puts "Faulty ${BugNumber} : result is not Closed shape"
diff --git a/tests/thrusection/specific/D6 b/tests/thrusection/specific/D6
index 72b0e399fe..1a430587cc 100755
--- a/tests/thrusection/specific/D6
+++ b/tests/thrusection/specific/D6
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 245.485
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/D7 b/tests/thrusection/specific/D7
index 7f98e6ef9d..724b0e82af 100755
--- a/tests/thrusection/specific/D7
+++ b/tests/thrusection/specific/D7
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 set square 245.485
 
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 14
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/D8 b/tests/thrusection/specific/D8
index 2e1ab60231..f37adbfc3d 100755
--- a/tests/thrusection/specific/D8
+++ b/tests/thrusection/specific/D8
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 327.161
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/D9 b/tests/thrusection/specific/D9
index 5b69143b7d..43f75e500f 100755
--- a/tests/thrusection/specific/D9
+++ b/tests/thrusection/specific/D9
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 set square 327.161
 
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/E1 b/tests/thrusection/specific/E1
index b13d6a8763..bfe9354cf6 100755
--- a/tests/thrusection/specific/E1
+++ b/tests/thrusection/specific/E1
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 400.925
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 13
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 13
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/E2 b/tests/thrusection/specific/E2
index a0defccc93..5c55157048 100755
--- a/tests/thrusection/specific/E2
+++ b/tests/thrusection/specific/E2
@@ -23,16 +23,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 set square 400.925
 
 
-set nb_v_good 3
-set nb_e_good 5
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 14
-
+checknbshapes result -vertex 3 -edge 5 -wire 2 -face 2 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 14
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/E3 b/tests/thrusection/specific/E3
index 79b01cbe41..8c611dcce1 100755
--- a/tests/thrusection/specific/E3
+++ b/tests/thrusection/specific/E3
@@ -22,16 +22,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2}
 
 set square 478.063
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/E4 b/tests/thrusection/specific/E4
index c2f190ed94..ec2ea38c6c 100755
--- a/tests/thrusection/specific/E4
+++ b/tests/thrusection/specific/E4
@@ -25,16 +25,7 @@ catch {thrusections result ${issolid} ${isruled} v1 w1 v2 }
 set square 422.859
 
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/E5 b/tests/thrusection/specific/E5
index ff83ebec5f..d357786567 100755
--- a/tests/thrusection/specific/E5
+++ b/tests/thrusection/specific/E5
@@ -134,16 +134,7 @@ thrusections result ${issolid} ${isruled} v4 w1 w11 w21 w111 w101 v5
 
 set square 12651.5
 
-set nb_v_good 57
-set nb_e_good 121
-set nb_w_good 66
-set nb_f_good 66
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 311
-
+checknbshapes result -vertex 57 -edge 121 -wire 66 -face 66 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 311
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/E6 b/tests/thrusection/specific/E6
index 1d8b1afaa5..7597f8588e 100755
--- a/tests/thrusection/specific/E6
+++ b/tests/thrusection/specific/E6
@@ -135,16 +135,7 @@ thrusections result ${issolid} ${isruled} v4 w1 w11 w21 w111 w101 v5
 set square 12651.5
 
 
-set nb_v_good 57
-set nb_e_good 121
-set nb_w_good 66
-set nb_f_good 66
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 312
-
+checknbshapes result -vertex 57 -edge 121 -wire 66 -face 66 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 312
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/E7 b/tests/thrusection/specific/E7
index 0939427f17..0b476b2a9b 100755
--- a/tests/thrusection/specific/E7
+++ b/tests/thrusection/specific/E7
@@ -136,16 +136,7 @@ thrusections result ${issolid} ${isruled} v4 w1 w11 w21 w111 w101 v5
 
 set square 56691.9
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 58
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/E8 b/tests/thrusection/specific/E8
index 9ea8b02803..069dbaf1f4 100755
--- a/tests/thrusection/specific/E8
+++ b/tests/thrusection/specific/E8
@@ -137,16 +137,7 @@ thrusections result ${issolid} ${isruled} v4 w1 w11 w21 w111 w101 v5
 set square 56691.9
 
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 59
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 59
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/E9 b/tests/thrusection/specific/E9
index 1e1f27b410..af927b61d2 100755
--- a/tests/thrusection/specific/E9
+++ b/tests/thrusection/specific/E9
@@ -134,16 +134,7 @@ thrusections result ${issolid} ${isruled} v4 w1 w11 w21 w111 w101 v5
 
 set square 12301.8
 
-set nb_v_good 57
-set nb_e_good 121
-set nb_w_good 66
-set nb_f_good 66
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 311
-
+checknbshapes result -vertex 57 -edge 121 -wire 66 -face 66 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 311
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/F1 b/tests/thrusection/specific/F1
index 564b3f8708..843f743ae5 100755
--- a/tests/thrusection/specific/F1
+++ b/tests/thrusection/specific/F1
@@ -135,16 +135,7 @@ thrusections result ${issolid} ${isruled} v4 w1 w11 w21 w111 w101 v5
 set square 12301.8
 
 
-set nb_v_good 57
-set nb_e_good 121
-set nb_w_good 66
-set nb_f_good 66
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 312
-
+checknbshapes result -vertex 57 -edge 121 -wire 66 -face 66 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 312
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/F2 b/tests/thrusection/specific/F2
index 77e93decba..ee73ea266e 100755
--- a/tests/thrusection/specific/F2
+++ b/tests/thrusection/specific/F2
@@ -136,16 +136,7 @@ thrusections result ${issolid} ${isruled} v4 w1 w11 w21 w111 w101 v5
 
 set square 37693.9
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 58
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/F3 b/tests/thrusection/specific/F3
index f7789f15a7..1ccb7fabc3 100755
--- a/tests/thrusection/specific/F3
+++ b/tests/thrusection/specific/F3
@@ -137,16 +137,7 @@ thrusections result ${issolid} ${isruled} v4 w1 w11 w21 w111 w101 v5
 set square 37693.9
 
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 59
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 59
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/F4 b/tests/thrusection/specific/F4
index ab96192d57..d9e2117ddf 100755
--- a/tests/thrusection/specific/F4
+++ b/tests/thrusection/specific/F4
@@ -1,5 +1,5 @@
 puts "TODO OCC7166 ALL: Faulty OCC7166 : result is not Closed shape"
-puts "TODO OCC7166 ALL: The resulting shape is WRONG "
+puts "TODO OCC7166 ALL: Error :  is WRONG because number of  "
 puts "============"
 puts "OCC7166"
 puts "============"
@@ -32,16 +32,7 @@ catch {thrusections result ${issolid} ${isruled} wc1 w1 wc2}
 
 set square 256.812
 
-set nb_v_good 6
-set nb_e_good 10
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 25
-
+checknbshapes result -vertex 6 -edge 10 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 25
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/F5 b/tests/thrusection/specific/F5
index d1bfdf84f4..c87990b504 100755
--- a/tests/thrusection/specific/F5
+++ b/tests/thrusection/specific/F5
@@ -1,4 +1,4 @@
-puts "TODO OCC7166 ALL: The resulting shape is WRONG "
+puts "TODO OCC7166 ALL: Error :  is WRONG because number of  "
 
 puts "============"
 puts "OCC7166"
@@ -33,16 +33,7 @@ catch {thrusections result ${issolid} ${isruled} wc1 w1 wc2}
 set square 256.875
 
 
-set nb_v_good 6
-set nb_e_good 10
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 30
-
+checknbshapes result -vertex 6 -edge 10 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 30
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/F6 b/tests/thrusection/specific/F6
index 40a9f3e240..b8cb3430d6 100755
--- a/tests/thrusection/specific/F6
+++ b/tests/thrusection/specific/F6
@@ -1,5 +1,5 @@
 puts "TODO OCC7166 ALL: Faulty OCC7166 : result is not Closed shape"
-puts "TODO OCC7166 ALL: The resulting shape is WRONG "
+puts "TODO OCC7166 ALL: Error :  is WRONG because number of  "
 
 puts "============"
 puts "OCC7166"
@@ -33,16 +33,7 @@ catch {thrusections result ${issolid} ${isruled} wc1 w1 wc2}
 
 set square 332.724
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 15
-
+checknbshapes result -vertex 4 -edge 6 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 15
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/F7 b/tests/thrusection/specific/F7
index 5826095a22..9582239fb5 100755
--- a/tests/thrusection/specific/F7
+++ b/tests/thrusection/specific/F7
@@ -1,4 +1,4 @@
-puts "TODO OCC7166 ALL: The resulting shape is WRONG "
+puts "TODO OCC7166 ALL: Error :  is WRONG because number of  "
 puts "TODO OCC7166 ALL: The square of the resulting shape is"
 
 puts "============"
@@ -34,16 +34,7 @@ catch {thrusections result ${issolid} ${isruled} wc1 w1 wc2}
 set square 314.974
 
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 9
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 9
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/F8 b/tests/thrusection/specific/F8
index 6d1fe6118d..2581c4464c 100755
--- a/tests/thrusection/specific/F8
+++ b/tests/thrusection/specific/F8
@@ -1,5 +1,5 @@
 puts "TODO OCC7166 ALL: Faulty OCC7166 : result is not Closed shape"
-puts "TODO OCC7166 ALL: The resulting shape is WRONG "
+puts "TODO OCC7166 ALL: Error :  is WRONG because number of  "
 
 puts "============"
 puts "OCC7166"
@@ -32,16 +32,7 @@ catch {thrusections result ${issolid} ${isruled} wc1 w1 wc2}
 
 set square 419.103
 
-set nb_v_good 6
-set nb_e_good 10
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 25
-
+checknbshapes result -vertex 6 -edge 10 -wire 4 -face 4 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 25
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/F9 b/tests/thrusection/specific/F9
index c8efa92b2d..25772c81ba 100755
--- a/tests/thrusection/specific/F9
+++ b/tests/thrusection/specific/F9
@@ -1,4 +1,4 @@
-puts "TODO OCC7166 ALL: The resulting shape is WRONG "
+puts "TODO OCC7166 ALL: Error :  is WRONG because number of  "
 
 puts "============"
 puts "OCC7166"
@@ -33,16 +33,7 @@ catch {thrusections result ${issolid} ${isruled} wc1 w1 wc2}
 set square 419.166
 
 
-set nb_v_good 6
-set nb_e_good 10
-set nb_w_good 6
-set nb_f_good 6
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 30
-
+checknbshapes result -vertex 6 -edge 10 -wire 6 -face 6 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 30
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/G1 b/tests/thrusection/specific/G1
index a01fb4fa55..272bbe25ea 100755
--- a/tests/thrusection/specific/G1
+++ b/tests/thrusection/specific/G1
@@ -1,5 +1,5 @@
 puts "TODO OCC7166 ALL: Faulty OCC7166 : result is not Closed shape"
-puts "TODO OCC7166 ALL: The resulting shape is WRONG "
+puts "TODO OCC7166 ALL: Error :  is WRONG because number of  "
 puts "TODO OCC7166 ALL: Error : The square of the resulting shape is"
 
 puts "============"
@@ -34,16 +34,7 @@ catch {thrusections result ${issolid} ${isruled} wc1 w1 wc2}
 
 set square 702.858
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 2
-set nb_f_good 2
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 15
-
+checknbshapes result -vertex 4 -edge 6 -wire 2 -face 2 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 15
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/G2 b/tests/thrusection/specific/G2
index 7374963f11..5ed3c1d515 100755
--- a/tests/thrusection/specific/G2
+++ b/tests/thrusection/specific/G2
@@ -1,4 +1,4 @@
-puts "TODO OCC7166 ALL: The resulting shape is WRONG "
+puts "TODO OCC7166 ALL: Error :  is WRONG because number of  "
 puts "TODO OCC7166 ALL: Error : The square of the resulting shape is"
 
 puts "============"
@@ -34,16 +34,7 @@ catch {thrusections result ${issolid} ${isruled} wc1 w1 wc2}
 set square 702.921
 
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 4
-set nb_f_good 4
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 20
-
+checknbshapes result -vertex 4 -edge 6 -wire 4 -face 4 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 20
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/G3 b/tests/thrusection/specific/G3
index 1cb68275f5..bb8a856c9d 100755
--- a/tests/thrusection/specific/G3
+++ b/tests/thrusection/specific/G3
@@ -157,16 +157,7 @@ thrusections result ${issolid} ${isruled} v4 w1 wbzc1 w11 wpbc1 w21 wpbc2 w111 w
 
 set square 12786.5
 
-set nb_v_good 101
-set nb_e_good 209
-set nb_w_good 110
-set nb_f_good 110
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 531
-
+checknbshapes result -vertex 101 -edge 209 -wire 110 -face 110 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 531
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/G4 b/tests/thrusection/specific/G4
index 7d14ebb881..cc2b91fccc 100755
--- a/tests/thrusection/specific/G4
+++ b/tests/thrusection/specific/G4
@@ -1,4 +1,4 @@
-puts "TODO OCC7166 ALL: The resulting shape is WRONG "
+puts "TODO OCC7166 ALL: Error :  is WRONG because number of  "
 
 puts "============"
 puts "OCC7166"
@@ -160,16 +160,7 @@ thrusections result ${issolid} ${isruled} v4 w1 wbzc1 w11 wpbc1 w21 wpbc2 w111 w
 set square 12786.5
 
 
-set nb_v_good 101
-set nb_e_good 209
-set nb_w_good 110
-set nb_f_good 110
-set nb_sh_good 1
-set nb_sol_good 2
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 532
-
+checknbshapes result -vertex 101 -edge 209 -wire 110 -face 110 -shell 1 -solid 2 -compsolid 0 -compound 0 -shape 532
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/G5 b/tests/thrusection/specific/G5
index 5c74d1eaad..2ea2bcf86c 100755
--- a/tests/thrusection/specific/G5
+++ b/tests/thrusection/specific/G5
@@ -157,16 +157,7 @@ thrusections result ${issolid} ${isruled} v4 w1 wbzc1 w11 wpbc1 w21 wpbc2 w111 w
 
 set square 12436.8
 
-set nb_v_good 101
-set nb_e_good 209
-set nb_w_good 110
-set nb_f_good 110
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 531
-
+checknbshapes result -vertex 101 -edge 209 -wire 110 -face 110 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 531
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/G6 b/tests/thrusection/specific/G6
index f9244b20ae..a6ce912923 100755
--- a/tests/thrusection/specific/G6
+++ b/tests/thrusection/specific/G6
@@ -158,16 +158,7 @@ thrusections result ${issolid} ${isruled} v4 w1 wbzc1 w11 wpbc1 w21 wpbc2 w111 w
 set square 12436.8
 
 
-set nb_v_good 101
-set nb_e_good 209
-set nb_w_good 110
-set nb_f_good 110
-set nb_sh_good 1
-set nb_sol_good 1
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 532
-
+checknbshapes result -vertex 101 -edge 209 -wire 110 -face 110 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 532
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/H1 b/tests/thrusection/specific/H1
index 00c3cee7be..0d6627bbb0 100755
--- a/tests/thrusection/specific/H1
+++ b/tests/thrusection/specific/H1
@@ -27,16 +27,7 @@ buildsweep result
 
 set square 1187.23
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 17
-
+checknbshapes result -vertex 4 -edge 6 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 17
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/H2 b/tests/thrusection/specific/H2
index 2b2588b06d..162081f962 100755
--- a/tests/thrusection/specific/H2
+++ b/tests/thrusection/specific/H2
@@ -27,16 +27,7 @@ buildsweep result
 
 set square 1192.53
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 17
-
+checknbshapes result -vertex 4 -edge 6 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 17
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/H3 b/tests/thrusection/specific/H3
index 63d74b12cc..51f1af9922 100755
--- a/tests/thrusection/specific/H3
+++ b/tests/thrusection/specific/H3
@@ -27,16 +27,7 @@ buildsweep result
 
 set square 1187.23
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 17
-
+checknbshapes result -vertex 4 -edge 6 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 17
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/H4 b/tests/thrusection/specific/H4
index ea67507b6c..2ff0d2b725 100755
--- a/tests/thrusection/specific/H4
+++ b/tests/thrusection/specific/H4
@@ -27,16 +27,7 @@ buildsweep result
 
 set square 1192.53
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 17
-
+checknbshapes result -vertex 4 -edge 6 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 17
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/H5 b/tests/thrusection/specific/H5
index 9c0f206869..0e1b15fb7d 100755
--- a/tests/thrusection/specific/H5
+++ b/tests/thrusection/specific/H5
@@ -31,16 +31,7 @@ buildsweep result
 
 set square 790.139
 
-set nb_v_good 2
-set nb_e_good 9
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 2 -edge 9 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 18
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/H6 b/tests/thrusection/specific/H6
index 9a86b661a8..6c059008ee 100755
--- a/tests/thrusection/specific/H6
+++ b/tests/thrusection/specific/H6
@@ -27,16 +27,7 @@ buildsweep result
 
 set square 1198.3
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 17
-
+checknbshapes result -vertex 4 -edge 6 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 17
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/H7 b/tests/thrusection/specific/H7
index 1a010d4473..a3888b99a7 100755
--- a/tests/thrusection/specific/H7
+++ b/tests/thrusection/specific/H7
@@ -27,16 +27,7 @@ buildsweep result
 
 set square 1192.88
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 17
-
+checknbshapes result -vertex 4 -edge 6 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 17
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/H8 b/tests/thrusection/specific/H8
index 65d3139baa..6453a531f2 100755
--- a/tests/thrusection/specific/H8
+++ b/tests/thrusection/specific/H8
@@ -27,15 +27,6 @@ buildsweep result
 
 set square 1187.23
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 17
-
+checknbshapes result -vertex 4 -edge 6 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 17
 set 3dviewer 0
 
diff --git a/tests/thrusection/specific/H9 b/tests/thrusection/specific/H9
index a0e64a76b0..2fa4bcf77d 100755
--- a/tests/thrusection/specific/H9
+++ b/tests/thrusection/specific/H9
@@ -27,16 +27,7 @@ buildsweep result
 
 set square 1192.53
 
-set nb_v_good 4
-set nb_e_good 6
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 17
-
+checknbshapes result -vertex 4 -edge 6 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 17
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/I1 b/tests/thrusection/specific/I1
index 9cf3191748..0465e2d70f 100755
--- a/tests/thrusection/specific/I1
+++ b/tests/thrusection/specific/I1
@@ -31,16 +31,7 @@ buildsweep result
 
 set square 795.95
 
-set nb_v_good 2
-set nb_e_good 9
-set nb_w_good 3
-set nb_f_good 3
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 18
-
+checknbshapes result -vertex 2 -edge 9 -wire 3 -face 3 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 18
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/I2 b/tests/thrusection/specific/I2
index 122400d961..22e5f5d139 100755
--- a/tests/thrusection/specific/I2
+++ b/tests/thrusection/specific/I2
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 1294.43
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/I3 b/tests/thrusection/specific/I3
index e9a046708c..4a8e08f12c 100755
--- a/tests/thrusection/specific/I3
+++ b/tests/thrusection/specific/I3
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 1313.1
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/I4 b/tests/thrusection/specific/I4
index b14c4ea4e8..9b4ef6421c 100755
--- a/tests/thrusection/specific/I4
+++ b/tests/thrusection/specific/I4
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 1294.43
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/I5 b/tests/thrusection/specific/I5
index 361a5351ca..e4c90f5007 100755
--- a/tests/thrusection/specific/I5
+++ b/tests/thrusection/specific/I5
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 1313.1
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/I6 b/tests/thrusection/specific/I6
index 80876a9be8..4cc96e8704 100755
--- a/tests/thrusection/specific/I6
+++ b/tests/thrusection/specific/I6
@@ -33,16 +33,7 @@ buildsweep result
 
 set square 858.182
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/I7 b/tests/thrusection/specific/I7
index f99ef06340..ff3341878f 100755
--- a/tests/thrusection/specific/I7
+++ b/tests/thrusection/specific/I7
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 2121.34
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/I8 b/tests/thrusection/specific/I8
index 40bfc07147..0a69cc306a 100755
--- a/tests/thrusection/specific/I8
+++ b/tests/thrusection/specific/I8
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 2285.24
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/I9 b/tests/thrusection/specific/I9
index a358bdfc60..a9afe09430 100755
--- a/tests/thrusection/specific/I9
+++ b/tests/thrusection/specific/I9
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 1294.43
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/J1 b/tests/thrusection/specific/J1
index 12dd00ca15..b1fccee256 100755
--- a/tests/thrusection/specific/J1
+++ b/tests/thrusection/specific/J1
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 1313.1
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/J2 b/tests/thrusection/specific/J2
index 2740023149..1d96d1a1ab 100755
--- a/tests/thrusection/specific/J2
+++ b/tests/thrusection/specific/J2
@@ -33,16 +33,7 @@ buildsweep result
 
 set square 1259.14
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/J3 b/tests/thrusection/specific/J3
index 5d4fa1b0b9..52d70f72d7 100755
--- a/tests/thrusection/specific/J3
+++ b/tests/thrusection/specific/J3
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 2042.02
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/J4 b/tests/thrusection/specific/J4
index 36cd9478d5..2811c43ce5 100755
--- a/tests/thrusection/specific/J4
+++ b/tests/thrusection/specific/J4
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 2081.25
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/J5 b/tests/thrusection/specific/J5
index 32890b1777..64ca32600b 100755
--- a/tests/thrusection/specific/J5
+++ b/tests/thrusection/specific/J5
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 2042.02
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/J6 b/tests/thrusection/specific/J6
index 35c415b215..cac30a18fe 100755
--- a/tests/thrusection/specific/J6
+++ b/tests/thrusection/specific/J6
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 2081.25
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/J7 b/tests/thrusection/specific/J7
index ab011f2873..c92da00c1f 100755
--- a/tests/thrusection/specific/J7
+++ b/tests/thrusection/specific/J7
@@ -33,16 +33,7 @@ buildsweep result
 
 set square 1346.42
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/J8 b/tests/thrusection/specific/J8
index 9291dbf41f..7216a22c2f 100755
--- a/tests/thrusection/specific/J8
+++ b/tests/thrusection/specific/J8
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 2707.56
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/J9 b/tests/thrusection/specific/J9
index 519c226b7d..9068e4c8d2 100755
--- a/tests/thrusection/specific/J9
+++ b/tests/thrusection/specific/J9
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 2736.65
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/K1 b/tests/thrusection/specific/K1
index 8da0fa322d..9d7bb7d0b2 100755
--- a/tests/thrusection/specific/K1
+++ b/tests/thrusection/specific/K1
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 2042.02
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/K2 b/tests/thrusection/specific/K2
index bc2702c79f..79de16bd4b 100755
--- a/tests/thrusection/specific/K2
+++ b/tests/thrusection/specific/K2
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 2081.25
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/K3 b/tests/thrusection/specific/K3
index 95e177a3bf..d9eb3f7326 100755
--- a/tests/thrusection/specific/K3
+++ b/tests/thrusection/specific/K3
@@ -33,16 +33,7 @@ buildsweep result
 
 set square 1683.87
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/K4 b/tests/thrusection/specific/K4
index 833f6c23da..6e21fbee9e 100755
--- a/tests/thrusection/specific/K4
+++ b/tests/thrusection/specific/K4
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/K5 b/tests/thrusection/specific/K5
index 3d7dc4c437..dd50d7d183 100755
--- a/tests/thrusection/specific/K5
+++ b/tests/thrusection/specific/K5
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 901.663
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/K6 b/tests/thrusection/specific/K6
index efb7288d0c..86b239c1f3 100755
--- a/tests/thrusection/specific/K6
+++ b/tests/thrusection/specific/K6
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/K7 b/tests/thrusection/specific/K7
index dd4405ba0d..6ba4c599d3 100755
--- a/tests/thrusection/specific/K7
+++ b/tests/thrusection/specific/K7
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 901.663
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/K8 b/tests/thrusection/specific/K8
index 7abc2f4bb2..229e5ed8d3 100755
--- a/tests/thrusection/specific/K8
+++ b/tests/thrusection/specific/K8
@@ -33,16 +33,7 @@ buildsweep result
 
 set square 597.473
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/K9 b/tests/thrusection/specific/K9
index 97918edcb5..80012f9975 100755
--- a/tests/thrusection/specific/K9
+++ b/tests/thrusection/specific/K9
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 1480.16
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/L1 b/tests/thrusection/specific/L1
index c9ceb3c4e8..f802a91781 100755
--- a/tests/thrusection/specific/L1
+++ b/tests/thrusection/specific/L1
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 1465.92
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/L2 b/tests/thrusection/specific/L2
index eeda0e06e7..ac3debc198 100755
--- a/tests/thrusection/specific/L2
+++ b/tests/thrusection/specific/L2
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/L3 b/tests/thrusection/specific/L3
index 066e85eeb4..03ac5d64e7 100755
--- a/tests/thrusection/specific/L3
+++ b/tests/thrusection/specific/L3
@@ -29,16 +29,7 @@ buildsweep result
 
 set square 901.663
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/L4 b/tests/thrusection/specific/L4
index d871bba098..1191ecc52b 100755
--- a/tests/thrusection/specific/L4
+++ b/tests/thrusection/specific/L4
@@ -33,16 +33,7 @@ buildsweep result
 
 set square 881.045
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/L5 b/tests/thrusection/specific/L5
index 0d3421e7ea..b117ba1446 100755
--- a/tests/thrusection/specific/L5
+++ b/tests/thrusection/specific/L5
@@ -31,16 +31,7 @@ catch {buildsweep result}
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/L6 b/tests/thrusection/specific/L6
index 90d173bff1..b316aae350 100755
--- a/tests/thrusection/specific/L6
+++ b/tests/thrusection/specific/L6
@@ -31,16 +31,7 @@ catch {buildsweep result}
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/L7 b/tests/thrusection/specific/L7
index 5a5405cd35..725f52aa32 100755
--- a/tests/thrusection/specific/L7
+++ b/tests/thrusection/specific/L7
@@ -31,16 +31,7 @@ catch {buildsweep result}
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/L8 b/tests/thrusection/specific/L8
index 13a001b87e..d9e0511c7a 100755
--- a/tests/thrusection/specific/L8
+++ b/tests/thrusection/specific/L8
@@ -31,16 +31,7 @@ catch {buildsweep result}
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/L9 b/tests/thrusection/specific/L9
index 0093030f30..cbc045f3fc 100755
--- a/tests/thrusection/specific/L9
+++ b/tests/thrusection/specific/L9
@@ -35,16 +35,7 @@ catch {buildsweep result}
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/M1 b/tests/thrusection/specific/M1
index 447237c80d..1f2197cbfb 100755
--- a/tests/thrusection/specific/M1
+++ b/tests/thrusection/specific/M1
@@ -31,16 +31,7 @@ catch {buildsweep result}
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/M2 b/tests/thrusection/specific/M2
index 32e6813efd..fb0166dffe 100755
--- a/tests/thrusection/specific/M2
+++ b/tests/thrusection/specific/M2
@@ -31,16 +31,7 @@ catch {buildsweep result}
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/M3 b/tests/thrusection/specific/M3
index 47d47d30a8..50a108bc0f 100755
--- a/tests/thrusection/specific/M3
+++ b/tests/thrusection/specific/M3
@@ -31,16 +31,7 @@ catch {buildsweep result}
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/M4 b/tests/thrusection/specific/M4
index 2d6fbef47b..96b809660f 100755
--- a/tests/thrusection/specific/M4
+++ b/tests/thrusection/specific/M4
@@ -31,16 +31,7 @@ catch {buildsweep result}
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set 3dviewer 0
diff --git a/tests/thrusection/specific/M5 b/tests/thrusection/specific/M5
index 79391e4136..0c03ab9c5f 100755
--- a/tests/thrusection/specific/M5
+++ b/tests/thrusection/specific/M5
@@ -35,16 +35,7 @@ catch {buildsweep result}
 
 set square 898.589
 
-set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 8
-
+checknbshapes result -vertex 2 -edge 3 -wire 1 -face 1 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 8
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/M6 b/tests/thrusection/specific/M6
index 3715686e86..b90151e1b8 100755
--- a/tests/thrusection/specific/M6
+++ b/tests/thrusection/specific/M6
@@ -106,16 +106,7 @@ catch {buildsweep result}
 
 set square 181746
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 58
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/M7 b/tests/thrusection/specific/M7
index cc169434eb..704bc4be23 100755
--- a/tests/thrusection/specific/M7
+++ b/tests/thrusection/specific/M7
@@ -106,16 +106,7 @@ catch {buildsweep result}
 
 set square 591941
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 58
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/M8 b/tests/thrusection/specific/M8
index 952e5f0295..86db9a1993 100755
--- a/tests/thrusection/specific/M8
+++ b/tests/thrusection/specific/M8
@@ -106,16 +106,7 @@ catch {buildsweep result}
 
 set square 181746
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 58
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/M9 b/tests/thrusection/specific/M9
index 35e04777c7..6cab3cd8ab 100755
--- a/tests/thrusection/specific/M9
+++ b/tests/thrusection/specific/M9
@@ -106,16 +106,7 @@ catch {buildsweep result}
 
 set square 591941
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 58
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/N1 b/tests/thrusection/specific/N1
index b909fa854e..95d7bab7f1 100755
--- a/tests/thrusection/specific/N1
+++ b/tests/thrusection/specific/N1
@@ -106,16 +106,7 @@ catch {buildsweep result}
 
 set square 182717
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 58
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/N2 b/tests/thrusection/specific/N2
index a6dd4cd22d..fd5da593f3 100755
--- a/tests/thrusection/specific/N2
+++ b/tests/thrusection/specific/N2
@@ -106,16 +106,7 @@ catch {buildsweep result}
 
 set square 592023
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 58
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/N3 b/tests/thrusection/specific/N3
index 0035bfbbbe..0c41c956a9 100755
--- a/tests/thrusection/specific/N3
+++ b/tests/thrusection/specific/N3
@@ -106,16 +106,7 @@ catch {buildsweep result}
 
 set square 181746
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 58
 
 
 set index [lsearch [whatis result] Closed]
diff --git a/tests/thrusection/specific/N4 b/tests/thrusection/specific/N4
index 59b577ce20..7c0219c76c 100755
--- a/tests/thrusection/specific/N4
+++ b/tests/thrusection/specific/N4
@@ -106,16 +106,7 @@ catch {buildsweep result}
 
 set square 591941
 
-set nb_v_good 2
-set nb_e_good 33
-set nb_w_good 11
-set nb_f_good 11
-set nb_sh_good 1
-set nb_sol_good 0
-set nb_compsol_good 0
-set nb_compound_good 0
-set nb_shape_good 58
-
+checknbshapes result -vertex 2 -edge 33 -wire 11 -face 11 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 58
 
 
 set index [lsearch [whatis result] Closed]