diff --git a/tests/bugs/demo/bug23562_1 b/tests/bugs/demo/bug23562_1
index fc2824ed88..bb24693a9a 100755
--- a/tests/bugs/demo/bug23562_1
+++ b/tests/bugs/demo/bug23562_1
@@ -7,7 +7,6 @@ puts ""
 ##########################################################################################################
 
 restore [locate_data_file bug23562_V3.brep] result
-set nb_info [nbshapes result]
 
 set nb_v_good 25
 set nb_e_good 45
diff --git a/tests/bugs/demo/bug23562_2 b/tests/bugs/demo/bug23562_2
index 5c8501472d..e950216515 100755
--- a/tests/bugs/demo/bug23562_2
+++ b/tests/bugs/demo/bug23562_2
@@ -7,7 +7,6 @@ puts ""
 ##########################################################################################################
 
 restore [locate_data_file bug23562_V4.brep] result
-set nb_info [nbshapes result]
 
 set nb_v_good 24
 set nb_e_good 43
diff --git a/tests/bugs/demo/bug23562_3 b/tests/bugs/demo/bug23562_3
index c8e2653052..067b07232d 100755
--- a/tests/bugs/demo/bug23562_3
+++ b/tests/bugs/demo/bug23562_3
@@ -7,8 +7,8 @@ puts ""
 ##########################################################################################################
 
 restore [locate_data_file bug23562_V3.brep] result
-set nb_info [nbshapes result -t]
 
+set nbsh_t 1
 set nb_v_good 31
 set nb_e_good 51
 set nb_w_good 16
diff --git a/tests/bugs/demo/bug23562_4 b/tests/bugs/demo/bug23562_4
index bb9564a35d..b31dc7d416 100755
--- a/tests/bugs/demo/bug23562_4
+++ b/tests/bugs/demo/bug23562_4
@@ -7,8 +7,8 @@ puts ""
 ##########################################################################################################
 
 restore [locate_data_file bug23562_V4.brep] result
-set nb_info [nbshapes result -t]
 
+set nbsh_t 1
 set nb_v_good 30
 set nb_e_good 49
 set nb_w_good 21
diff --git a/tests/bugs/demo/bug23562_5 b/tests/bugs/demo/bug23562_5
index 6ddf5a71f9..e53dcd54c0 100755
--- a/tests/bugs/demo/bug23562_5
+++ b/tests/bugs/demo/bug23562_5
@@ -9,7 +9,6 @@ puts ""
 restore [locate_data_file bug23562_V3.brep] a
 explode a f
 compound a_1 a_16 result
-set nb_info [nbshapes result]
 
 set nb_v_good 6
 set nb_e_good 6
diff --git a/tests/bugs/demo/bug23562_6 b/tests/bugs/demo/bug23562_6
index b75edd93d9..76aaf77a3d 100755
--- a/tests/bugs/demo/bug23562_6
+++ b/tests/bugs/demo/bug23562_6
@@ -9,8 +9,8 @@ puts ""
 restore [locate_data_file bug23562_V3.brep] a
 explode a f
 compound a_1 a_16 result
-set nb_info [nbshapes result -t]
 
+set nbsh_t 1
 set nb_v_good 12
 set nb_e_good 12
 set nb_w_good 2
diff --git a/tests/bugs/demo/end b/tests/bugs/demo/end
deleted file mode 100755
index d2a6600b6c..0000000000
--- a/tests/bugs/demo/end
+++ /dev/null
@@ -1,114 +0,0 @@
-if { [isdraw result] } {
-   
-   if { [info exists square] } {
-      set prop "square"
-      set mass $square
-      regexp {Mass +: +([-0-9.+eE]+)} [sprops result] full m      
-   }
-   if { [info exists length] } {
-      set prop "length"
-      set mass $length
-      regexp {Mass +: +([-0-9.+eE]+)} [lprops result] full m      
-   }
-   if { [info exists mass] } {
-      #if mass (length or square) is empty in test case then result should be an empty shape.
-      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 { [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"
-	}
-    }
-
-}
diff --git a/tests/bugs/end b/tests/bugs/end
index af27a99fa6..b0fd1654ab 100755
--- a/tests/bugs/end
+++ b/tests/bugs/end
@@ -43,7 +43,11 @@ if { [info exists mass] } {
 
 set glob_inf [info global nb_*_good]
 if { [regexp "nb_.*_good" $glob_inf] == 1 } {
-    set nb_info [nbshapes result]
+    if { [info exists nbsh_t] } {
+	set nb_info [nbshapes result -t]
+    } else {
+        set nb_info [nbshapes result]
+    }
 }
 
 if { [info exists nb_v_good] } {
diff --git a/tests/xcaf/brep_to_igs_add_CL/G4 b/tests/xcaf/brep_to_igs_add_CL/G4
index 6c2ac4fe8d..c6ecca293b 100644
--- a/tests/xcaf/brep_to_igs_add_CL/G4
+++ b/tests/xcaf/brep_to_igs_add_CL/G4
@@ -1,3 +1,7 @@
+puts "TODO OCC22820 ALL: Error : SEWING IS NOT PERFORMED PROPERLY"
+puts "TODO OCC22820 ALL: Volumes' difference is"
+puts "TODO OCC22820 ALL: nbClosedShells is wrong"
+
 restore [locate_data_file CTO909_part_syb.brep] Shape1
 XNewDoc D_First
 
diff --git a/tests/xcaf/brep_to_igs_add_CL/G5 b/tests/xcaf/brep_to_igs_add_CL/G5
index ea2919b6ae..4c33d5d2ad 100644
--- a/tests/xcaf/brep_to_igs_add_CL/G5
+++ b/tests/xcaf/brep_to_igs_add_CL/G5
@@ -1,3 +1,7 @@
+puts "TODO OCC22820 ALL: SEWING IS NOT PERFORMED PROPERLY"
+puts "TODO OCC22820 ALL: Volumes' difference is"
+puts "TODO OCC22820 ALL: Error : nbClosedShells is wrong"
+
 restore [locate_data_file CTO909_shape.brep] Shape1
 XNewDoc D_First