diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d911269b83..a7b702bed1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,41 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-12-05 09:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * contrib/hbct/files.c
+     ! FILESIZE() fixed to return -1 when the file doesn't exist.
+
+   - contrib/hbmysql/test
+   + contrib/hbmysql/tests
+   - contrib/hbw32ddr/test
+   + contrib/hbw32ddr/tests
+   - contrib/hbodbc/test
+   + contrib/hbodbc/tests
+   - contrib/hbtpathy/test
+   + contrib/hbtpathy/tests
+   - contrib/hbw32/test
+   + contrib/hbw32/tests
+   - contrib/hbole/test
+   + contrib/hbole/tests
+   - contrib/hbfbird/test
+   + contrib/hbfbird/tests
+   - contrib/hbapollo/test
+   + contrib/hbapollo/tests
+   - contrib/hbnf/tests
+   + contrib/hbnf/test
+   - contrib/hbfimage/test
+   + contrib/hbfimage/tests
+   - contrib/hbmisc/test
+   + contrib/hbmisc/tests
+   - contrib/hbgtwvg/test
+   + contrib/hbgtwvg/tests
+   - contrib/hbrddads/test
+   + contrib/hbrddads/tests
+   - contrib/hbbtree/test
+   + contrib/hbbtree/tests
+     ! Renamed test to tests to use 'tests' everywhere 
+       inside the repository.
+
 2007-12-04 23:56 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/gtwvg/wvtcore.c
     ! Small typo and formatting.
diff --git a/harbour/contrib/hbapollo/test/apollo.ch b/harbour/contrib/hbapollo/tests/apollo.ch
similarity index 100%
rename from harbour/contrib/hbapollo/test/apollo.ch
rename to harbour/contrib/hbapollo/tests/apollo.ch
diff --git a/harbour/contrib/hbapollo/test/apollo.prg b/harbour/contrib/hbapollo/tests/apollo.prg
similarity index 100%
rename from harbour/contrib/hbapollo/test/apollo.prg
rename to harbour/contrib/hbapollo/tests/apollo.prg
diff --git a/harbour/contrib/hbapollo/test/bld.bat b/harbour/contrib/hbapollo/tests/bld.bat
similarity index 100%
rename from harbour/contrib/hbapollo/test/bld.bat
rename to harbour/contrib/hbapollo/tests/bld.bat
diff --git a/harbour/contrib/hbapollo/test/bld_b32.bat b/harbour/contrib/hbapollo/tests/bld_b32.bat
similarity index 100%
rename from harbour/contrib/hbapollo/test/bld_b32.bat
rename to harbour/contrib/hbapollo/tests/bld_b32.bat
diff --git a/harbour/contrib/hbbtree/test/Makefile b/harbour/contrib/hbbtree/tests/Makefile
similarity index 100%
rename from harbour/contrib/hbbtree/test/Makefile
rename to harbour/contrib/hbbtree/tests/Makefile
diff --git a/harbour/contrib/hbbtree/test/ctest.c b/harbour/contrib/hbbtree/tests/ctest.c
similarity index 100%
rename from harbour/contrib/hbbtree/test/ctest.c
rename to harbour/contrib/hbbtree/tests/ctest.c
diff --git a/harbour/contrib/hbbtree/test/mktest.bat b/harbour/contrib/hbbtree/tests/mktest.bat
similarity index 100%
rename from harbour/contrib/hbbtree/test/mktest.bat
rename to harbour/contrib/hbbtree/tests/mktest.bat
diff --git a/harbour/contrib/hbbtree/test/test.prg b/harbour/contrib/hbbtree/tests/test.prg
similarity index 100%
rename from harbour/contrib/hbbtree/test/test.prg
rename to harbour/contrib/hbbtree/tests/test.prg
diff --git a/harbour/contrib/hbbtree/test/ttest.prg b/harbour/contrib/hbbtree/tests/ttest.prg
similarity index 100%
rename from harbour/contrib/hbbtree/test/ttest.prg
rename to harbour/contrib/hbbtree/tests/ttest.prg
diff --git a/harbour/contrib/hbct/files.c b/harbour/contrib/hbct/files.c
index 4e62758080..fd1bfc5aa4 100644
--- a/harbour/contrib/hbct/files.c
+++ b/harbour/contrib/hbct/files.c
@@ -153,7 +153,7 @@ HB_FUNC( FILESIZE )
 {
    PHB_FFIND ffind = _hb_fileStart( FALSE, HB_FA_ALL );
 
-   hb_retnint( ffind ? ffind->size : 0 );
+   hb_retnint( ffind ? ffind->size : -1 );
 }
 
 HB_FUNC( FILEDATE )
diff --git a/harbour/contrib/hbfbird/test/Makefile b/harbour/contrib/hbfbird/tests/Makefile
similarity index 100%
rename from harbour/contrib/hbfbird/test/Makefile
rename to harbour/contrib/hbfbird/tests/Makefile
diff --git a/harbour/contrib/hbfbird/test/bld_b32.bat b/harbour/contrib/hbfbird/tests/bld_b32.bat
similarity index 100%
rename from harbour/contrib/hbfbird/test/bld_b32.bat
rename to harbour/contrib/hbfbird/tests/bld_b32.bat
diff --git a/harbour/contrib/hbfbird/test/simple.prg b/harbour/contrib/hbfbird/tests/simple.prg
similarity index 100%
rename from harbour/contrib/hbfbird/test/simple.prg
rename to harbour/contrib/hbfbird/tests/simple.prg
diff --git a/harbour/contrib/hbfbird/test/stress.prg b/harbour/contrib/hbfbird/tests/stress.prg
similarity index 100%
rename from harbour/contrib/hbfbird/test/stress.prg
rename to harbour/contrib/hbfbird/tests/stress.prg
diff --git a/harbour/contrib/hbfbird/test/test.prg b/harbour/contrib/hbfbird/tests/test.prg
similarity index 100%
rename from harbour/contrib/hbfbird/test/test.prg
rename to harbour/contrib/hbfbird/tests/test.prg
diff --git a/harbour/contrib/hbfbird/test/testapi.c b/harbour/contrib/hbfbird/tests/testapi.c
similarity index 100%
rename from harbour/contrib/hbfbird/test/testapi.c
rename to harbour/contrib/hbfbird/tests/testapi.c
diff --git a/harbour/contrib/hbfimage/test/bld_b32.bat b/harbour/contrib/hbfimage/tests/bld_b32.bat
similarity index 100%
rename from harbour/contrib/hbfimage/test/bld_b32.bat
rename to harbour/contrib/hbfimage/tests/bld_b32.bat
diff --git a/harbour/contrib/hbfimage/test/fitest.prg b/harbour/contrib/hbfimage/tests/fitest.prg
similarity index 100%
rename from harbour/contrib/hbfimage/test/fitest.prg
rename to harbour/contrib/hbfimage/tests/fitest.prg
diff --git a/harbour/contrib/hbfimage/test/fsg.jpg b/harbour/contrib/hbfimage/tests/fsg.jpg
similarity index 100%
rename from harbour/contrib/hbfimage/test/fsg.jpg
rename to harbour/contrib/hbfimage/tests/fsg.jpg
diff --git a/harbour/contrib/hbfimage/test/italia.gif b/harbour/contrib/hbfimage/tests/italia.gif
similarity index 100%
rename from harbour/contrib/hbfimage/test/italia.gif
rename to harbour/contrib/hbfimage/tests/italia.gif
diff --git a/harbour/contrib/hbfimage/test/sample1.jpg b/harbour/contrib/hbfimage/tests/sample1.jpg
similarity index 100%
rename from harbour/contrib/hbfimage/test/sample1.jpg
rename to harbour/contrib/hbfimage/tests/sample1.jpg
diff --git a/harbour/contrib/hbgtwvg/test/demowvg.prg b/harbour/contrib/hbgtwvg/tests/demowvg.prg
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/demowvg.prg
rename to harbour/contrib/hbgtwvg/tests/demowvg.prg
diff --git a/harbour/contrib/hbgtwvg/test/dia_excl.ico b/harbour/contrib/hbgtwvg/tests/dia_excl.ico
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/dia_excl.ico
rename to harbour/contrib/hbgtwvg/tests/dia_excl.ico
diff --git a/harbour/contrib/hbgtwvg/test/test.dbf b/harbour/contrib/hbgtwvg/tests/test.dbf
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/test.dbf
rename to harbour/contrib/hbgtwvg/tests/test.dbf
diff --git a/harbour/contrib/hbgtwvg/test/v_browse.ico b/harbour/contrib/hbgtwvg/tests/v_browse.ico
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_browse.ico
rename to harbour/contrib/hbgtwvg/tests/v_browse.ico
diff --git a/harbour/contrib/hbgtwvg/test/v_calcltr.ico b/harbour/contrib/hbgtwvg/tests/v_calcltr.ico
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_calcltr.ico
rename to harbour/contrib/hbgtwvg/tests/v_calcltr.ico
diff --git a/harbour/contrib/hbgtwvg/test/v_calend.bmp b/harbour/contrib/hbgtwvg/tests/v_calend.bmp
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_calend.bmp
rename to harbour/contrib/hbgtwvg/tests/v_calend.bmp
diff --git a/harbour/contrib/hbgtwvg/test/v_clclt.bmp b/harbour/contrib/hbgtwvg/tests/v_clclt.bmp
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_clclt.bmp
rename to harbour/contrib/hbgtwvg/tests/v_clclt.bmp
diff --git a/harbour/contrib/hbgtwvg/test/v_filter.ico b/harbour/contrib/hbgtwvg/tests/v_filter.ico
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_filter.ico
rename to harbour/contrib/hbgtwvg/tests/v_filter.ico
diff --git a/harbour/contrib/hbgtwvg/test/v_help.ico b/harbour/contrib/hbgtwvg/tests/v_help.ico
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_help.ico
rename to harbour/contrib/hbgtwvg/tests/v_help.ico
diff --git a/harbour/contrib/hbgtwvg/test/v_index.bmp b/harbour/contrib/hbgtwvg/tests/v_index.bmp
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_index.bmp
rename to harbour/contrib/hbgtwvg/tests/v_index.bmp
diff --git a/harbour/contrib/hbgtwvg/test/v_lock.bmp b/harbour/contrib/hbgtwvg/tests/v_lock.bmp
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_lock.bmp
rename to harbour/contrib/hbgtwvg/tests/v_lock.bmp
diff --git a/harbour/contrib/hbgtwvg/test/v_new.bmp b/harbour/contrib/hbgtwvg/tests/v_new.bmp
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_new.bmp
rename to harbour/contrib/hbgtwvg/tests/v_new.bmp
diff --git a/harbour/contrib/hbgtwvg/test/v_notes.ico b/harbour/contrib/hbgtwvg/tests/v_notes.ico
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_notes.ico
rename to harbour/contrib/hbgtwvg/tests/v_notes.ico
diff --git a/harbour/contrib/hbgtwvg/test/v_notes1.bmp b/harbour/contrib/hbgtwvg/tests/v_notes1.bmp
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_notes1.bmp
rename to harbour/contrib/hbgtwvg/tests/v_notes1.bmp
diff --git a/harbour/contrib/hbgtwvg/test/v_selct1.bmp b/harbour/contrib/hbgtwvg/tests/v_selct1.bmp
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_selct1.bmp
rename to harbour/contrib/hbgtwvg/tests/v_selct1.bmp
diff --git a/harbour/contrib/hbgtwvg/test/v_tools.ico b/harbour/contrib/hbgtwvg/tests/v_tools.ico
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/v_tools.ico
rename to harbour/contrib/hbgtwvg/tests/v_tools.ico
diff --git a/harbour/contrib/hbgtwvg/test/vouch1.bmp b/harbour/contrib/hbgtwvg/tests/vouch1.bmp
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/vouch1.bmp
rename to harbour/contrib/hbgtwvg/tests/vouch1.bmp
diff --git a/harbour/contrib/hbgtwvg/test/vr_1.ico b/harbour/contrib/hbgtwvg/tests/vr_1.ico
similarity index 100%
rename from harbour/contrib/hbgtwvg/test/vr_1.ico
rename to harbour/contrib/hbgtwvg/tests/vr_1.ico
diff --git a/harbour/contrib/hbmisc/test/Makefile b/harbour/contrib/hbmisc/tests/Makefile
similarity index 100%
rename from harbour/contrib/hbmisc/test/Makefile
rename to harbour/contrib/hbmisc/tests/Makefile
diff --git a/harbour/contrib/hbmisc/test/readfile.prg b/harbour/contrib/hbmisc/tests/readfile.prg
similarity index 100%
rename from harbour/contrib/hbmisc/test/readfile.prg
rename to harbour/contrib/hbmisc/tests/readfile.prg
diff --git a/harbour/contrib/hbmysql/test/test.prg b/harbour/contrib/hbmysql/tests/test.prg
similarity index 100%
rename from harbour/contrib/hbmysql/test/test.prg
rename to harbour/contrib/hbmysql/tests/test.prg
diff --git a/harbour/contrib/hbnf/test/test.prg b/harbour/contrib/hbnf/tests/test.prg
similarity index 100%
rename from harbour/contrib/hbnf/test/test.prg
rename to harbour/contrib/hbnf/tests/test.prg
diff --git a/harbour/contrib/hbodbc/test/bld_b32.bat b/harbour/contrib/hbodbc/tests/bld_b32.bat
similarity index 100%
rename from harbour/contrib/hbodbc/test/bld_b32.bat
rename to harbour/contrib/hbodbc/tests/bld_b32.bat
diff --git a/harbour/contrib/hbodbc/test/harbour.mdb b/harbour/contrib/hbodbc/tests/harbour.mdb
similarity index 100%
rename from harbour/contrib/hbodbc/test/harbour.mdb
rename to harbour/contrib/hbodbc/tests/harbour.mdb
diff --git a/harbour/contrib/hbodbc/test/odbccall.prg b/harbour/contrib/hbodbc/tests/odbccall.prg
similarity index 100%
rename from harbour/contrib/hbodbc/test/odbccall.prg
rename to harbour/contrib/hbodbc/tests/odbccall.prg
diff --git a/harbour/contrib/hbodbc/test/odbcdemo.prg b/harbour/contrib/hbodbc/tests/odbcdemo.prg
similarity index 100%
rename from harbour/contrib/hbodbc/test/odbcdemo.prg
rename to harbour/contrib/hbodbc/tests/odbcdemo.prg
diff --git a/harbour/contrib/hbodbc/test/testodbc.prg b/harbour/contrib/hbodbc/tests/testodbc.prg
similarity index 100%
rename from harbour/contrib/hbodbc/test/testodbc.prg
rename to harbour/contrib/hbodbc/tests/testodbc.prg
diff --git a/harbour/contrib/hbole/test/bld_b32.bat b/harbour/contrib/hbole/tests/bld_b32.bat
similarity index 100%
rename from harbour/contrib/hbole/test/bld_b32.bat
rename to harbour/contrib/hbole/tests/bld_b32.bat
diff --git a/harbour/contrib/hbole/test/sample.odt b/harbour/contrib/hbole/tests/sample.odt
similarity index 100%
rename from harbour/contrib/hbole/test/sample.odt
rename to harbour/contrib/hbole/tests/sample.odt
diff --git a/harbour/contrib/hbole/test/testole.prg b/harbour/contrib/hbole/tests/testole.prg
similarity index 100%
rename from harbour/contrib/hbole/test/testole.prg
rename to harbour/contrib/hbole/tests/testole.prg
diff --git a/harbour/contrib/hbrddads/test/testmg.prg b/harbour/contrib/hbrddads/tests/testmg.prg
similarity index 100%
rename from harbour/contrib/hbrddads/test/testmg.prg
rename to harbour/contrib/hbrddads/tests/testmg.prg
diff --git a/harbour/contrib/hbtpathy/test/testtp.prg b/harbour/contrib/hbtpathy/tests/testtp.prg
similarity index 100%
rename from harbour/contrib/hbtpathy/test/testtp.prg
rename to harbour/contrib/hbtpathy/tests/testtp.prg
diff --git a/harbour/contrib/hbw32/test/sample.odt b/harbour/contrib/hbw32/tests/sample.odt
similarity index 100%
rename from harbour/contrib/hbw32/test/sample.odt
rename to harbour/contrib/hbw32/tests/sample.odt
diff --git a/harbour/contrib/hbw32/test/testole.prg b/harbour/contrib/hbw32/tests/testole.prg
similarity index 100%
rename from harbour/contrib/hbw32/test/testole.prg
rename to harbour/contrib/hbw32/tests/testole.prg
diff --git a/harbour/contrib/hbw32/test/testw32p.prg b/harbour/contrib/hbw32/tests/testw32p.prg
similarity index 100%
rename from harbour/contrib/hbw32/test/testw32p.prg
rename to harbour/contrib/hbw32/tests/testw32p.prg
diff --git a/harbour/contrib/hbw32ddr/test/anima2.bmp b/harbour/contrib/hbw32ddr/tests/anima2.bmp
similarity index 100%
rename from harbour/contrib/hbw32ddr/test/anima2.bmp
rename to harbour/contrib/hbw32ddr/tests/anima2.bmp
diff --git a/harbour/contrib/hbw32ddr/test/black.bmp b/harbour/contrib/hbw32ddr/tests/black.bmp
similarity index 100%
rename from harbour/contrib/hbw32ddr/test/black.bmp
rename to harbour/contrib/hbw32ddr/tests/black.bmp
diff --git a/harbour/contrib/hbw32ddr/test/brick1.bmp b/harbour/contrib/hbw32ddr/tests/brick1.bmp
similarity index 100%
rename from harbour/contrib/hbw32ddr/test/brick1.bmp
rename to harbour/contrib/hbw32ddr/tests/brick1.bmp
diff --git a/harbour/contrib/hbw32ddr/test/brick2.bmp b/harbour/contrib/hbw32ddr/tests/brick2.bmp
similarity index 100%
rename from harbour/contrib/hbw32ddr/test/brick2.bmp
rename to harbour/contrib/hbw32ddr/tests/brick2.bmp
diff --git a/harbour/contrib/hbw32ddr/test/brick3.bmp b/harbour/contrib/hbw32ddr/tests/brick3.bmp
similarity index 100%
rename from harbour/contrib/hbw32ddr/test/brick3.bmp
rename to harbour/contrib/hbw32ddr/tests/brick3.bmp
diff --git a/harbour/contrib/hbw32ddr/test/shot.bmp b/harbour/contrib/hbw32ddr/tests/shot.bmp
similarity index 100%
rename from harbour/contrib/hbw32ddr/test/shot.bmp
rename to harbour/contrib/hbw32ddr/tests/shot.bmp
diff --git a/harbour/contrib/hbw32ddr/test/testdx.prg b/harbour/contrib/hbw32ddr/tests/testdx.prg
similarity index 100%
rename from harbour/contrib/hbw32ddr/test/testdx.prg
rename to harbour/contrib/hbw32ddr/tests/testdx.prg