diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx
index 6c08941e18..8b77b57cc9 100644
--- a/src/BRepOffset/BRepOffset_Tool.cxx
+++ b/src/BRepOffset/BRepOffset_Tool.cxx
@@ -3915,9 +3915,10 @@ TopoDS_Shape BRepOffset_Tool::Deboucle3D(const TopoDS_Shape& S,
               continue;
             }
           }
-          if (!Boundary.Contains(anEdge) &&
-              !BRep_Tool::Degenerated(anEdge))
+          if (!Boundary.IsEmpty() && !Boundary.Contains(anEdge) && !BRep_Tool::Degenerated(anEdge))
+          {
             JeGarde = Standard_False;
+          }
         }
       }
       if (JeGarde) SS = S;
diff --git a/tests/bugs/modalg_2/bug5805_17 b/tests/bugs/modalg_2/bug5805_17
index f1a70c9126..03a9d0ee59 100755
--- a/tests/bugs/modalg_2/bug5805_17
+++ b/tests/bugs/modalg_2/bug5805_17
@@ -1,7 +1,4 @@
 puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: Error: The command cannot be built"
-puts "TODO OCC25925 ALL: TEST INCOMPLETE"
-puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
 
 puts "============"
 puts "OCC5805"
@@ -37,7 +34,7 @@ set distance -0.001
 catch { OFFSETSHAPE $distance {} $calcul $type }
 # Null result
 
-checkprops result -s 495.635 
+checkprops result -s 234.792 
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
@@ -51,6 +48,6 @@ if {$index == -1} {
   
 }
 
-checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
+checknbshapes result -vertex 6 -edge 6 -wire 3 -face 3 -shell 3 -solid 0 -compsolid 0 -compound 1 -shape 22
 
 checkview -display result -2d -path ${imagedir}/${test_image}.png
diff --git a/tests/bugs/modalg_2/bug5805_41 b/tests/bugs/modalg_2/bug5805_41
index 46c4a054e2..d81c2db1fd 100755
--- a/tests/bugs/modalg_2/bug5805_41
+++ b/tests/bugs/modalg_2/bug5805_41
@@ -1,6 +1,4 @@
-puts "TODO OCC25925 ALL: Error: The command cannot be built"
-puts "TODO OCC25925 ALL: TEST INCOMPLETE"
-puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
+puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
 
 puts "============"
 puts "OCC5805"
@@ -36,9 +34,9 @@ set distance -0.001
 catch { OFFSETSHAPE $distance {} $calcul $type }
 # Null result
 
-checkprops result -s 495.635 
+checkprops result -s 356.089 
 
-checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
+checknbshapes result -vertex 6 -edge 6 -wire 3 -face 3 -shell 3 -solid 0 -compsolid 0 -compound 1 -shape 22
 
 set index [lsearch [whatis s] Closed]
 if {$index == -1} {
diff --git a/tests/bugs/modalg_7/bug31845_h b/tests/bugs/modalg_7/bug31845_h
index 44f3dd4089..e715c55aac 100644
--- a/tests/bugs/modalg_7/bug31845_h
+++ b/tests/bugs/modalg_7/bug31845_h
@@ -1,5 +1,3 @@
-puts "TODO OCC31845 All: ERROR: null result"
-
 puts "============================================"
 puts "OCC31845: BRepOffsetAPI_MakeThickSolid fails"
 puts "============================================"
diff --git a/tests/bugs/modalg_8/bug33558 b/tests/bugs/modalg_8/bug33558
new file mode 100644
index 0000000000..e6a0ab4209
--- /dev/null
+++ b/tests/bugs/modalg_8/bug33558
@@ -0,0 +1,10 @@
+puts "===================================================================="
+puts "0033558: Modeling Algorithms - The solids does not preserve geometry topology after applying offset to all faces"
+puts "===================================================================="
+puts ""
+
+pload MODELING
+restore [locate_data_file bug33558.brep] bb
+offsetshape r bb -50
+checkshape r
+checkview -display r -2d -path ${imagedir}/${test_image}.png
diff --git a/tests/offset/shape_type_a/A2 b/tests/offset/shape_type_a/A2
index 97c4a41fca..038277514c 100644
--- a/tests/offset/shape_type_a/A2
+++ b/tests/offset/shape_type_a/A2
@@ -1,3 +1,5 @@
+puts "TODO OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
+
 #old file ofc25
 restore [locate_data_file CHE_bb60.rle] s
 OFFSETSHAPE 0.37 {} $calcul $type
diff --git a/tests/offset/shape_type_i/B8 b/tests/offset/shape_type_i/B8
index 1b7108ab0b..955add7340 100644
--- a/tests/offset/shape_type_i/B8
+++ b/tests/offset/shape_type_i/B8
@@ -1,9 +1,5 @@
-puts "TODO OCC23068 ALL: result is not a topological shape"
-puts "TODO OCC23068 ALL: TEST INCOMPLETE"
-puts "TODO OCC23068 ALL: Error: The command cannot be built"
-
 ptorus s 10 10 0 45
 
 OFFSETSHAPE 1 {} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 18408.6
diff --git a/tests/offset/shape_type_i/F6 b/tests/offset/shape_type_i/F6
index efb55153e3..de1095dae4 100644
--- a/tests/offset/shape_type_i/F6
+++ b/tests/offset/shape_type_i/F6
@@ -1,6 +1,5 @@
-puts "TODO OCC23068 ALL: result is not a topological shape"
-puts "TODO OCC23068 ALL: Error: The command cannot be built"
-puts "TODO OCC23068 ALL: TEST INCOMPLETE"
+puts "TODO OCC25983 ALL: Error : The volume of result shape is"
+puts "TODO OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
 
 cpulimit 500
 
diff --git a/tests/offset/shape_type_i_c/U6 b/tests/offset/shape_type_i_c/U6
index 50afd71671..f3ce32ad44 100755
--- a/tests/offset/shape_type_i_c/U6
+++ b/tests/offset/shape_type_i_c/U6
@@ -2,15 +2,12 @@
 ##puts "TODO OCC27414 ALL: Error : The area of result shape is"
 ##puts "TODO OCC27414 ALL: Faulty shapes in variables faulty_"
 ##puts "TODO OCC27414 ALL: Error : The area of face"
-puts "TODO OCC27414 ALL: Error: The command cannot be built"
-puts "TODO OCC27414 ALL: gives an empty result"
-puts "TODO OCC27414 ALL: TEST INCOMPLETE"
 
 restore [locate_data_file bug26917_M2_trim33.brep] s
 
 OFFSETSHAPE 5 {} $calcul $type
 
-checkprops result -v 0
-checkprops result -s 0
+checkprops result -v 301442
+checkprops result -s 39899.1
 
 checknbshapes result -shell 1
diff --git a/tests/offset/shape_type_i_c/XC5 b/tests/offset/shape_type_i_c/XC5
index 1532e696ea..0ed63e6d33 100644
--- a/tests/offset/shape_type_i_c/XC5
+++ b/tests/offset/shape_type_i_c/XC5
@@ -1,12 +1,8 @@
-puts "TODO OCC27414 ALL: Error: The command cannot be built"
-puts "TODO OCC27414 ALL: gives an empty result"
-puts "TODO OCC27414 ALL: TEST INCOMPLETE"
-
 restore [locate_data_file bug26917_input.dom7742_simple.brep] s
 
 OFFSETSHAPE 10 {} $calcul $type
 
-checkprops result -v 0
-checkprops result -s 0
+checkprops result -v 10375.5
+checkprops result -s 7292.19
 
 checknbshapes result -shell 1
diff --git a/tests/offset/shape_type_i_c/XU5 b/tests/offset/shape_type_i_c/XU5
index e46970e04d..e418518384 100644
--- a/tests/offset/shape_type_i_c/XU5
+++ b/tests/offset/shape_type_i_c/XU5
@@ -6,6 +6,11 @@ puts "TODO CR27414 ALL: Error: operation with offset value 11 has failed"
 puts "TODO CR27414 ALL: Error: operation with offset value 12 has failed"
 puts "TODO CR27414 ALL: Operations with following offset values have failed: 7 8 9 10 11 12"
 puts "TODO CR27414 ALL: Error : The offset cannot be built"
+puts "TODO OCC25983 ALL: Error: number of wire entities in the result shape is"
+puts "TODO OCC25983 ALL: Error: number of face entities in the result shape is"
+puts "TODO OCC25983 ALL: Error: number of solid entities in the result shape is"
+puts "TODO OCC25983 ALL: Error: The area of result shape is"
+puts "TODO OCC25983 ALL: Error: The volume of result shape is"
 
 puts "============================================================================================="
 puts "0032333: Modeling Algorithms - Empty(wrong) result of offset operation in mode \"Complete\" join type \"Intersection\""
diff --git a/tests/offset/shape_type_i_c/XZ4 b/tests/offset/shape_type_i_c/XZ4
index bef4dd74e9..803dedd5ad 100644
--- a/tests/offset/shape_type_i_c/XZ4
+++ b/tests/offset/shape_type_i_c/XZ4
@@ -1,8 +1,11 @@
 puts "TODO CR27414 ALL: Error: number of wire entities in the result"
 puts "TODO CR27414 ALL: Error: number of face entities in the result"
+puts "TODO CR27414 ALL: Error: number of solid entities in the result"
 puts "TODO CR27414 ALL: Error: operation with offset value 9 has failed"
 puts "TODO CR27414 ALL: Error: operation with offset value 10 has failed"
 puts "TODO CR27414 ALL: Operations with following offset values have failed: 9 10"
+puts "TODO OCC25983 ALL: Error: The area of result shape is"
+puts "TODO OCC25983 ALL: Error: The volume of result shape is"
 
 puts "============================================================================================="
 puts "0032333: Modeling Algorithms - Empty(wrong) result of offset operation in mode \"Complete\" join type \"Intersection\""
diff --git a/tests/offset/shape_type_i_c/XZ5 b/tests/offset/shape_type_i_c/XZ5
index 479f7f83cc..88a2e53b1f 100644
--- a/tests/offset/shape_type_i_c/XZ5
+++ b/tests/offset/shape_type_i_c/XZ5
@@ -1,5 +1,10 @@
 puts "TODO CR27414 ALL: Error: operation with offset value 9 has failed"
 puts "TODO CR27414 ALL: Operations with following offset values have failed: 9"
+puts "TODO CR27414 ALL: Error: number of wire entities in the result"
+puts "TODO CR27414 ALL: Error: number of face entities in the result"
+puts "TODO CR27414 ALL: Error: number of solid entities in the result"
+puts "TODO OCC25983 ALL: Error: The area of result shape is"
+puts "TODO OCC25983 ALL: Error: The volume of result shape is"
 
 puts "============================================================================================="
 puts "0032333: Modeling Algorithms - Empty(wrong) result of offset operation in mode \"Complete\" join type \"Intersection\""
diff --git a/tests/offset/shape_type_i_c/XZ7 b/tests/offset/shape_type_i_c/XZ7
index 54ed10b54d..c52aef6284 100644
--- a/tests/offset/shape_type_i_c/XZ7
+++ b/tests/offset/shape_type_i_c/XZ7
@@ -5,6 +5,12 @@ puts "TODO CR27414 ALL: Error: operation with offset value 10 has failed"
 puts "TODO CR27414 ALL: Error: operation with offset value 11 has failed"
 puts "TODO CR27414 ALL: Error: operation with offset value 12 has failed"
 puts "TODO CR27414 ALL: Operations with following offset values have failed: 7 8 9 10 11 12"
+puts "TODO CR27414 ALL: Error: number of wire entities in the result"
+puts "TODO CR27414 ALL: Error: number of face entities in the result"
+puts "TODO CR27414 ALL: Error: number of solid entities in the result"
+puts "TODO OCC25983 ALL: Error: The area of result shape is"
+puts "TODO OCC25983 ALL: Error: The volume of result shape is"
+
 
 puts "============================================================================================="
 puts "0032333: Modeling Algorithms - Empty(wrong) result of offset operation in mode \"Complete\" join type \"Intersection\""
diff --git a/tests/offset/shape_type_i_c/ZC5 b/tests/offset/shape_type_i_c/ZC5
index 5d12f647c8..49d3d8d1aa 100644
--- a/tests/offset/shape_type_i_c/ZC5
+++ b/tests/offset/shape_type_i_c/ZC5
@@ -1,6 +1,5 @@
-puts "TODO OCC27414 ALL: Error: The command cannot be built"
-puts "TODO OCC27414 ALL: gives an empty result"
-puts "TODO OCC27414 ALL: TEST INCOMPLETE"
+puts "TODO OCC25983 ALL: Error : The area of result shape is"
+puts "TODO OCC25983 ALL: Error : The volume of result shape is"
 
 restore [locate_data_file bug26917_M2_trim32.brep] s
 
diff --git a/tests/offset/shape_type_i_c/ZC7 b/tests/offset/shape_type_i_c/ZC7
index 647b14293f..492abe3dda 100644
--- a/tests/offset/shape_type_i_c/ZC7
+++ b/tests/offset/shape_type_i_c/ZC7
@@ -1,6 +1,5 @@
-puts "TODO OCC27414 ALL: Error: The command cannot be built"
-puts "TODO OCC27414 ALL: gives an empty result"
-puts "TODO OCC27414 ALL: TEST INCOMPLETE"
+puts "TODO OCC25983 ALL: Error : The area of result shape is"
+puts "TODO OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
 
 restore [locate_data_file bug26917_M2_trim34.brep] s
 
diff --git a/tests/offset/shape_type_i_c/ZE7 b/tests/offset/shape_type_i_c/ZE7
index b84f92e6c1..9e233ee1e8 100644
--- a/tests/offset/shape_type_i_c/ZE7
+++ b/tests/offset/shape_type_i_c/ZE7
@@ -1,7 +1,5 @@
-#puts "TODO CR27414 ALL: Error : The volume of result shape is"
-puts "TODO OCC27414 ALL: Error: The command cannot be built"
-puts "TODO OCC27414 ALL: gives an empty result"
-puts "TODO OCC27414 ALL: TEST INCOMPLETE"
+puts "TODO CR27414 ALL: Error : The volume of result shape is"
+puts "TODO OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
 
 restore [locate_data_file bug26917_M2_trim16.brep] s
 
diff --git a/tests/offset/shape_type_i_c/ZI7 b/tests/offset/shape_type_i_c/ZI7
index 6ecf51effb..d373217590 100644
--- a/tests/offset/shape_type_i_c/ZI7
+++ b/tests/offset/shape_type_i_c/ZI7
@@ -1,6 +1,6 @@
-puts "TODO OCC27414 ALL: Error: The command cannot be built"
-puts "TODO OCC27414 ALL: gives an empty result"
-puts "TODO OCC27414 ALL: TEST INCOMPLETE"
+puts "TODO CR27414 ALL: Error : The volume of result shape is"
+puts "TODO OCC25983 ALL: Error : The area of result shape is"
+puts "TODO OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
 
 restore [locate_data_file bug26917_fills_center.input_trim3.brep] s
 
@@ -9,4 +9,4 @@ OFFSETSHAPE 6 {} $calcul $type
 checkprops result -v 0
 checkprops result -s 0
 
-checknbshapes result -shell 1
+checknbshapes result -shell 3
diff --git a/tests/offset/shape_type_i_c/ZZ7 b/tests/offset/shape_type_i_c/ZZ7
index 4c8d349505..da9efc876c 100644
--- a/tests/offset/shape_type_i_c/ZZ7
+++ b/tests/offset/shape_type_i_c/ZZ7
@@ -1,6 +1,6 @@
-puts "TODO OCC27414 ALL: Error: The command cannot be built"
-puts "TODO OCC27414 ALL: gives an empty result"
-puts "TODO OCC27414 ALL: TEST INCOMPLETE"
+puts "TODO CR27414 ALL: Error : The volume of result shape is"
+puts "TODO OCC25983 ALL: Error : The area of result shape is"
+
 
 restore [locate_data_file bug26917_input.dom7742.brep] s
 
@@ -9,4 +9,4 @@ OFFSETSHAPE 15 {} $calcul $type
 checkprops result -v 0
 checkprops result -s 0
 
-checknbshapes result -shell 1
+checknbshapes result -shell 7