diff --git a/tests/bugs/modalg_7/bug28640 b/tests/bugs/modalg_7/bug28640
index be1bd412fb..7afefceebe 100755
--- a/tests/bugs/modalg_7/bug28640
+++ b/tests/bugs/modalg_7/bug28640
@@ -1,37 +1,37 @@
-puts "TODO OCC28640 ALL: Faulty shapes in variables faulty_1"
-
-puts "========"
-puts "OCC28640"
-puts "========"
+puts "================"
+puts "0028640: Modeling Algorithms - BRepBuilderAPI_Transform builds invalid shape"
+puts "================"
 puts ""
-##############################################
-# BRepBuilderAPI_Transform build invalid shape
-##############################################
 
+# Analyze triangulation after mirroring shape 
 restore [locate_data_file bug28640_origin_copy.brep] a
-
-smallview
-display a
-front
-fit
+tmirror a 0 0 0 1 0 0
 
 vinit
 vsetdispmode 1
 vdisplay a
 vfront
 vfit
+checkview -screenshot -3d -path ${imagedir}/${test_image}-mirror-3d_1.png
 
-#
+if {[tricheck a] != ""} {
+	puts "Error: invalid triangulation"
+}
 
+# Fix the shape and check its validity after mirroring
+restore [locate_data_file bug28640_origin_copy.brep] a
+fixshape a a
+checkshape a
 tmirror a 0 0 0 1 0 0
-
 checkshape a
 
-display a
-fit
-checkview -screenshot -2d -path ${imagedir}/${test_image}-mirror-2d.png
-
+# Check triangulation of healed and mirrored shape 
 vclear
 vdisplay a
+vfront
 vfit
-checkview -screenshot -3d -path ${imagedir}/${test_image}-mirror-3d.png
+checkview -screenshot -3d -path ${imagedir}/${test_image}-mirror-3d_2.png
+
+if {[tricheck a] != ""} {
+	puts "Error: invalid triangulation"
+}