Index: vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml
===================================================================
diff -u -r34111 -r34118
--- vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34111)
+++ vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34118)
@@ -18,23 +18,19 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefViaKeyValue geeft KeyValuePair weer.">
+<Method name="Test: GeefViaKeyValue geeft object KeyValuePair weer.">
 <Implementation><![CDATA[
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New()
-	
-	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New(,QueryAPISpy)
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
 	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyValue("DummyKey","DummyValue")
 	
 	Do $$$AssertEquals(KeyValuePair.Sleutel, "DummyKey")
 	Do $$$AssertEquals(KeyValuePair.Waarde, "DummyValue")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefViaKeyValue geeft geen resultaat.">
+<Method name="Test: GeefViaKeyValue geeft geen resultaat en gooit exceptie.">
 <Implementation><![CDATA[
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New()
-	
-	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New(,QueryAPISpy)
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
 
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("geen data gevonden voor vhTest.Utils.TECH.Persistent.KeyValuePair")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substrings))
@@ -43,11 +39,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefViaKeyOfValue KeyValuePair weer.">
+<Method name="Test: GeefViaKeyOfValue met OR operator in de filter, geeft KeyValuePair weer.">
 <Implementation><![CDATA[
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New()
-	
-	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New(,QueryAPISpy)
+	#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("VerkeerdeDummyKey","DummyValue")
 	
 	Do $$$AssertEquals(KeyValuePair.Sleutel, "DummyKey")
@@ -59,10 +53,8 @@
 <Implementation><![CDATA[
 	Do ..VoegToeDummyKey2ValuePairMetDezelfdeWaarde()
 	
-	#dim QueryAPISpy As vhTest.Spy.TECH.Query.QueryAPI = ##class(vhTest.Spy.TECH.Query.QueryAPI).%New()
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
 	
-	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New(,QueryAPISpy)
-	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("geen unieke data gevonden voor vhTest.Utils.TECH.Persistent.KeyValuePair")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substrings))