diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8b51aa7c76..55e5d5ee9c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+19990901-20:34 GMT+1 Victor Szel <info@szelvesz.hu>
+  * source/vm/initsymb.c
+    + HB_LOCK pointer added.
+  * tests/working/Makefile
+    ! Mistakenly got replaced with my private one. Fixed.
+
 19990901-17:20 GMT+1 Victor Szel <info@szelvesz.hu>
   * tests/working/rtl_test.prg
     + Added tests for decimals handling. (NUMPAR.PRG)
@@ -46,9 +52,10 @@
 
        NOTE [vszel]: 
         1.) I've #ifdef-ed out the new stuff for __CYGWIN__ since 
-          setdisk()/getdisk() were neither declared nor in any libraries.
+          setdisk()/getdisk() were neither declared nor present in any 
+          libraries.
         2.) I've added some new header files to FILESYS.C. Please check them
-            on your system, if they are correct.
+            on your system, whether they are correct.
 
 19990901-14:05 EDT Paul Tucker <ptucker@sympatico.ca>
    * source/rtl/filesys.c
diff --git a/harbour/source/vm/initsymb.c b/harbour/source/vm/initsymb.c
index e2d2ba3758..7f072c6e64 100644
--- a/harbour/source/vm/initsymb.c
+++ b/harbour/source/vm/initsymb.c
@@ -39,7 +39,7 @@ extern HARBOUR HB_INT( void );
 extern HARBOUR HB_LASTREC( void );
 extern HARBOUR HB_LEFT( void );
 extern HARBOUR HB_LEN( void );
-/* extern HARBOUR HB_LOCK( void ); */
+extern HARBOUR HB_LOCK( void );
 extern HARBOUR HB_LOG( void );
 extern HARBOUR HB_LOWER( void );
 extern HARBOUR HB_LTRIM( void );
@@ -104,7 +104,7 @@ static HB_SYMB symbols[] = {
    { "LASTREC"   , FS_PUBLIC, HB_LASTREC      , 0 },
    { "LEFT"      , FS_PUBLIC, HB_LEFT         , 0 },
    { "LEN"       , FS_PUBLIC, HB_LEN          , 0 },
-   { "LOCK"      , FS_PUBLIC, NULL            , 0 }, /* TODO: */
+   { "LOCK"      , FS_PUBLIC, HB_LOCK         , 0 },
    { "LOG"       , FS_PUBLIC, HB_LOG          , 0 },
    { "LOWER"     , FS_PUBLIC, HB_LOWER        , 0 },
    { "LTRIM"     , FS_PUBLIC, HB_LTRIM        , 0 },
diff --git a/harbour/tests/working/Makefile b/harbour/tests/working/Makefile
index 481cc88822..578ff941b6 100644
--- a/harbour/tests/working/Makefile
+++ b/harbour/tests/working/Makefile
@@ -20,26 +20,132 @@ ifeq ($(PM),)
 endif
 ifeq ($(PM),)   # PM not defined = build all files
 PRG_SOURCES=\
-ac_test.prg \
-fortest.prg \
-olvas.prg \
-huh.prg \
-testdbf.prg \
-rtl_test.prg \
-descend.prg \
-fileio.prg \
-and_or.prg \
-copyfile.prg \
-kej.prg \
-kejj.prg \
-inkeytst.prg \
-para.prg \
-i.prg \
-j.prg \
-k.prg \
-ac_test.prg \
-testrdd.prg \
-testdbf.prg \
+        ac_test.prg \
+        adirtest.prg \
+        ainstest.prg \
+        and_or.prg \
+        array16.prg \
+        arrayidx.prg \
+        arrays.prg \
+        arreval.prg \
+        arrindex.prg \
+        atest.prg \
+	begin.prg \
+        box.prg \
+        byref.prg \
+        calling.prg \
+        cdow.prg \
+        clasinit.prg \
+        clasname.prg \
+        classch.prg \
+        classes.prg \
+        clsdata.prg \
+        cmphello.prg \
+        codebl.prg \
+        codebloc.prg \
+        comments.prg \
+        copyfile.prg \
+        curdirt.prg \
+        cursrtst.prg \
+        dates.prg \
+        dates2.prg \
+        dates3.prg \
+        dates4.prg \
+        debugtst.prg \
+        descend.prg \
+        dirtest.prg \
+        docase.prg \
+        dosshell.prg \
+        dynobj.prg \
+        dynsym.prg \
+        exittest.prg \
+        fib.prg \
+        fileio.prg \
+        filexist.prg \
+        fornext.prg \
+        fornext2.prg \
+        fortest.prg \
+        funcarr.prg \
+        guess.prg \
+        hardcr.prg \
+        hello.prg \
+        ifelse.prg \
+        ifinline.prg \
+        inherit.prg \
+        inifiles.prg \
+        initexit.prg \
+        inkeytst.prg \
+        inline.prg \
+        instr.prg \
+        iotest.prg \
+        iotest2.prg \
+        longstr.prg \
+        longstr2.prg \
+        mankala.prg \
+        mathtest.prg \
+        memvar.prg \
+        menutest.prg \
+        mtran.prg \
+        multiarg.prg \
+        nums.prg \
+        objarr.prg \
+        objasign.prg \
+        objects.prg \
+        operat.prg \
+        os.prg \
+        output.prg \
+        overload.prg \
+        passref.prg \
+        procline.prg \
+        procname.prg \
+        readfile.prg \
+        readhrb.prg \
+        recursiv.prg \
+        returns.prg \
+        round.prg \
+        rtfclass.prg \
+        rtl_test.prg \
+        say.prg \
+        scroll.prg \
+        seconds.prg \
+        set_num.prg \
+        set_test.prg \
+        sound.prg \
+        statfun.prg \
+        statics.prg \
+        strcmp.prg \
+        strdelim.prg \
+        strings.prg \
+        strings2.prg \
+        strings3.prg \
+        strip.prg \
+        syserror.prg \
+        t1.prg \
+        test.prg \
+        test_all.prg \
+        testbrw.prg \
+        testcgi.prg \
+        testcopy.prg \
+        testdbf.prg \
+        testerro.prg \
+        testfor.prg \
+        testgt.prg \
+        testhbf.prg \
+        testhtml.prg \
+        testinc.prg \
+        testmem.prg \
+        teststr.prg \
+        testtok.prg \
+        testpre.prg \
+        testread.prg \
+        testrdd.prg \
+        testvars.prg \
+        testwarn.prg \
+        tstcolor.prg \
+        transdef.prg \
+        val.prg \
+        version.prg \
+        while.prg \
 
 PRG_HEADERS=\
         cgi.ch \