diff --git a/tests/bugs/grids.list b/tests/bugs/grids.list
index 450347c676..9a9f75fb29 100755
--- a/tests/bugs/grids.list
+++ b/tests/bugs/grids.list
@@ -7,10 +7,11 @@
 007 modalg_2
 008 modalg_3
 009 modalg_4
-010 moddata_1
-011 moddata_2
-012 step
-013 caf
-014 mesh
-015 heal
-
+010 modalg_5
+011 moddata_1
+012 moddata_2
+013 moddata_3
+014 step
+015 caf
+016 mesh
+017 heal
diff --git a/tests/bugs/modalg_4/bug8842_6 b/tests/bugs/modalg_4/bug8842_6
index 7bfc6b9a1f..d7017e6a80 100755
--- a/tests/bugs/modalg_4/bug8842_6
+++ b/tests/bugs/modalg_4/bug8842_6
@@ -1,6 +1,6 @@
-puts "TODO OCC11111 ALL: OCC8842: Faulty"
-puts "TODO OCC11111 ALL: Exception"
-puts "TODO OCC11111 ALL: An exception was caught"
+puts "TODO ?OCC11111 ALL: OCC8842: Faulty"
+puts "TODO ?OCC11111 ALL: Exception"
+puts "TODO ?OCC11111 ALL: An exception was caught"
 
 puts "============"
 puts "OCC8842"
diff --git a/tests/bugs/modalg/bug22323 b/tests/bugs/modalg_5/bug22323
similarity index 100%
rename from tests/bugs/modalg/bug22323
rename to tests/bugs/modalg_5/bug22323
diff --git a/tests/bugs/moddata_2/bug22165 b/tests/bugs/moddata_1/bug22165
old mode 100755
new mode 100644
similarity index 97%
rename from tests/bugs/moddata_2/bug22165
rename to tests/bugs/moddata_1/bug22165
index 404adac2f2..f41fda1d8b
--- a/tests/bugs/moddata_2/bug22165
+++ b/tests/bugs/moddata_1/bug22165
@@ -12,7 +12,9 @@ catch { pload XDE }
 
 igesbrep [locate_data_file OCC22165-cub_spain.igs] result *
 
+decho off
 set Log [data c]
+decho on
 
 set LogLength [llength ${Log}]
 
diff --git a/tests/bugs/moddata/bug23703 b/tests/bugs/moddata_3/bug23703
old mode 100755
new mode 100644
similarity index 100%
rename from tests/bugs/moddata/bug23703
rename to tests/bugs/moddata_3/bug23703
diff --git a/tests/bugs/moddata/bug23733 b/tests/bugs/moddata_3/bug23733
old mode 100755
new mode 100644
similarity index 100%
rename from tests/bugs/moddata/bug23733
rename to tests/bugs/moddata_3/bug23733
diff --git a/tests/bugs/moddata/bug23738 b/tests/bugs/moddata_3/bug23738
old mode 100755
new mode 100644
similarity index 100%
rename from tests/bugs/moddata/bug23738
rename to tests/bugs/moddata_3/bug23738