Index: vhUnitTest/TECH/KeyValue/List/FindByKey/Test.cls.xml
===================================================================
diff -u -r1786 -r1892
--- vhUnitTest/TECH/KeyValue/List/FindByKey/Test.cls.xml	(.../Test.cls.xml)	(revision 1786)
+++ vhUnitTest/TECH/KeyValue/List/FindByKey/Test.cls.xml	(.../Test.cls.xml)	(revision 1892)
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.TECH.KeyValue.List.FindByKey.Test">
-<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+<Super>vhUnitTest.TestCase</Super>
 
+<Property name="KeyValueList">
+<Type>TECH.KeyValue.ListBase</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Do ..CreateKeyValueList()
+]]></Implementation>
+</Method>
+
 <Method name="CreateKeyValueList">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.List).%New()
Index: vhUnitTest/TECH/KeyValue/UniqueList/InsertKeyValue/Test.cls.xml
===================================================================
diff -u -r1786 -r1892
--- vhUnitTest/TECH/KeyValue/UniqueList/InsertKeyValue/Test.cls.xml	(.../Test.cls.xml)	(revision 1786)
+++ vhUnitTest/TECH/KeyValue/UniqueList/InsertKeyValue/Test.cls.xml	(.../Test.cls.xml)	(revision 1892)
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.TECH.KeyValue.UniqueList.InsertKeyValue.Test">
-<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+<Super>vhUnitTest.TestCase</Super>
 
-<Method name="CreateKeyValueList">
-<Private>1</Private>
-<Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
-]]></Implementation>
-</Method>
-
 <Method name="Test: InsertKeyValue">
 <Implementation><![CDATA[
 	#Define Key "Key"	
@@ -18,8 +12,9 @@
 	
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", SubStrings))
 	
-	Do ..KeyValueList.InsertKeyValue($$$Key, $$$Value)
-	Do ..KeyValueList.InsertKeyValue($$$Key, $$$Value)
+	Set KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	Do KeyValueList.InsertKeyValue($$$Key, $$$Value)
+	Do KeyValueList.InsertKeyValue($$$Key, $$$Value)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/TECH/KeyValue/UniqueList/InsertAt/Test.cls.xml
===================================================================
diff -u -r1786 -r1892
--- vhUnitTest/TECH/KeyValue/UniqueList/InsertAt/Test.cls.xml	(.../Test.cls.xml)	(revision 1786)
+++ vhUnitTest/TECH/KeyValue/UniqueList/InsertAt/Test.cls.xml	(.../Test.cls.xml)	(revision 1892)
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.TECH.KeyValue.UniqueList.InsertAt.Test">
-<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+<Super>vhUnitTest.TestCase</Super>
 
-<Method name="CreateKeyValueList">
-<Private>1</Private>
-<Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
-]]></Implementation>
-</Method>
-
 <Method name="Test: InsertAt">
 <Implementation><![CDATA[
 	#Define Key "Key"	
@@ -21,8 +15,9 @@
 	
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", SubStrings))
 	
-	Do ..KeyValueList.InsertAt(KeyValuePair1, 1)
-	Do ..KeyValueList.InsertAt(KeyValuePair2, 2)
+	Set KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	Do KeyValueList.InsertAt(KeyValuePair1, 1)
+	Do KeyValueList.InsertAt(KeyValuePair2, 2)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/TECH/KeyValue/UniqueList/FindByKey/Test.cls.xml
===================================================================
diff -u -r1786 -r1892
--- vhUnitTest/TECH/KeyValue/UniqueList/FindByKey/Test.cls.xml	(.../Test.cls.xml)	(revision 1786)
+++ vhUnitTest/TECH/KeyValue/UniqueList/FindByKey/Test.cls.xml	(.../Test.cls.xml)	(revision 1892)
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.TECH.KeyValue.UniqueList.FindByKey.Test">
-<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+<Super>vhUnitTest.TestCase</Super>
 
+<Property name="KeyValueList">
+<Type>TECH.KeyValue.ListBase</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Do ..CreateKeyValueList()
+]]></Implementation>
+</Method>
+
 <Method name="CreateKeyValueList">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
Index: vhUnitTest/TECH/KeyValue/UniqueList/Insert/Test.cls.xml
===================================================================
diff -u -r1786 -r1892
--- vhUnitTest/TECH/KeyValue/UniqueList/Insert/Test.cls.xml	(.../Test.cls.xml)	(revision 1786)
+++ vhUnitTest/TECH/KeyValue/UniqueList/Insert/Test.cls.xml	(.../Test.cls.xml)	(revision 1892)
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.TECH.KeyValue.UniqueList.Insert.Test">
-<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+<Super>vhUnitTest.TestCase</Super>
 
-<Method name="CreateKeyValueList">
-<Private>1</Private>
-<Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
-]]></Implementation>
-</Method>
-
-<Method name="Test: Insert">
+<Method name="Test: Insert met exceptie">
 <Implementation><![CDATA[
 	#Define Key "Key"	
 	#Define Value "Value"
@@ -21,8 +15,9 @@
 	
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", SubStrings))
 	
-	Do ..KeyValueList.Insert(KeyValuePair1)
-	Do ..KeyValueList.Insert(KeyValuePair2)
+	Set KeyValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	Do KeyValueList.Insert(KeyValuePair1)
+	Do KeyValueList.Insert(KeyValuePair2)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/TECH/KeyValue/ListBase/TestBase.cls.xml
===================================================================
diff -u -r1794 -r1892
--- vhUnitTest/TECH/KeyValue/ListBase/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 1794)
+++ vhUnitTest/TECH/KeyValue/ListBase/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 1892)
@@ -130,6 +130,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestToString">
+<Implementation><![CDATA[
+	#Define Key1 "Key1"
+	#Define Key2 "Key2"
+	#Define Key3 "Key3"
+	#Define Key4 "Key4"
+	
+	#Define Value1 "Value1"
+	#Define Value2 "Value2"
+	#Define Value3 "ValueValueValue3"
+	#Define Value4 "Value4"
+	
+	Do ..KeyValueList.InsertKeyValue($$$Key1, $$$Value1)
+	Do ..KeyValueList.InsertKeyValue($$$Key2, $$$Value2)
+	Do ..KeyValueList.InsertKeyValue($$$Key3, $$$Value3)
+	Do ..KeyValueList.InsertKeyValue($$$Key4, $$$Value4)
+	
+	#dim KVPDelimiter As %String = "||"
+	#dim String As %String = ..KeyValueList.ToString(KVPDelimiter)
+	
+	Do $$$AssertEquals(String, "Key="_$$$Key1_",Value="_$$$Value1 _ KVPDelimiter _ "Key="_$$$Key2_",Value="_$$$Value2 _ KVPDelimiter _ "Key="_$$$Key3_",Value="_$$$Value3 _ KVPDelimiter _ "Key="_$$$Key4_",Value="_$$$Value4)
+]]></Implementation>
+</Method>
+
 <Method name="CreateKeyValueList">
 <Abstract>1</Abstract>
 <Private>1</Private>