Index: TECH/KeyValue/List.cls.xml
===================================================================
diff -u -r2581 -r2583
--- TECH/KeyValue/List.cls.xml	(.../List.cls.xml)	(revision 2581)
+++ TECH/KeyValue/List.cls.xml	(.../List.cls.xml)	(revision 2583)
@@ -43,17 +43,13 @@
 <FormalSpec>Key:%String,Value:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#Dim Values As %ListOfDataTypes = ..GetValuesForKey(Key)
-	#Dim ListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(Values)
-	
 	#dim Gevonden As %Boolean = $$$False
-	#dim NextValue As %String
-	While (ListIterator.HasNext()) && 'Gevonden {
-		Set NextValue = ListIterator.Next()
-		If NextValue = Value {
-			Set Gevonden = $$$True
-		}
+	
+	#dim ListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(..GetValuesForKey(Key))
+	While (ListIterator.HasNext()) && $$$Not(Gevonden) {
+		Set Gevonden = (ListIterator.Next() = Value )
 	}
+	
 	Quit Gevonden
 ]]></Implementation>
 </Method>
Index: vhUnitTest/TECH/KeyValue/List/Test.cls.xml
===================================================================
diff -u -r2582 -r2583
--- vhUnitTest/TECH/KeyValue/List/Test.cls.xml	(.../Test.cls.xml)	(revision 2582)
+++ vhUnitTest/TECH/KeyValue/List/Test.cls.xml	(.../Test.cls.xml)	(revision 2583)
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.TECH.KeyValue.List.Test">
-<Super>vhUnitTest.TECH.KeyValue.ListBase.TestBase</Super>
+<Super>vhUnitTest.TestCase</Super>
 
-<Method name="CreateKeyValueList">
+<Property name="KeyValueList">
+<Type>TECH.KeyValue.List</Type>
 <Private>1</Private>
-<Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.List).%New()
-]]></Implementation>
-</Method>
+</Property>
 
-<Method name="Test: GetValuesByKey - 0 relevante values">
+<Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
+	Do ##super()
+	Set ..KeyValueList = ##class(TECH.KeyValue.List).%New()
 	Do ..KeyValueList.InsertKeyValue("Key1", "Value1")
 	Do ..KeyValueList.InsertKeyValue("Key2", "Value2")
 	Do ..KeyValueList.InsertKeyValue("Key2", "Value3")
 	Do ..KeyValueList.InsertKeyValue("Key3", "Value2")
-		
+]]></Implementation>
+</Method>
+
+<Method name="Test: GetValuesByKey - 0 relevante values">
+<Implementation><![CDATA[
 	#Dim Values As %ListOfDataTypes = ..KeyValueList.GetValuesForKey("KeyElvenDertig")
 
 	Do $$$AssertEquals(Values.Count(), 0)
@@ -24,11 +29,6 @@
 
 <Method name="Test: GetValuesByKey - 1 relevante value">
 <Implementation><![CDATA[
-	Do ..KeyValueList.InsertKeyValue("Key1", "Value1")
-	Do ..KeyValueList.InsertKeyValue("Key2", "Value2")
-	Do ..KeyValueList.InsertKeyValue("Key2", "Value3")
-	Do ..KeyValueList.InsertKeyValue("Key3", "Value2")
-		
 	#Dim Values As %ListOfDataTypes = ..KeyValueList.GetValuesForKey("Key1")
 
 	If $$$AssertEquals(Values.Count(), 1) {
@@ -39,11 +39,6 @@
 
 <Method name="Test: GetValuesByKey - 2 relevante values">
 <Implementation><![CDATA[
-	Do ..KeyValueList.InsertKeyValue("Key1", "Value1")
-	Do ..KeyValueList.InsertKeyValue("Key2", "Value2")
-	Do ..KeyValueList.InsertKeyValue("Key2", "Value3")
-	Do ..KeyValueList.InsertKeyValue("Key3", "Value2")
-		
 	#Dim Values As %ListOfDataTypes = ..KeyValueList.GetValuesForKey("Key2")
 
 	If $$$AssertEquals(Values.Count(), 2) {
@@ -52,6 +47,15 @@
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Exists - 2 relevante values">
+<Implementation><![CDATA[
+	do $$$AssertTrue(..KeyValueList.ValueExistsForKey("Key2","Value2"))
+
+	do $$$AssertFalse(..KeyValueList.ValueExistsForKey("Key2","ValueElvenDertig"))
+	do $$$AssertFalse(..KeyValueList.ValueExistsForKey("KeyElvenDertig","Value2"))
+]]></Implementation>
+</Method>
 </Class>