Index: vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml
===================================================================
diff -u -r34426 -r35862
--- vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34426)
+++ vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 35862)
@@ -76,7 +76,6 @@
 <Implementation><![CDATA[
 	Do ..CreateKeyValuePair("Key1","Value1")
 	Do ..CreateKeyValuePair("Key2","Value2")
-
 	
 	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
 	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyOfValue("UnexistingKey","Value2")
@@ -100,6 +99,46 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: ZoekViaKeyOfValue geeft geen item terug">
+<Implementation><![CDATA[
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
+	#dim Iterator As TECH.Iterator = KeyValuePairRepository.ZoekViaKeyValue("UnexistingKey", "Value2")
+
+	Do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test: ZoekViaKeyOfValue geeft één item terug">
+<Implementation><![CDATA[
+	Do ..CreateKeyValuePair("Key1", "Value1")
+	
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
+	#dim Iterator As TECH.Iterator = KeyValuePairRepository.ZoekViaKeyValue("Key1", "Value1")
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = Iterator.Next()
+	
+	Do $$$AssertEquals(KeyValuePair.Sleutel, "Key1")
+	Do $$$AssertEquals(KeyValuePair.Waarde, "Value1")
+	Do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test: ZoekViaValue geeft meerdere items terug">
+<Implementation><![CDATA[
+	Do ..CreateKeyValuePair("Key1", "Value1")
+	Do ..CreateKeyValuePair("Key2", "Value1")
+	
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
+	#dim Iterator As TECH.Iterator = KeyValuePairRepository.ZoekViaValue("Value1")
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = Iterator.Next()
+	
+	Do $$$AssertEquals(KeyValuePair.Sleutel, "Key1")
+	Do $$$AssertEquals(KeyValuePair.Waarde, "Value1")
+	;Do $$$AssertTrue(Iterator.HasNext())
+	;Do Iterator.Next()
+	;Do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
 <Method name="DeleteAllKeyValuePairs">
 <Private>1</Private>
 <Implementation><![CDATA[	Do ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%DeleteExtent()