diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6d2580b32b..68267febef 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+19900509-18:10 Eddie Runia
+   * tests/working/calling
+     Function Second changed to SecondOne()
+   * tests/working/initexit
+   * tests/working/statfun
+     See above
+   * tests/working/testtok
+     i was required in next (??)
+
 19990509-18:00 CET Victor Szel <info@szelvesz.hu>
 
    * source/rtl/strings.c:
diff --git a/harbour/tests/working/calling.prg b/harbour/tests/working/calling.prg
index 9926603ee4..6fae1ed584 100644
--- a/harbour/tests/working/calling.prg
+++ b/harbour/tests/working/calling.prg
@@ -2,7 +2,7 @@
 
 function Main()
 
-   Second()
+   SecondOne()
 
    DO Fourth WITH "from Fourth() function"    // Testing the old fashion DO ...
 
@@ -10,7 +10,7 @@ function Main()
 
 return nil
 
-function Second()
+function SecondOne()
 
    QOut( "Ok, this is from Second() function call" )
 
diff --git a/harbour/tests/working/initexit.prg b/harbour/tests/working/initexit.prg
index 1ef842a789..dd16deb879 100644
--- a/harbour/tests/working/initexit.prg
+++ b/harbour/tests/working/initexit.prg
@@ -6,7 +6,7 @@ function Main()
 
 return nil
 
-init function Second()
+init function SecondOne()
 
    QOut( "Hello from Second()" )
 
diff --git a/harbour/tests/working/statfun.prg b/harbour/tests/working/statfun.prg
index 7c956cda6f..dd17712352 100644
--- a/harbour/tests/working/statfun.prg
+++ b/harbour/tests/working/statfun.prg
@@ -4,13 +4,13 @@ function Main()
 
    QOut( "From Main()" )
 
-   Second()
+   SecondOne()
 
    QOut( "From Main() again" )
 
 return nil
 
-static function Second()
+static function SecondOne()
 
    QOut( "From Second()" )
 
diff --git a/harbour/tests/working/testtok.prg b/harbour/tests/working/testtok.prg
index a3c56ef051..69da871947 100644
--- a/harbour/tests/working/testtok.prg
+++ b/harbour/tests/working/testtok.prg
@@ -4,7 +4,7 @@ procedure main()
 
    for i := 1 to len(a)
       qout( a[i] )
-   next
+   next i			/* TOFIX : i is required ?? */
 return
 
 function strtoarray(s)