diff --git a/tests/archiving/testSuite.php b/tests/archiving/testSuite.php
new file mode 100644
index 0000000..6a872d0
--- /dev/null
+++ b/tests/archiving/testSuite.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Contains unit tests for all classes
+ *
+ * Tests are:
+ *	o creation of object
+ *	o setting/getting of values
+ *	o storing of object
+ *  o retrieval of object by primary key
+ *  o retrieval of an array of objects  
+ *	o updating of object
+ * 	o deletion of object
+ * @package tests.archiving
+ */
+ 
+require_once("../config/dmsDefaults.php");
+
+echo "<pre>";
+
+$aClasses = array("archiving/DocumentArchiving" => array("DocumentID", "ArchivingTypeID", "ArchivingSettingsID"),
+             	  "archiving/TimeUnit" => array("Name"),
+				  "archiving/ArchivingType" => array("Name"),
+				  "archiving/ArchivingUtilisationSettings" => array("DocumentTransactionID", "TimePeriodID"),
+             	  "archiving/TimePeriod" => array("TimeUnitID", "Units"),				  
+                  "archiving/ArchivingDateSettings" => array("ExpirationDate", "TimePeriodID"));
+                  
+$aInitialValues = array("1,2,3",
+						"hour",
+						"\"blah's\"",
+						"5, 1",
+						"1, 10",
+ 						"'2002-10-10', 1");
+ 						
+$aSetValues = array(array(9,8,7),
+					array("minute"),
+					array("fooblar's"),
+					array(6,6),
+					array(2,20),
+					array("2003-01-01", 4));
+
+                  
+$count = 0;                
+foreach ($aClasses as $classPath => $aMethodList) {
+	$aClassPath = explode("/", $classPath);
+	$className = $aClassPath[count($aClassPath)-1];
+	require_once("$default->fileSystemRoot/lib/$classPath.inc");
+
+	$constructor = "\$oClass = new $className($aInitialValues[$count]);"; 		
+	echo "<b>$className- $constructor</b><br>";
+	echo "<b>Testing creation</b><br>";
+	eval($constructor);
+	if (isset($oClass)) {
+		echo "Passed creation test<br><br>";
+		
+		echo "<b>Testing storage</b><br>";
+		if ($oClass->create()) {
+			echo "Passed storage test<br><br>";
+			$oClass->iId = -1;$oClass->create();
+		
+			echo "<b>Testing setting and getting of values</b><br>";
+			$i=0;
+			foreach ($aMethodList as $method) {
+				$getter = "get$method";
+				$setter = "set$method";
+				echo "Current $method: " . $oClass->$getter() . "<br>";		
+				echo "Setting $method to: " . $aSetValues[$count][$i] . "<br>";
+				$oClass->$setter($aSetValues[$count][$i]);		
+				echo "New $method: " . $oClass->$getter() . "<br><br>";
+				$i++;		
+			}
+		
+			echo "<b>Testing update</b><br>";
+			if ($oClass->update()) {
+				echo "Passed update test<br><br>";
+				
+				echo "<b>Testing retrieval</b><br>";
+				$get = "\$oNewClass = $className::get(1);";
+				eval($get);
+				if ($oNewClass) {
+					echo "Passed retrieval test:\n" . arrayToString($oNewClass) . "<br>";
+				} else {
+					echo "Failed retrieval test.<br>";
+				}
+								
+				echo "<b>Testing array retrieval</b><br>";
+				$getList = "\$aNewClass = $className::getList();";
+				eval($getList);
+				echo "array=\n" . arrayToString($aNewClass) . "<br><br>";
+							
+				echo "<b>Testing deletion</b><br>";
+				if ($oClass->delete()) {
+					echo "Passed deletion test<br>";
+				} else {
+					echo "Failed deletion test";
+				}
+			} else {
+				echo "Failed update test<br>";
+				echo "Tests NOT run: (a) retrieval by id (b) array list retrieval (c) deletion<br>";
+			}			
+		} else {
+			echo "Failed storage test<br>";
+			echo "Tests NOT run: (a) update (b) retrieval by id (c) array list retrieval (d) deletion<br>";
+		}
+	} else {
+		echo "Failed creation test<br>";
+		echo "Tests NOT run: (a)getting and setting (b) storage (c) retrieval by id (d) array list retrieval (e) deletion<br>";
+	}
+	$count++;
+	echo "<hr>";
+}
+echo "</pre>";
+
+?>
\ No newline at end of file