Index: vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml
===================================================================
diff -u -r34111 -r34164
--- vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml	(.../KeyValuePairRepository.cls.xml)	(revision 34111)
+++ vhTest/Utils/TECH/Persistent/KeyValuePairRepository.cls.xml	(.../KeyValuePairRepository.cls.xml)	(revision 34164)
@@ -19,16 +19,23 @@
 </Method>
 
 <Method name="GeefViaKeyValue">
-<FormalSpec>Sleutel:%String,Waarde:%String</FormalSpec>
+<FormalSpec>Key:%String,Value:%String</FormalSpec>
 <ReturnType>TECH.Persistent</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefViaFilter("Sleutel = ? AND Waarde = ?", $LB(Sleutel,Waarde))
+<Implementation><![CDATA[	Quit ..GeefViaFilter("Sleutel = ? AND Waarde = ?", $LB(Key,Value))
 ]]></Implementation>
 </Method>
 
+<Method name="GeefViaValue">
+<FormalSpec>Value:%String</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefViaFilter("Waarde = ?", $LB(Value))
+]]></Implementation>
+</Method>
+
 <Method name="GeefViaKeyOfValue">
-<FormalSpec>Sleutel:%String,Waarde:%String</FormalSpec>
+<FormalSpec>Key:%String,Value:%String</FormalSpec>
 <ReturnType>TECH.Persistent</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefViaFilter("Sleutel = ? OR Waarde = ?", $LB(Sleutel,Waarde))
+<Implementation><![CDATA[	Quit ..GeefViaFilter("Sleutel = ? OR Waarde = ?", $LB(Key,Value))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml
===================================================================
diff -u -r34135 -r34164
--- vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34135)
+++ vhUnitTest/Utils/TECH/Persistent/KeyValuePairRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 34164)
@@ -5,80 +5,98 @@
 
 <Method name="OnBeforeOneTest">
 <Implementation><![CDATA[
-	Do ..VerwijderDummyKeyValuePair()
-	Do ..VoegToeDummyKeyValuePair(2)
+	Do ..DeleteAllKeyValuePairs()
 	Do ##super()
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	Do ..VerwijderDummyKeyValuePair()
+	Do ..DeleteAllKeyValuePairs()
 	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: GeefViaKeyValue geeft object KeyValuePair weer.">
 <Implementation><![CDATA[
+	Do ..CreateKeyValuePair("Key","Value")
+
 	#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("DummyKey1","DummyValue")
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyValue("Key","Value")
 	
-	Do $$$AssertEquals(KeyValuePair.Sleutel, "DummyKey1")
-	Do $$$AssertEquals(KeyValuePair.Waarde, "DummyValue")
+	Do $$$AssertEquals(KeyValuePair.Sleutel, "Key")
+	Do $$$AssertEquals(KeyValuePair.Waarde, "Value")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefViaKeyValue geeft geen resultaat en gooit exceptie.">
+<Method name="Test: GeefViaValue geeft geen resultaat en gooit exceptie.">
 <Implementation><![CDATA[
 	#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")
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen data in 'vhTest_Utils_TECH_Persistent.KeyValuePair' gevonden met filter 'Waarde = ?' en parameters '(""Value"")'")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substrings))
 
-	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyValue("VerkeerdeDummyKey","DummyValue")
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaValue("Value")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefViaKeyOfValue met OR operator in de filter, geeft KeyValuePair weer.">
+<Method name="Test: GeefViaKeyOfValue met OR operator in de filter, geeft KeyValuePair weer. (Key)">
 <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("DummyKey1","VerkeerdeDummyValue")
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyOfValue("Key1","UnexistingValue")
 	
-	Do $$$AssertEquals(KeyValuePair.Sleutel, "DummyKey1")
-	Do $$$AssertEquals(KeyValuePair.Waarde, "DummyValue")
+	Do $$$AssertEquals(KeyValuePair.Sleutel, "Key1")
+	Do $$$AssertEquals(KeyValuePair.Waarde, "Value1")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefViaKeyOfValue verwacht exceptie bij meer dan één object als resultaat.">
+<Method name="Test: GeefViaKeyOfValue met OR operator in de filter, geeft KeyValuePair weer. (Value)">
 <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")
 	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("geen unieke data gevonden voor vhTest.Utils.TECH.Persistent.KeyValuePair")
+	Do $$$AssertEquals(KeyValuePair.Sleutel, "Key2")
+	Do $$$AssertEquals(KeyValuePair.Waarde, "Value2")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefViaKeyOfValue verwacht exceptie bij meer dan één object als resultaat.">
+<Implementation><![CDATA[
+	Do ..CreateKeyValuePair("Key1","Value")
+	Do ..CreateKeyValuePair("Key2","Value")
+
+	#dim KeyValuePairRepository As vhTest.Utils.TECH.Persistent.KeyValuePairRepository = ##class(vhTest.Utils.TECH.Persistent.KeyValuePairRepository).%New()
+
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen unieke data in 'vhTest_Utils_TECH_Persistent.KeyValuePair' gevonden met filter 'Waarde = ?' en parameters '(""Value"")'")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substrings))
 
-	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaKeyOfValue("DummyKey","DummyValue")
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = KeyValuePairRepository.GeefViaValue("Value")
 ]]></Implementation>
 </Method>
 
-<Method name="VerwijderDummyKeyValuePair">
-<Implementation><![CDATA[	Do ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%KillExtent()
+<Method name="DeleteAllKeyValuePairs">
+<Private>1</Private>
+<Implementation><![CDATA[	Do ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%DeleteExtent()
 ]]></Implementation>
 </Method>
 
-<Method name="VoegToeDummyKeyValuePair">
-<FormalSpec>AantalKeyValuePairs:%Integer</FormalSpec>
+<Method name="CreateKeyValuePair">
+<FormalSpec>Key:%String,Value:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	#dim Counter As %Integer = 1
-	for Counter=1:1:AantalKeyValuePairs
-	{
-		#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%New()
-		Set KeyValuePair.Sleutel = "DummyKey" _Counter
-		Set KeyValuePair.Waarde = "DummyValue"
-		Do KeyValuePair.Save()
-		Do KeyValuePair.%Close()
-		Set KeyValuePair = ""
-	}
+	#dim Counter As %Integer
+	#dim KeyValuePair As vhTest.Utils.TECH.Persistent.KeyValuePair = ##class(vhTest.Utils.TECH.Persistent.KeyValuePair).%New()
+	Set KeyValuePair.Sleutel = Key
+	Set KeyValuePair.Waarde = Value
+	Do KeyValuePair.Save()
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/TECH/Persistentie/Repository.cls.xml
===================================================================
diff -u -r33330 -r34164
--- vhTest/Fake/TECH/Persistentie/Repository.cls.xml	(.../Repository.cls.xml)	(revision 33330)
+++ vhTest/Fake/TECH/Persistentie/Repository.cls.xml	(.../Repository.cls.xml)	(revision 34164)
@@ -16,8 +16,7 @@
 
 <Method name="Bewaar">
 <FormalSpec>Data:TECH.Persistent</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefViaID">
@@ -35,8 +34,7 @@
 
 <Method name="VerwijderViaID">
 <FormalSpec>ID:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>