diff --git a/ktapi/KTAPIConstants.inc.php b/ktapi/KTAPIConstants.inc.php
index 10f93eb..1275eb7 100644
--- a/ktapi/KTAPIConstants.inc.php
+++ b/ktapi/KTAPIConstants.inc.php
@@ -1,7 +1,7 @@
 <?
-
 /**
- *
+ * $Id$
+ * 
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
@@ -29,10 +29,6 @@
  *
  */
 
-require_once('../config/dmsDefaults.php');
-require_once(KT_LIB_DIR . '/filelike/fsfilelike.inc.php');
-require_once(KT_LIB_DIR . '/foldermanagement/folderutil.inc.php');
-
 // Generic error messages used in the API. There may be some others specific to functionality
 // directly in the code.
 // TODO: Check that they are all relevant. 
diff --git a/ktapi/KTAPIDocument.inc.php b/ktapi/KTAPIDocument.inc.php
index a5cae9f..8e85e20 100644
--- a/ktapi/KTAPIDocument.inc.php
+++ b/ktapi/KTAPIDocument.inc.php
@@ -1,4 +1,34 @@
 <?
+/**
+ * $Id$
+ *
+ * The contents of this file are subject to the KnowledgeTree Public
+ * License Version 1.1.2 ("License"); You may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.knowledgetree.com/KPL
+ * 
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * All copies of the Covered Code must include on each user interface screen:
+ *    (i) the "Powered by KnowledgeTree" logo and
+ *    (ii) the KnowledgeTree copyright notice
+ * in the same form as they appear in the distribution.  See the License for
+ * requirements.
+ * 
+ * The Original Code is: KnowledgeTree Open Source
+ * 
+ * The Initial Developer of the Original Code is The Jam Warehouse Software
+ * (Pty) Ltd, trading as KnowledgeTree.
+ * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
+ * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ * Contributor( s): ______________________________________
+ *
+ */
+
 class KTAPI_Document extends KTAPI_FolderItem 
 {
 	/**
diff --git a/ktapi/KTAPIFolder.inc.php b/ktapi/KTAPIFolder.inc.php
index ca30164..37dd00e 100644
--- a/ktapi/KTAPIFolder.inc.php
+++ b/ktapi/KTAPIFolder.inc.php
@@ -1,5 +1,33 @@
 <?
-
+/**
+ * $Id$
+ *
+ * The contents of this file are subject to the KnowledgeTree Public
+ * License Version 1.1.2 ("License"); You may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.knowledgetree.com/KPL
+ * 
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * All copies of the Covered Code must include on each user interface screen:
+ *    (i) the "Powered by KnowledgeTree" logo and
+ *    (ii) the KnowledgeTree copyright notice
+ * in the same form as they appear in the distribution.  See the License for
+ * requirements.
+ * 
+ * The Original Code is: KnowledgeTree Open Source
+ * 
+ * The Initial Developer of the Original Code is The Jam Warehouse Software
+ * (Pty) Ltd, trading as KnowledgeTree.
+ * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
+ * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ * Contributor( s): ______________________________________
+ *
+ */
 
 class KTAPI_Folder extends KTAPI_FolderItem
 {	
diff --git a/ktapi/KTAPISession.inc.php b/ktapi/KTAPISession.inc.php
index 1d8549f..abf44e4 100644
--- a/ktapi/KTAPISession.inc.php
+++ b/ktapi/KTAPISession.inc.php
@@ -1,4 +1,33 @@
 <?
+/**
+ * $Id$
+ * 
+ * The contents of this file are subject to the KnowledgeTree Public
+ * License Version 1.1.2 ("License"); You may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.knowledgetree.com/KPL
+ * 
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * All copies of the Covered Code must include on each user interface screen:
+ *    (i) the "Powered by KnowledgeTree" logo and
+ *    (ii) the KnowledgeTree copyright notice
+ * in the same form as they appear in the distribution.  See the License for
+ * requirements.
+ * 
+ * The Original Code is: KnowledgeTree Open Source
+ * 
+ * The Initial Developer of the Original Code is The Jam Warehouse Software
+ * (Pty) Ltd, trading as KnowledgeTree.
+ * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
+ * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ * Contributor( s): ______________________________________
+ *
+ */
 
 class KTAPI_Session 
 {
diff --git a/ktapi/ktapi.inc.php b/ktapi/ktapi.inc.php
index 0ff308b..36a3b07 100644
--- a/ktapi/ktapi.inc.php
+++ b/ktapi/ktapi.inc.php
@@ -1,6 +1,7 @@
 <?
 /**
- *
+ * $Id$
+ * 
  * Implements a cleaner wrapper API for KnowledgeTree.
  *
  * The contents of this file are subject to the KnowledgeTree Public
@@ -31,7 +32,7 @@
  */
 
 session_start();
-require_once(KT_DIR . '/config/dmsDefaults.php');
+require_once(realpath(dirname(__FILE__) . '/../config/dmsDefaults.php'));
 require_once(KT_LIB_DIR . '/filelike/fsfilelike.inc.php');
 require_once(KT_LIB_DIR . '/foldermanagement/folderutil.inc.php');
 
diff --git a/tests/api/authentication.php b/tests/api/authentication.php
index e560e84..d39ddb4 100644
--- a/tests/api/authentication.php
+++ b/tests/api/authentication.php
@@ -1,6 +1,33 @@
 <?
-
-
+/**
+ * $Id$
+ *
+ * The contents of this file are subject to the KnowledgeTree Public
+ * License Version 1.1.2 ("License"); You may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.knowledgetree.com/KPL
+ * 
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * All copies of the Covered Code must include on each user interface screen:
+ *    (i) the "Powered by KnowledgeTree" logo and
+ *    (ii) the KnowledgeTree copyright notice
+ * in the same form as they appear in the distribution.  See the License for
+ * requirements.
+ * 
+ * The Original Code is: KnowledgeTree Open Source
+ * 
+ * The Initial Developer of the Original Code is The Jam Warehouse Software
+ * (Pty) Ltd, trading as KnowledgeTree.
+ * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
+ * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ * Contributor( s): ______________________________________
+ *
+ */
 
 require_once(dirname(__FILE__) . '/../test.php');
 require_once(KT_DIR .  '/ktapi/ktapi.inc.php');
diff --git a/tests/api/document.php b/tests/api/document.php
index a954a2a..0c67e4c 100644
--- a/tests/api/document.php
+++ b/tests/api/document.php
@@ -1,7 +1,33 @@
 <?
-
-
-
+/**
+ * $Id$
+ *
+ * The contents of this file are subject to the KnowledgeTree Public
+ * License Version 1.1.2 ("License"); You may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.knowledgetree.com/KPL
+ * 
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * All copies of the Covered Code must include on each user interface screen:
+ *    (i) the "Powered by KnowledgeTree" logo and
+ *    (ii) the KnowledgeTree copyright notice
+ * in the same form as they appear in the distribution.  See the License for
+ * requirements.
+ * 
+ * The Original Code is: KnowledgeTree Open Source
+ * 
+ * The Initial Developer of the Original Code is The Jam Warehouse Software
+ * (Pty) Ltd, trading as KnowledgeTree.
+ * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
+ * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ * Contributor( s): ______________________________________
+ *
+ */
 require_once(dirname(__FILE__) . '/../test.php');
 require_once(KT_DIR .  '/ktapi/ktapi.inc.php');
 
diff --git a/tests/api/folder.php b/tests/api/folder.php
index 0e71bc0..8301936 100644
--- a/tests/api/folder.php
+++ b/tests/api/folder.php
@@ -1,4 +1,34 @@
 <?
+/**
+ * $Id$
+ *
+ * The contents of this file are subject to the KnowledgeTree Public
+ * License Version 1.1.2 ("License"); You may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.knowledgetree.com/KPL
+ * 
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * All copies of the Covered Code must include on each user interface screen:
+ *    (i) the "Powered by KnowledgeTree" logo and
+ *    (ii) the KnowledgeTree copyright notice
+ * in the same form as they appear in the distribution.  See the License for
+ * requirements.
+ * 
+ * The Original Code is: KnowledgeTree Open Source
+ * 
+ * The Initial Developer of the Original Code is The Jam Warehouse Software
+ * (Pty) Ltd, trading as KnowledgeTree.
+ * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
+ * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ * Contributor( s): ______________________________________
+ *
+ */
+
 require_once(dirname(__FILE__) . '/../test.php');
 require_once(KT_DIR .  '/ktapi/ktapi.inc.php');
 
diff --git a/tests/runtests.php b/tests/runtests.php
index 01a740e..84421b8 100644
--- a/tests/runtests.php
+++ b/tests/runtests.php
@@ -5,9 +5,9 @@ require_once('test.php');
 class UnitTests extends GroupTest {
     function UnitTests() {
         $this->GroupTest('Unit tests');
-        $this->addTestFile('api/authentication.php');
-        $this->addTestFile('api/document.php');
-        $this->addTestFile('api/folder.php');
+        //$this->addTestFile('api/authentication.php');
+        //$this->addTestFile('api/document.php');
+        //$this->addTestFile('api/folder.php');
         $this->addTestFile('SQLFile/test_sqlfile.php');
         $this->addTestFile('cache/testCache.php');
         $this->addTestFile('config/testConfig.php');