diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 1ec890ae39..4b292b3b89 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,17 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-29 13:49 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbfbird/tests/hbmk.hbm
+  * contrib/hbfbird/tests/simple.prg
+  * contrib/hbfbird/tests/stress.prg
+  * contrib/hbfbird/tests/test.prg
+    % moved simpleio.ch to hbmk.hbm
+
+  * contrib/hbnf/tests/findith.prg
+  * contrib/hbunix/tests/testdmn.prg
+    * avoid QUIT
+
 2012-11-29 13:21 UTC+0100 Viktor Szakats (harbour syenar.net)
   * src/rtl/hbtest.prg
     ! missed STATIC from an internal function
diff --git a/harbour/contrib/hbfbird/tests/hbmk.hbm b/harbour/contrib/hbfbird/tests/hbmk.hbm
index d7d85c5ab7..626a94ad1f 100644
--- a/harbour/contrib/hbfbird/tests/hbmk.hbm
+++ b/harbour/contrib/hbfbird/tests/hbmk.hbm
@@ -5,3 +5,5 @@
 hbfbird.hbc
 
 -w3 -es2
+
+-u+simpleio.ch
diff --git a/harbour/contrib/hbfbird/tests/simple.prg b/harbour/contrib/hbfbird/tests/simple.prg
index 036fe0a1e7..5e08645cb1 100644
--- a/harbour/contrib/hbfbird/tests/simple.prg
+++ b/harbour/contrib/hbfbird/tests/simple.prg
@@ -4,8 +4,6 @@
 
 #require "hbfbird"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL oServer, oQuery, oRow, i, x, aTables, aStruct, aKey
diff --git a/harbour/contrib/hbfbird/tests/stress.prg b/harbour/contrib/hbfbird/tests/stress.prg
index 94a186dcab..e611bcea85 100644
--- a/harbour/contrib/hbfbird/tests/stress.prg
+++ b/harbour/contrib/hbfbird/tests/stress.prg
@@ -6,8 +6,6 @@
 
 #require "hbfbird"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL oServer, oQuery, oRow, i, x
diff --git a/harbour/contrib/hbfbird/tests/test.prg b/harbour/contrib/hbfbird/tests/test.prg
index 2adac7224e..57e21a0dd8 100644
--- a/harbour/contrib/hbfbird/tests/test.prg
+++ b/harbour/contrib/hbfbird/tests/test.prg
@@ -4,8 +4,6 @@
 
 #require "hbfbird"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL cServer := "localhost:"
diff --git a/harbour/contrib/hbnf/tests/findith.prg b/harbour/contrib/hbnf/tests/findith.prg
index bd136995ea..380764f97b 100644
--- a/harbour/contrib/hbnf/tests/findith.prg
+++ b/harbour/contrib/hbnf/tests/findith.prg
@@ -10,15 +10,14 @@ PROCEDURE Main( cCk, cStr, nOcc, xCase )
 
    IF PCount() != 4
       ? "usage: findith cCk cStr nOcc xCase"
-      QUIT
+   ELSE
+      xCase := iif( xCase == "Y", .T., .F. )
+      nOcc  := Val( nOcc )
+      ? iif( xCase, "Ignoring ", "Observing " ) + "case:"
+
+      ? cStr
+      nFind := ft_FindITh( cCk, cStr, nOcc, xCase )
+      ? iif( nFind > 0, Space( nFind - 1 ) + "^", "Not found" )
    ENDIF
 
-   xCase := iif( xCase == "Y", .T., .F. )
-   nOcc  := Val( nOcc )
-   ? iif( xCase, "Ignoring ", "Observing " ) + "case:"
-
-   ? cStr
-   nFind := ft_FindITh( cCk, cStr, nOcc, xCase )
-   ? iif( nFind > 0, Space( nFind - 1 ) + "^", "Not found" )
-
    RETURN
diff --git a/harbour/contrib/hbunix/tests/testdmn.prg b/harbour/contrib/hbunix/tests/testdmn.prg
index df6004f346..62288b6dd0 100644
--- a/harbour/contrib/hbunix/tests/testdmn.prg
+++ b/harbour/contrib/hbunix/tests/testdmn.prg
@@ -25,20 +25,19 @@ PROCEDURE Main()
    IF unix_daemon( 0, 0 ) == -1
       ? hb_StrFormat( "failed with errno=%d", posix_errno() )
       ErrorLevel( 1 )
-      QUIT
+   ELSE
+      IF hb_FileExists( cLogFile )
+         FErase( cLogFile )
+      ENDIF
+
+      ? "***" + hb_eol() + "* If you see this, something is b0rked" + hb_eol() + "***"
+
+      cLogText := hb_StrFormat( "Hello, this is the daemon child(%d) writing.", posix_getpid() ) + hb_eol()
+      cLogText += hb_StrFormat( "I am currenty residing in %s and ", hb_ps() + CurDir() ) + hb_eol()
+      cLogText += hb_StrFormat( "am writing this message to %s", cLogFile ) + hb_eol()
+      cLogText += "Good bye now." + hb_eol()
+
+      hb_MemoWrit( cLogFile, cLogText )
    ENDIF
 
-   IF hb_FileExists( cLogFile )
-      FErase( cLogFile )
-   ENDIF
-
-   ? "***" + hb_eol() + "* If you see this, something is b0rked" + hb_eol() + "***"
-
-   cLogText := hb_StrFormat( "Hello, this is the daemon child(%d) writing.", posix_getpid() ) + hb_eol()
-   cLogText += hb_StrFormat( "I am currenty residing in %s and ", hb_ps() + CurDir() ) + hb_eol()
-   cLogText += hb_StrFormat( "am writing this message to %s", cLogFile ) + hb_eol()
-   cLogText += "Good bye now." + hb_eol()
-
-   hb_MemoWrit( cLogFile, cLogText )
-
    RETURN