diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index f912ae9579..32e88de2f5 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,14 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-12-03 12:38 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbxdiff/tests/test3.prg
+    ! fixed to run as script
+
+  * contrib/hbnf/tests/dfile.prg
+  * contrib/hbnf/tests/pending.prg
+    * use CLS instead of old dBase trick
+
 2012-12-01 21:40 UTC+0100 Viktor Szakats (harbour syenar.net)
   + contrib/sddfb/sddfb.hbx
   + contrib/sddmy/sddmy.hbx
diff --git a/harbour/contrib/hbnf/tests/dfile.prg b/harbour/contrib/hbnf/tests/dfile.prg
index a194715209..2d2542bd39 100644
--- a/harbour/contrib/hbnf/tests/dfile.prg
+++ b/harbour/contrib/hbnf/tests/dfile.prg
@@ -23,13 +23,13 @@ PROCEDURE Main()
    LOCAL aExitKeys
    LOCAL tmp
 
-   @ 0, 0 CLEAR
+   CLS
 
-   @ 0, 0  SAY "ENTER FILENAME: "   GET CINFILE
-   @ 1, 0  SAY "    FOREGROUND: "   GET NNCOLOR   PICTURE "999"
-   @ 2, 0  SAY "     HIGHLIGHT: "   GET NHCOLOR   PICTURE "999"
-   @ 3, 0  SAY "     EXIT KEYS: "   GET CEXITKEYS
-   @ 4, 0  SAY "   BUFFER SIZE: "   GET NBUFFSIZE PICTURE "9999"
+   @ 0,  0 SAY "ENTER FILENAME: "   GET CINFILE
+   @ 1,  0 SAY "    FOREGROUND: "   GET NNCOLOR   PICTURE "999"
+   @ 2,  0 SAY "     HIGHLIGHT: "   GET NHCOLOR   PICTURE "999"
+   @ 3,  0 SAY "     EXIT KEYS: "   GET CEXITKEYS
+   @ 4,  0 SAY "   BUFFER SIZE: "   GET NBUFFSIZE PICTURE "9999"
    @ 1, 40 SAY "COLUMN INCREMENT: " GET NCOLSKIP  PICTURE "999"
    @ 2, 40 SAY "   MAX LINE SIZE: " GET NRMARGIN  PICTURE "999"
    @ 3, 40 SAY "     BROWSE MODE? " GET LBROWSE   PICTURE "Y"
diff --git a/harbour/contrib/hbnf/tests/pending.prg b/harbour/contrib/hbnf/tests/pending.prg
index cad3316869..636a5aa1c1 100644
--- a/harbour/contrib/hbnf/tests/pending.prg
+++ b/harbour/contrib/hbnf/tests/pending.prg
@@ -6,7 +6,8 @@
 
 PROCEDURE Main()
 
-   @ 0, 0 CLEAR
+   CLS
+
    ft_Pending( "Message one", 20, 0, 3, "W+/G" ) // Displays "Message one."
    // sets row to 20, col to 0.
    // wait to 3 and color to
diff --git a/harbour/contrib/hbxdiff/tests/test3.prg b/harbour/contrib/hbxdiff/tests/test3.prg
index e07f1137c8..a1b276db0d 100644
--- a/harbour/contrib/hbxdiff/tests/test3.prg
+++ b/harbour/contrib/hbxdiff/tests/test3.prg
@@ -4,16 +4,6 @@
 
 #require "hbxdiff"
 
-FUNCTION Diff( ... )
-
-   LOCAL e
-
-   FOR EACH e IN { ... }
-      ? e
-   NEXT
-
-   RETURN 0
-
 PROCEDURE Main()
 
    LOCAL pMMFOld, pMMFNew
@@ -31,3 +21,13 @@ PROCEDURE Main()
    xdl_diff( pMMFOld, pMMFNew, 0, 3, @Diff() )
 
    RETURN
+
+FUNCTION Diff( ... )
+
+   LOCAL e
+
+   FOR EACH e IN { ... }
+      ? e
+   NEXT
+
+   RETURN 0