diff --git a/src/DrawResources/DrawPlugin b/src/DrawResources/DrawPlugin
index dc17bad4db..d5034c3a4e 100755
--- a/src/DrawResources/DrawPlugin
+++ b/src/DrawResources/DrawPlugin
@@ -37,7 +37,6 @@ DATAEXCHANGEKERNEL : XSDRAW
 OCAF               : VISUALIZATION, OCAFKERNEL
 DATAEXCHANGE       : XDE, VISUALIZATION
 XDE                : DATAEXCHANGEKERNEL, XDEDRAW
-FULL               : MODELING, OCAFKERNEL, VISUALIZATION 
 ALL                : MODELING, OCAFKERNEL, DATAEXCHANGE
 
 TOPTEST            : TKTopTest
diff --git a/tests/bugs/caf/bug26290_compatibility b/tests/bugs/caf/bug26290_compatibility
index 73a9cfc383..079f45a7eb 100644
--- a/tests/bugs/caf/bug26290_compatibility
+++ b/tests/bugs/caf/bug26290_compatibility
@@ -6,7 +6,7 @@
 # Testing command:   standard set of commands
 #
 # The test checks compatibility with old format files. Old files: bug26290_oldformat1.cbf & bug26290_oldformat2.cbf
-pload FULL
+pload OCAF VISUALIZATION
 set Lab1 0:1:1
 set Lab2 0:1:2
 
diff --git a/tests/bugs/caf/bug26290_newattribute_1 b/tests/bugs/caf/bug26290_newattribute_1
index 023dc9ecfe..12252fad4f 100644
--- a/tests/bugs/caf/bug26290_newattribute_1
+++ b/tests/bugs/caf/bug26290_newattribute_1
@@ -7,7 +7,7 @@
 #
 # The test checks joint work of these attributes (including Undo/Redo) and keeps result in 'bug26290_new_1.cbf' file
 
-pload FULL
+pload OCAF VISUALIZATION
 
 box b 100 200 300
 NewDocument D BinOcaf
diff --git a/tests/bugs/caf/bug26290_newattribute_2 b/tests/bugs/caf/bug26290_newattribute_2
index 6450f68211..bf2e2048a2 100644
--- a/tests/bugs/caf/bug26290_newattribute_2
+++ b/tests/bugs/caf/bug26290_newattribute_2
@@ -7,7 +7,8 @@
 #
 # The test checks joint work of these attributes, opens kept before file 'bug26290_new_1.cbf', modifies it,
 # checks Undo/Redo work and keeps it in 'bug26290_new_2.cbf'
-pload FULL
+
+pload OCAF VISUALIZATION
 
 # prepare document
 box b 100 200 300
diff --git a/tests/caf/basic/M4 b/tests/caf/basic/M4
index bc2fbb6e4b..a31c599361 100755
--- a/tests/caf/basic/M4
+++ b/tests/caf/basic/M4
@@ -6,7 +6,6 @@ puts ""
 # Improvement of storage of Ocaf document in XML file format
 ######################################################
 
-#pload FULL
 NewDocument M4 XmlOcaf
 
 # Simple array with many separators inside.
diff --git a/tests/caf/named_shape/E1 b/tests/caf/named_shape/E1
index e26a85be21..52e0b74562 100755
--- a/tests/caf/named_shape/E1
+++ b/tests/caf/named_shape/E1
@@ -15,7 +15,6 @@
 # 8. Recompute selections
 # ===============================================
 
-#pload FULL
 erase 
 Close D 
 
diff --git a/tests/caf/named_shape/E2 b/tests/caf/named_shape/E2
index 711c186c36..de9896333f 100755
--- a/tests/caf/named_shape/E2
+++ b/tests/caf/named_shape/E2
@@ -15,7 +15,6 @@
 # 9. Recompute selections
 # ===============================================
 
-#pload FULL
 erase
 Close D
 
diff --git a/tests/caf/named_shape/E3 b/tests/caf/named_shape/E3
index e3da7053bf..70848c0758 100755
--- a/tests/caf/named_shape/E3
+++ b/tests/caf/named_shape/E3
@@ -14,7 +14,6 @@
 # 8. Recompute selections
 # ===============================================
 
-#pload FULL
 erase 
 Close D 
 
diff --git a/tests/caf/named_shape/E4 b/tests/caf/named_shape/E4
index 0cceef75da..c4138164db 100755
--- a/tests/caf/named_shape/E4
+++ b/tests/caf/named_shape/E4
@@ -13,7 +13,6 @@
 # 7. Recompute modeling functions
 # 8. Recompute selections
 # ===============================================
-#pload FULL
 
 erase 
 Close D 
diff --git a/tests/caf/named_shape/E5 b/tests/caf/named_shape/E5
index d5626b8b6b..73a53957c9 100755
--- a/tests/caf/named_shape/E5
+++ b/tests/caf/named_shape/E5
@@ -13,7 +13,6 @@
 # 7. Recompute modeling functions
 # 8. Recompute selections
 # ===============================================
-#pload FULL
 
 erase 
 Close D 
diff --git a/tests/caf/named_shape/E6 b/tests/caf/named_shape/E6
index ed0bacba3a..4c36ee7b8a 100755
--- a/tests/caf/named_shape/E6
+++ b/tests/caf/named_shape/E6
@@ -17,8 +17,6 @@
 # 11. Recompute selections
 # ===============================================
 
-#pload FULL
-
 erase 
 Close D 
 
diff --git a/tests/caf/named_shape/E7 b/tests/caf/named_shape/E7
index c68f2b3d2b..ce074359be 100755
--- a/tests/caf/named_shape/E7
+++ b/tests/caf/named_shape/E7
@@ -18,7 +18,6 @@
 # 12. Recompute selections
 # ===============================================
 
-#pload FULL
 erase
 Close D
 
diff --git a/tests/caf/named_shape/E8 b/tests/caf/named_shape/E8
index 1a4100a9c5..8dbaec47f8 100755
--- a/tests/caf/named_shape/E8
+++ b/tests/caf/named_shape/E8
@@ -16,7 +16,6 @@
 # 10. Recompute selections
 # ===============================================
 
-#pload FULL
 erase
 Close D
 
diff --git a/tests/caf/named_shape/E9 b/tests/caf/named_shape/E9
index 509792178a..e4cf671f4b 100755
--- a/tests/caf/named_shape/E9
+++ b/tests/caf/named_shape/E9
@@ -15,7 +15,6 @@
 # 8. Recompute selections
 # ===============================================
 
-#pload FULL
 erase 
 Close D 
 
diff --git a/tests/caf/named_shape/F1 b/tests/caf/named_shape/F1
index 62e4b96951..ecb23c3eb2 100755
--- a/tests/caf/named_shape/F1
+++ b/tests/caf/named_shape/F1
@@ -19,7 +19,6 @@
 # 12. Recompute selections
 # ===============================================
 
-#pload FULL
 erase 
 Close D 
 
diff --git a/tests/caf/named_shape/F2 b/tests/caf/named_shape/F2
index 8f32cd2463..3998f5cc17 100755
--- a/tests/caf/named_shape/F2
+++ b/tests/caf/named_shape/F2
@@ -16,7 +16,6 @@
 # 9. Recompute selections
 # ===============================================
 
-#pload FULL
 erase 
 Close D 
 
diff --git a/tests/caf/named_shape/F3 b/tests/caf/named_shape/F3
index ec997308f1..1653baff43 100755
--- a/tests/caf/named_shape/F3
+++ b/tests/caf/named_shape/F3
@@ -21,8 +21,6 @@
 # 11. Recompute selections
 # ===============================================
 
-
-#pload FULL
 erase 
 Close D 
 
diff --git a/tests/caf/named_shape/F4 b/tests/caf/named_shape/F4
index b8567e2f7f..cc914aa58e 100755
--- a/tests/caf/named_shape/F4
+++ b/tests/caf/named_shape/F4
@@ -14,7 +14,6 @@
 # 8. Recompute selections
 # ===============================================
 
-#pload FULL
 erase
 Close D
 
diff --git a/tests/caf/named_shape/F5 b/tests/caf/named_shape/F5
index 1ff426cd89..1aa79668e5 100755
--- a/tests/caf/named_shape/F5
+++ b/tests/caf/named_shape/F5
@@ -17,7 +17,6 @@
 # 11. Recompute selections
 # ===============================================
 
-#pload FULL
 erase 
 Close D 
 
diff --git a/tests/caf/named_shape/F6 b/tests/caf/named_shape/F6
index 7485059b0b..fdd1c18dc5 100755
--- a/tests/caf/named_shape/F6
+++ b/tests/caf/named_shape/F6
@@ -19,7 +19,6 @@
 # 13. Recompute selections
 # ===============================================
 
-#pload FULL
 erase 
 Close D 
 
diff --git a/tests/caf/named_shape/F7 b/tests/caf/named_shape/F7
index 66069267f4..1d0532a110 100644
--- a/tests/caf/named_shape/F7
+++ b/tests/caf/named_shape/F7
@@ -18,7 +18,6 @@
 # 12. Recompute 
 # ===============================================
 
-#pload FULL
 erase 
 Close D 
 
diff --git a/tests/caf/named_shape/F8 b/tests/caf/named_shape/F8
index 2d00b9cf6b..36389003db 100755
--- a/tests/caf/named_shape/F8
+++ b/tests/caf/named_shape/F8
@@ -14,7 +14,6 @@
 # 6. Recompute
 # ===============================================
 
-pload FULL
 set doc d16
 NewDocument $doc BinOcaf
 AddDriver $doc Box Fuse Attach
diff --git a/tests/caf/named_shape/F9 b/tests/caf/named_shape/F9
index 4b8e16d85e..c3612a5515 100755
--- a/tests/caf/named_shape/F9
+++ b/tests/caf/named_shape/F9
@@ -14,10 +14,10 @@
 # 6. Recompute
 # ===============================================
 
-pload FULL
 set doc d16
 NewDocument $doc BinOcaf
 AddDriver $doc Box Fuse Attach
+
 #1.create 3 boxes
 set B1 [AddBox $doc 100 200 350]
 set B2 [AddBox $doc 330 330 90]