diff --git a/tests/administration/groupManTesting.php b/tests/administration/groupManTesting.php
index c296c07..499e157 100644
--- a/tests/administration/groupManTesting.php
+++ b/tests/administration/groupManTesting.php
@@ -3,6 +3,12 @@
 
 <?php
 
+
+require ("./config/dmsDefaults.php");
+//require ("$default->owl_fs_root/lib/db.inc");
+require ("$default->owl_fs_root/lib/dms.inc");
+require ("$default->owl_fs_root/lib/administration/GroupManager.inc");
+
 /*-----------------------------------------------------------------*/
 /**
  * $Id: UserManTesting.php
@@ -26,11 +32,6 @@
 /*-----------------------------------------------------------------*/
 
 
-require ("./config/dmsDefaults.php");
-//require ("$default->owl_fs_root/lib/db.inc");
-require ("$default->owl_fs_root/lib/dms.inc");
-require ("$default->owl_fs_root/lib/administration/GroupManager.inc");
-
 $group = new groupManager;
 
 
diff --git a/tests/administration/userManTesting.php b/tests/administration/userManTesting.php
index 52ae920..5709fa1 100644
--- a/tests/administration/userManTesting.php
+++ b/tests/administration/userManTesting.php
@@ -3,6 +3,11 @@
 
 <?php
 
+require ("./config/dmsDefaults.php");
+//require ("$default->owl_fs_root/lib/db.inc");
+require ("$default->owl_fs_root/lib/dms.inc");
+require ("$default->owl_fs_root/lib/administration/UserManager.inc");
+
 /*-----------------------------------------------------------------*/
 /**
  * $Id: UserManTesting.php
@@ -26,10 +31,6 @@
 /*-----------------------------------------------------------------*/
 
 
-require ("./config/dmsDefaults.php");
-//require ("$default->owl_fs_root/lib/db.inc");
-require ("$default->owl_fs_root/lib/dms.inc");
-require ("$default->owl_fs_root/lib/administration/UserManager.inc");
 
 $user = new UserManager;
 
diff --git a/tests/documentmanagement/document.php b/tests/documentmanagement/document.php
index 6d3a75f..562e4d7 100644
--- a/tests/documentmanagement/document.php
+++ b/tests/documentmanagement/document.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Contains unit tests for class Document in /lib/documentmanagement/Document.inc
 *
@@ -9,10 +11,9 @@
 *	o storing of object
 *	o updating of object
 *	o deletion of object
+* @package tests.documentmanagement
 */
 
-require_once("../../config/dmsDefaults.php");
-
 if (checkSession()) {
 	require_once("$default->owl_fs_root/lib/documentmanagement/Document.inc");
 	require_once("$default->owl_fs_root/lib/foldermanagement/FolderManager.inc");
diff --git a/tests/documentmanagement/documentDownload.php b/tests/documentmanagement/documentDownload.php
index b99511b..28cd811 100644
--- a/tests/documentmanagement/documentDownload.php
+++ b/tests/documentmanagement/documentDownload.php
@@ -1,14 +1,16 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Contains code to test the dowloading of a document from the server
 * found in /lib/documentmanagement/PhysicalDocumentManager.php
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 17 January 2003
+* @package tests.documentmanagement
 */
 
-require_once("../../config/dmsDefaults.php");
-
 if (checkSession()) {
 	require_once("$default->owl_fs_root/lib/documentmanagement/PhysicalDocumentManager.inc");
 	require_once("$default->owl_fs_root/lib/documentmanagement/Document.inc");
diff --git a/tests/documentmanagement/documentDownload2.php b/tests/documentmanagement/documentDownload2.php
index 586b46e..5ca605b 100644
--- a/tests/documentmanagement/documentDownload2.php
+++ b/tests/documentmanagement/documentDownload2.php
@@ -1,6 +1,9 @@
 <?php
 require_once("../../config/dmsDefaults.php");
 
+/**
+ * @package tests.documentmanagement
+ */
 if (checkSession()) {
 	require_once("$default->owl_fs_root/lib/documentmanagement/PhysicalDocumentManager.inc");
 	require_once("$default->owl_fs_root/lib/documentmanagement/Document.inc");
diff --git a/tests/documentmanagement/documentField.php b/tests/documentmanagement/documentField.php
index 427428f..a89ebbd 100644
--- a/tests/documentmanagement/documentField.php
+++ b/tests/documentmanagement/documentField.php
@@ -1,15 +1,15 @@
 <?php
 
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Unit test for class DocumentField found in /lib/documentmanagement/DocumentField.inc
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 19 January 2003
-*
+* @package tests.documentmanagement
 */
 
-require_once("../../config/dmsDefaults.php");
-
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/documentmanagement/DocumentField.inc");
 	
diff --git a/tests/documentmanagement/documentFieldLink.php b/tests/documentmanagement/documentFieldLink.php
index 3c2c473..c4cf876 100644
--- a/tests/documentmanagement/documentFieldLink.php
+++ b/tests/documentmanagement/documentFieldLink.php
@@ -1,15 +1,15 @@
 <?php
 
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Unit test for class DocumentField found in /lib/documentmanagement/DocumentField.inc
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 19 January 2003
-*
+* @package tests.documentmanagement
 */
 
-require_once("../../config/dmsDefaults.php");
-
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/documentmanagement/DocumentFieldLink.inc");
 	
diff --git a/tests/documentmanagement/documentTransactions.php b/tests/documentmanagement/documentTransactions.php
index 8fe66b2..9550f92 100644
--- a/tests/documentmanagement/documentTransactions.php
+++ b/tests/documentmanagement/documentTransactions.php
@@ -1,12 +1,15 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Unit test for class DocumentTransaction in /lib/documentmanagement/DocumentTransaction.inc
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 18 January 2003
-*
+* @package tests.documentmanagement
 */
-require_once("../../config/dmsDefaults.php");
+
 
 if (checkSession()) {
 	require_once("$default->owl_fs_root/lib/documentmanagement/Document.inc");
diff --git a/tests/documentmanagement/documentTypeTest.php b/tests/documentmanagement/documentTypeTest.php
index 933be51..5de0ee5 100644
--- a/tests/documentmanagement/documentTypeTest.php
+++ b/tests/documentmanagement/documentTypeTest.php
@@ -1,11 +1,5 @@
 <?php
 
-/**
-* Unit tests for ./lib/documentmanagement/DocumentManager class, 
-* document type functionality
-*
-*/
-
 require_once ("../../config/owl.php");
 require_once ($default->owl_fs_root . "/config/environment.php");
 require_once ($default->owl_fs_root . "/config/dmsDefaults.php");
@@ -13,6 +7,13 @@ require_once ($default->owl_fs_root . "/lib/owl.lib.php");
 require_once ($default->owl_fs_root . "/lib/documentmanagement/DocumentManager.inc");
 
 /**
+* Unit tests for ./lib/documentmanagement/DocumentManager class, 
+* document type functionality
+* @package tests.documentmanagement
+*/
+
+
+/**
 * Database backend unit tests for:
 * 	o Document type (document_types)
 * 	o Field (fields)
diff --git a/tests/documentmanagement/documentUpload.php b/tests/documentmanagement/documentUpload.php
index 695a87d..31cc77e 100644
--- a/tests/documentmanagement/documentUpload.php
+++ b/tests/documentmanagement/documentUpload.php
@@ -1,15 +1,16 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Contains unit test functionality for upload function of class PhysicalDocumentManager found in 
 * /lib/documentmanagement/PhysicalDocumentManager.inc
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 17 January 2003
-*
+* @package tests.documentmanagement
 */
 
-require_once("../../config/dmsDefaults.php");
-
 if (checkSession()) {
 	require_once("$default->owl_fs_root/lib/documentmanagement/PhysicalDocumentManager.inc");
 	require_once("$default->owl_fs_root/lib/folderManagement/Folder.inc");
diff --git a/tests/documentmanagement/documentUpload2.php b/tests/documentmanagement/documentUpload2.php
index 52e70cc..b057a84 100644
--- a/tests/documentmanagement/documentUpload2.php
+++ b/tests/documentmanagement/documentUpload2.php
@@ -1,14 +1,15 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Second part of test file for document upload
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 17 January 2003
-*
+* @package tests.documentmanagement
 */
 
-require_once("../../config/dmsDefaults.php");
-
 if (checkSession()) {
 	require_once("$default->owl_fs_root/lib/documentmanagement/PhysicalDocumentManager.inc");
 	require_once("$default->owl_fs_root/lib/documentmanagement/Document.inc");
diff --git a/tests/email/email.php b/tests/email/email.php
index d8a9a8c..badb0bc 100644
--- a/tests/email/email.php
+++ b/tests/email/email.php
@@ -1,13 +1,15 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Unit tests for static function in Email class in /lib/email/Email.inc
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 19 January 2003
-*
+* @package tests.email
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/email/Email.inc");
diff --git a/tests/foldermanagement/folder.php b/tests/foldermanagement/folder.php
index 2a4e568..73fc134 100644
--- a/tests/foldermanagement/folder.php
+++ b/tests/foldermanagement/folder.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Contains unit test code for class Folder in /lib/foldermanagement/Folder.inc
 *
@@ -8,9 +11,9 @@
 *	o storing of object
 *	o updating of object
 *	o deletion of object
+* @package tests.foldermanagement
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession()) {
 	require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
diff --git a/tests/groups/group.php b/tests/groups/group.php
index 8dcbf15..db2a35e 100644
--- a/tests/groups/group.php
+++ b/tests/groups/group.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * @package tests.groups
 *
@@ -6,9 +9,9 @@
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 20 January 2003
+* @package tests.groups
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/groups/GroupUnitLink.inc");
diff --git a/tests/groups/groupFolderApprovalLink.php b/tests/groups/groupFolderApprovalLink.php
index b2b083b..77dadec 100644
--- a/tests/groups/groupFolderApprovalLink.php
+++ b/tests/groups/groupFolderApprovalLink.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Unit test for class GroupFolderApprovalLink found in /lib/groups/GroupFolderApprovalLink.inc
 *
@@ -8,7 +11,6 @@
 *
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/groups/GroupFolderApprovalLink.inc");
diff --git a/tests/groups/groupUserLink.php b/tests/groups/groupUserLink.php
index b273d98..267c1f4 100644
--- a/tests/groups/groupUserLink.php
+++ b/tests/groups/groupUserLink.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * @package tests.groups
 *
@@ -6,9 +9,9 @@
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 20 January 2003
+* @package tests.groups
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/groups/GroupUserLink.inc");
diff --git a/tests/roles/roleFolderLink.php b/tests/roles/roleFolderLink.php
index 090a5ad..c8cea23 100644
--- a/tests/roles/roleFolderLink.php
+++ b/tests/roles/roleFolderLink.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * @package tests.roles
 *
@@ -6,9 +9,9 @@
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 20 January 2003
+* @package tests.roles
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/roles/RoleFolderLink.inc");
diff --git a/tests/roles/roles.php b/tests/roles/roles.php
index bcbb973..d7e6825 100644
--- a/tests/roles/roles.php
+++ b/tests/roles/roles.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * @package tests.roles
 *
@@ -6,9 +9,9 @@
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 20 January 2003
+* @package tests.roles
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/roles/Role.inc");
diff --git a/tests/units/unit.php b/tests/units/unit.php
index 783a6a9..ac7ccec 100644
--- a/tests/units/unit.php
+++ b/tests/units/unit.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Unit test for class Unit in /lib/units
 *
@@ -8,8 +11,6 @@
 *
 */
 
-require_once("../../config/dmsDefaults.php");
-
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/units/Unit.inc");
 	
diff --git a/tests/users/user.php b/tests/users/user.php
index 42846e6..e2d3f95 100644
--- a/tests/users/user.php
+++ b/tests/users/user.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
 *
 * Unit tests for User class found in /lib/users/User.inc
@@ -8,7 +11,6 @@
 * @package tests.users
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/users/User.inc");
diff --git a/tests/visualpatterns/listBoxTest.php b/tests/visualpatterns/listBoxTest.php
index 08436b1..e891d42 100644
--- a/tests/visualpatterns/listBoxTest.php
+++ b/tests/visualpatterns/listBoxTest.php
@@ -1,13 +1,16 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+require_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc");
+
 /**
 * Unit test code from PatternListBox class in /lib/visualpatterns/PatternListBox.inc
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 16 January 2003
+* @package tests.visualpatterns
 */
 
-require_once("../../config/dmsDefaults.php");
-require_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc");
 	
 $oPatternListBox = & new PatternListBox("folders", "name", "id", "folders");
 echo "<html><head></head><body>" . $oPatternListBox->render() . "</body></html>";
diff --git a/tests/visualpatterns/test.php b/tests/visualpatterns/test.php
index 2373025..e64bfbd 100644
--- a/tests/visualpatterns/test.php
+++ b/tests/visualpatterns/test.php
@@ -5,7 +5,9 @@ require_once ("./lib/visualpatterns/PatternImage.inc");
 require_once ("./lib/visualpatterns/PatternTableLinks.inc");
 require_once ("./lib/visualpatterns/PatternTableSqlQuery.inc");
 
-
+/**
+ * @package tests.visualpatterns
+ */
 //North west image
 $img = new PatternImage("file://C:/temp/test/al.jpg");
 
diff --git a/tests/web/subscription.php b/tests/web/subscription.php
index 3e8e9db..9fee0b9 100644
--- a/tests/web/subscription.php
+++ b/tests/web/subscription.php
@@ -1,14 +1,16 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
-* @package tests.web
 *
 * Unit tests for class Subscription found in /lib/web/Subscription.inc
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 20 January 2003
+* @package tests.web
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/web/Subscription.inc");
diff --git a/tests/web/webDocument.php b/tests/web/webDocument.php
index 276c5c3..9f9149a 100644
--- a/tests/web/webDocument.php
+++ b/tests/web/webDocument.php
@@ -1,14 +1,15 @@
 <?php
 
+require_once("../../config/dmsDefaults.php");
+
 /**
 * Unit test for class DocumentField found in /lib/documentmanagement/DocumentField.inc
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 19 January 2003
-*
+* @package tests.web
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession) {
 	require_once("$default->owl_fs_root/lib/web/WebDocument.inc");
diff --git a/tests/web/webSite.php b/tests/web/webSite.php
index dff9daf..e8c8ed4 100644
--- a/tests/web/webSite.php
+++ b/tests/web/webSite.php
@@ -1,14 +1,16 @@
 <?php
+
+require_once("../../config/dmsDefaults.php");
+
 /**
-* @package tests.web
 *
 * Unit tests for WebSite class in /lib/web/WebSite.inc
 *
 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
 * @date 20 January 2003
+* @package tests.web
 */
 
-require_once("../../config/dmsDefaults.php");
 
 if (checkSession()) {
 	require_once("$default->owl_fs_root/lib/web/WebSite.inc");