diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7c6e235f15..b8321b51be 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+Fri Jun 25 18:27:43 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
+
+	* include/Makefile: 
+	* tests/working/Makefile: 
+	Updated the file list.
+
+	* tests/working/dirtest.prg: 
+	Made the output easier to be read.
+	
 19990624-21:10 EDT David G. Holm <dholm@jsd-llc.com>
   * source/compiler/harbour.l
     - Corrected logic in if block that prints spurious error message when
diff --git a/harbour/include/Makefile b/harbour/include/Makefile
index ca7432301f..6c263050f8 100644
--- a/harbour/include/Makefile
+++ b/harbour/include/Makefile
@@ -34,7 +34,6 @@ PRG_HEADERS=\
 	inkey.ch \
 	set.ch \
 	setcurs.ch \
-	test.ch \
 
 API_HEADERS=\
 	error.api \
diff --git a/harbour/tests/working/Makefile b/harbour/tests/working/Makefile
index fa8de295d2..8f9cb224d0 100644
--- a/harbour/tests/working/Makefile
+++ b/harbour/tests/working/Makefile
@@ -73,6 +73,7 @@ PRG_SOURCES=\
 	recursiv.prg \
 	returns.prg \
 	round.prg \
+	rtfclass.prg \
 	rtl_test.prg \
 	scroll.prg \
 	seconds.prg \
@@ -91,6 +92,7 @@ PRG_SOURCES=\
 	test.prg \
 	test_all.prg \
 	testcgi.prg \
+	testcopy.prg \
 	testerro.prg \
 	testfor.prg \
 	testgt.prg \
@@ -101,6 +103,7 @@ PRG_SOURCES=\
 	teststr.prg \
 	testtok.prg \
 	testvars.prg \
+	testwarn.prg \
 	transfrm.prg \
 	val.prg \
 	version.prg \
@@ -108,9 +111,9 @@ PRG_SOURCES=\
 
 BAD_PRG_SOURCES=\
 	dupvars.prg \
+	keywords.prg \
 	spawn.prg \
 	spawn2.prg \
-	keywords.prg \
 	test10.prg \
 	testid.prg \
 
diff --git a/harbour/tests/working/dirtest.prg b/harbour/tests/working/dirtest.prg
index 00a66dc21f..b6b052fe9e 100644
--- a/harbour/tests/working/dirtest.prg
+++ b/harbour/tests/working/dirtest.prg
@@ -7,7 +7,11 @@ local x := 0
 adir := asort( directory(filespec,attribs),,, {|x,y|upper(x[1]) < upper(y[1])} )
 
 for x := 1 to len(adir)
-   qout(adir[x,1],"|", adir[x,2],"|", adir[x,3],"|", adir[x,4],"|", adir[x,5])
+   qout(padr(adir[x,1], 20), "|", ;
+        padl(adir[x,2], 10), "|", ;
+        padr(adir[x,3],  8), "|", ;
+        padr(adir[x,4],  8), "|", ;
+        adir[x,5])
 next x
 
 return nil