diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8c05cc30c4..f77cdae088 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-16 13:43 UTC+0500 April White (april users.sourceforge.net)
+  * contrib/hbbtree/test/test.prg
+    * moved existing code into procedures in preparation for
+      introducing more robust testing; a work in progress
+
+  * contrib/hbbtree/test/test.hbp
+    * added switches to reduce memory footprint and standard gt
+
 2010-01-16 15:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * external/libpng/LICENSE
   * external/libpng/Makefile
diff --git a/harbour/contrib/hbbtree/tests/test.hbp b/harbour/contrib/hbbtree/tests/test.hbp
index 7e771d2e79..32a08e86d0 100644
--- a/harbour/contrib/hbbtree/tests/test.hbp
+++ b/harbour/contrib/hbbtree/tests/test.hbp
@@ -2,4 +2,10 @@
 # $Id$
 #
 
+-q0
+
+-nulrdd
+
+-gtstd
+
 test.prg ttest.prg ctest.c
diff --git a/harbour/contrib/hbbtree/tests/test.prg b/harbour/contrib/hbbtree/tests/test.prg
index 693210708d..1bfe9e1aad 100644
--- a/harbour/contrib/hbbtree/tests/test.prg
+++ b/harbour/contrib/hbbtree/tests/test.prg
@@ -38,7 +38,6 @@
 #include "fileio.ch"
 
 Procedure Main()
-  local n, a
   local c
   local attr
 
@@ -51,6 +50,99 @@ Procedure Main()
     ferase( c )
   NEXT
 
+  testInMemory()
+  testInFile()
+
+return
+
+static procedure insertdata( n, s )
+  if s == NIL ; s := 1; endif
+  hb_btreeinsert( n, "fuweqgsz",  1 / s )
+  hb_btreeinsert( n, "sjruexrd",  2 / s )
+  hb_btreeinsert( n, "fvveitnz",  3 / s )
+  hb_btreeinsert( n, "aqgksjxe",  4 / s )
+  hb_btreeinsert( n, "oonrehvj",  5 / s )
+  hb_btreeinsert( n, "gvowjwtr",  6 / s )
+  hb_btreeinsert( n, "xxidwtvn",  7 / s )
+  hb_btreeinsert( n, "rwjbxesd",  8 / s )
+  hb_btreeinsert( n, "yaznsaek",  9 / s )
+  hb_btreeinsert( n, "wbdhfkfy", 10 / s )
+  hb_btreeinsert( n, "lryaezia", 11 / s )
+  hb_btreeinsert( n, "tspmnrvk", 12 / s )
+  hb_btreeinsert( n, "hpxryhdj", 13 / s )
+  hb_btreeinsert( n, "sztcqaby", 14 / s )
+  hb_btreeinsert( n, "fcyzsqja", 15 / s )
+  hb_btreeinsert( n, "uccxumvg", 16 / s )
+  hb_btreeinsert( n, "amwuoout", 17 / s )
+  hb_btreeinsert( n, "yaytseln", 18 / s )
+  hb_btreeinsert( n, "sfiiozej", 19 / s )
+  hb_btreeinsert( n, "xuvsoljy", 20 / s )
+  hb_btreeinsert( n, "qmqjbedm", 21 / s )
+  hb_btreeinsert( n, "cctzzrkz", 22 / s )
+  hb_btreeinsert( n, "ikytgdon", 23 / s )
+  hb_btreeinsert( n, "pksobcwu", 24 / s )
+  hb_btreeinsert( n, "vmurindj", 25 / s )
+  hb_btreeinsert( n, "elvybqwg", 26 / s )
+  hb_btreeinsert( n, "ixchaztx", 27 / s )
+  hb_btreeinsert( n, "nzpztlhd", 28 / s )
+  hb_btreeinsert( n, "aucrchiw", 29 / s )
+  hb_btreeinsert( n, "munrytse", 30 / s )
+  hb_btreeinsert( n, "kqkhcmls", 31 / s )
+  hb_btreeinsert( n, "abqhurbi", 32 / s )
+  hb_btreeinsert( n, "ymrldckr", 33 / s )
+  hb_btreeinsert( n, "rhsmfflc", 34 / s )
+  hb_btreeinsert( n, "apyfkvee", 35 / s )
+  hb_btreeinsert( n, "cdntyzrf", 36 / s )
+  hb_btreeinsert( n, "iacblqrh", 37 / s )
+  hb_btreeinsert( n, "xvewqana", 38 / s )
+  hb_btreeinsert( n, "xmybqytj", 39 / s )
+  hb_btreeinsert( n, "dnowympf", 40 / s )
+  hb_btreeinsert( n, "smloihft", 41 / s )
+  hb_btreeinsert( n, "zumppmis", 42 / s )
+  hb_btreeinsert( n, "jirucnxu", 43 / s )
+  hb_btreeinsert( n, "ecdzikcv", 44 / s )
+  hb_btreeinsert( n, "slbwvnpg", 45 / s )
+  hb_btreeinsert( n, "yaftlkmz", 46 / s )
+  hb_btreeinsert( n, "blcepksd", 47 / s )
+  hb_btreeinsert( n, "xufowlpl", 48 / s )
+  hb_btreeinsert( n, "xegtjtqc", 49 / s )
+  hb_btreeinsert( n, "yplcqumq", 50 / s )
+  hb_btreeinsert( n, "vdoycauz", 51 / s )
+  hb_btreeinsert( n, "uhqkjuph", 52 / s )
+  hb_btreeinsert( n, "prllaeyi", 53 / s )
+  hb_btreeinsert( n, "ybzgmwzm", 54 / s )
+  hb_btreeinsert( n, "kkvyllnp", 55 / s )
+  hb_btreeinsert( n, "nberwsrb", 56 / s )
+  hb_btreeinsert( n, "wgetahua", 57 / s )
+  hb_btreeinsert( n, "yxcyehcv", 58 / s )
+  hb_btreeinsert( n, "oacormks", 59 / s )
+  hb_btreeinsert( n, "mcadkdxo", 60 / s )
+  hb_btreeinsert( n, "ycsalwqw", 61 / s )
+  hb_btreeinsert( n, "qmpysvjl", 62 / s )
+  hb_btreeinsert( n, "iqikamew", 63 / s )
+  hb_btreeinsert( n, "iaparrva", 64 / s )
+  hb_btreeinsert( n, "casbvtay", 65 / s )
+  hb_btreeinsert( n, "blaksexr", 66 / s )
+  hb_btreeinsert( n, "tbosrbql", 67 / s )
+  hb_btreeinsert( n, "ifkywsyt", 68 / s )
+  hb_btreeinsert( n, "gvklwevy", 69 / s )
+  hb_btreeinsert( n, "krpmpbud", 70 / s )
+  hb_btreeinsert( n, "rdvlwbwm", 71 / s )
+  hb_btreeinsert( n, "apnvdkww", 72 / s )
+  hb_btreeinsert( n, "euqdocvm", 73 / s )
+  hb_btreeinsert( n, "ksmkjcwp", 74 / s )
+  hb_btreeinsert( n, "bztgclzc", 75 / s )
+  hb_btreeinsert( n, "awkdnuxa", 76 / s )
+  hb_btreeinsert( n, "abavnpod", 77 / s )
+  hb_btreeinsert( n, "dvwvhjmh", 78 / s )
+  hb_btreeinsert( n, "dmfmivqb", 79 / s )
+  hb_btreeinsert( n, "ewsxanon", 80 / s )
+return
+
+STATIC PROCEDURE testInMemory()
+  LOCAL n
+  LOCAL c
+
   ? "Harbour API test: in-memory"
   n := hb_btreenew( , 2048, 90, HB_BTREE_READONLY + HB_BTREE_INMEMORY )
   if n > 0
@@ -124,6 +216,11 @@ Procedure Main()
 
   ? "Harbour API test: in-memory end"
 
+STATIC PROCEDURE testInFile()
+  LOCAL n
+  LOCAL c
+  LOCAL a
+
   ? "Harbour API test"
   n := hb_btreenew( "test_1.out", 2048, 90, HB_BTREE_READONLY )
   if n > 0
@@ -230,89 +327,3 @@ Procedure Main()
   endif
 
   ?
-
-return
-
-static procedure insertdata( n, s )
-  if s == NIL ; s := 1; endif
-  hb_btreeinsert( n, "fuweqgsz",  1 / s )
-  hb_btreeinsert( n, "sjruexrd",  2 / s )
-  hb_btreeinsert( n, "fvveitnz",  3 / s )
-  hb_btreeinsert( n, "aqgksjxe",  4 / s )
-  hb_btreeinsert( n, "oonrehvj",  5 / s )
-  hb_btreeinsert( n, "gvowjwtr",  6 / s )
-  hb_btreeinsert( n, "xxidwtvn",  7 / s )
-  hb_btreeinsert( n, "rwjbxesd",  8 / s )
-  hb_btreeinsert( n, "yaznsaek",  9 / s )
-  hb_btreeinsert( n, "wbdhfkfy", 10 / s )
-  hb_btreeinsert( n, "lryaezia", 11 / s )
-  hb_btreeinsert( n, "tspmnrvk", 12 / s )
-  hb_btreeinsert( n, "hpxryhdj", 13 / s )
-  hb_btreeinsert( n, "sztcqaby", 14 / s )
-  hb_btreeinsert( n, "fcyzsqja", 15 / s )
-  hb_btreeinsert( n, "uccxumvg", 16 / s )
-  hb_btreeinsert( n, "amwuoout", 17 / s )
-  hb_btreeinsert( n, "yaytseln", 18 / s )
-  hb_btreeinsert( n, "sfiiozej", 19 / s )
-  hb_btreeinsert( n, "xuvsoljy", 20 / s )
-  hb_btreeinsert( n, "qmqjbedm", 21 / s )
-  hb_btreeinsert( n, "cctzzrkz", 22 / s )
-  hb_btreeinsert( n, "ikytgdon", 23 / s )
-  hb_btreeinsert( n, "pksobcwu", 24 / s )
-  hb_btreeinsert( n, "vmurindj", 25 / s )
-  hb_btreeinsert( n, "elvybqwg", 26 / s )
-  hb_btreeinsert( n, "ixchaztx", 27 / s )
-  hb_btreeinsert( n, "nzpztlhd", 28 / s )
-  hb_btreeinsert( n, "aucrchiw", 29 / s )
-  hb_btreeinsert( n, "munrytse", 30 / s )
-  hb_btreeinsert( n, "kqkhcmls", 31 / s )
-  hb_btreeinsert( n, "abqhurbi", 32 / s )
-  hb_btreeinsert( n, "ymrldckr", 33 / s )
-  hb_btreeinsert( n, "rhsmfflc", 34 / s )
-  hb_btreeinsert( n, "apyfkvee", 35 / s )
-  hb_btreeinsert( n, "cdntyzrf", 36 / s )
-  hb_btreeinsert( n, "iacblqrh", 37 / s )
-  hb_btreeinsert( n, "xvewqana", 38 / s )
-  hb_btreeinsert( n, "xmybqytj", 39 / s )
-  hb_btreeinsert( n, "dnowympf", 40 / s )
-  hb_btreeinsert( n, "smloihft", 41 / s )
-  hb_btreeinsert( n, "zumppmis", 42 / s )
-  hb_btreeinsert( n, "jirucnxu", 43 / s )
-  hb_btreeinsert( n, "ecdzikcv", 44 / s )
-  hb_btreeinsert( n, "slbwvnpg", 45 / s )
-  hb_btreeinsert( n, "yaftlkmz", 46 / s )
-  hb_btreeinsert( n, "blcepksd", 47 / s )
-  hb_btreeinsert( n, "xufowlpl", 48 / s )
-  hb_btreeinsert( n, "xegtjtqc", 49 / s )
-  hb_btreeinsert( n, "yplcqumq", 50 / s )
-  hb_btreeinsert( n, "vdoycauz", 51 / s )
-  hb_btreeinsert( n, "uhqkjuph", 52 / s )
-  hb_btreeinsert( n, "prllaeyi", 53 / s )
-  hb_btreeinsert( n, "ybzgmwzm", 54 / s )
-  hb_btreeinsert( n, "kkvyllnp", 55 / s )
-  hb_btreeinsert( n, "nberwsrb", 56 / s )
-  hb_btreeinsert( n, "wgetahua", 57 / s )
-  hb_btreeinsert( n, "yxcyehcv", 58 / s )
-  hb_btreeinsert( n, "oacormks", 59 / s )
-  hb_btreeinsert( n, "mcadkdxo", 60 / s )
-  hb_btreeinsert( n, "ycsalwqw", 61 / s )
-  hb_btreeinsert( n, "qmpysvjl", 62 / s )
-  hb_btreeinsert( n, "iqikamew", 63 / s )
-  hb_btreeinsert( n, "iaparrva", 64 / s )
-  hb_btreeinsert( n, "casbvtay", 65 / s )
-  hb_btreeinsert( n, "blaksexr", 66 / s )
-  hb_btreeinsert( n, "tbosrbql", 67 / s )
-  hb_btreeinsert( n, "ifkywsyt", 68 / s )
-  hb_btreeinsert( n, "gvklwevy", 69 / s )
-  hb_btreeinsert( n, "krpmpbud", 70 / s )
-  hb_btreeinsert( n, "rdvlwbwm", 71 / s )
-  hb_btreeinsert( n, "apnvdkww", 72 / s )
-  hb_btreeinsert( n, "euqdocvm", 73 / s )
-  hb_btreeinsert( n, "ksmkjcwp", 74 / s )
-  hb_btreeinsert( n, "bztgclzc", 75 / s )
-  hb_btreeinsert( n, "awkdnuxa", 76 / s )
-  hb_btreeinsert( n, "abavnpod", 77 / s )
-  hb_btreeinsert( n, "dvwvhjmh", 78 / s )
-  hb_btreeinsert( n, "dmfmivqb", 79 / s )
-  hb_btreeinsert( n, "ewsxanon", 80 / s )
-return