Index: vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Test.cls.xml
===================================================================
diff -u -r2580 -r2582
--- vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Test.cls.xml	(.../Test.cls.xml)	(revision 2580)
+++ vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Test.cls.xml	(.../Test.cls.xml)	(revision 2582)
@@ -3,63 +3,87 @@
 <Class name="vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test001">
+<Method name="Test: 1 property 1 waarde -&gt; valid indien property waarde gelijk aan opgegeven waarde">
 <Implementation><![CDATA[
-	set ValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	set ValueList = ##class(TECH.KeyValue.List).%New()
 	do ValueList.InsertKeyValue("Property1","ValidValue")
 	
 	set Filter = ##class(TECH.Filter.PropertyBasedFilter).%New(ValueList)
 	
 	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+
 	set Object.Property1 = "ValidValue"
-	
 	do $$$AssertTrue(Filter.IsValid(Object))
+	
+	set Object.Property1 = "InvalidValue"
+	do $$$AssertFalse(Filter.IsValid(Object))
 ]]></Implementation>
 </Method>
 
-<Method name="Test002">
+<Method name="Test: 2 properties elk 1 waarde -&gt; valid indien property waarden gelijk aan opgegeven waarden">
 <Implementation><![CDATA[
-	set ValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	set ValueList = ##class(TECH.KeyValue.List).%New()
 	do ValueList.InsertKeyValue("Property1","ValidValue")
+	do ValueList.InsertKeyValue("Property2","ValidValue")
 	
 	set Filter = ##class(TECH.Filter.PropertyBasedFilter).%New(ValueList)
 	
 	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
-	set Object.Property1 = "InvalidValue"
+
+	set Object.Property1 = "ValidValue"
+	set Object.Property2 = "ValidValue"
+	do $$$AssertTrue(Filter.IsValid(Object))
 	
+	set Object.Property1 = "ValidValue"
+	set Object.Property2 = "InvalidValue"
 	do $$$AssertFalse(Filter.IsValid(Object))
 ]]></Implementation>
 </Method>
 
-<Method name="Test003">
+<Method name="Test: 1 property meerdere waarden -&gt; valid indien property waarde gelijk aan één van de opgegeven waarden">
 <Implementation><![CDATA[
-	set ValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	set ValueList = ##class(TECH.KeyValue.List).%New()
 	do ValueList.InsertKeyValue("Property1","ValidValue")
-	do ValueList.InsertKeyValue("Property2","ValidValue")
+	do ValueList.InsertKeyValue("Property1","ValidValue2")
 	
 	set Filter = ##class(TECH.Filter.PropertyBasedFilter).%New(ValueList)
 	
-	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()	
+	
 	set Object.Property1 = "ValidValue"
-	set Object.Property2 = "ValidValue"
+	do $$$AssertTrue(Filter.IsValid(Object))
 	
+	set Object.Property1 = "ValidValue2"
 	do $$$AssertTrue(Filter.IsValid(Object))
+	
+	set Object.Property1 = "InvalidValue"
+	do $$$AssertFalse(Filter.IsValid(Object))
 ]]></Implementation>
 </Method>
 
-<Method name="Test004">
+<Method name="Test: meerdere properties met meerdere waarden -&gt; valid indien waarde gelijk aan waarde voor opgegeven property">
 <Implementation><![CDATA[
-	set ValueList = ##class(TECH.KeyValue.UniqueList).%New()
+	set ValueList = ##class(TECH.KeyValue.List).%New()
 	do ValueList.InsertKeyValue("Property1","ValidValue")
+	do ValueList.InsertKeyValue("Property1","ValidValue2")
 	do ValueList.InsertKeyValue("Property2","ValidValue")
+	do ValueList.InsertKeyValue("Property2","ValidValue3")
 	
 	set Filter = ##class(TECH.Filter.PropertyBasedFilter).%New(ValueList)
 	
-	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()	
+	
 	set Object.Property1 = "ValidValue"
-	set Object.Property2 = "InvalidValue"
+	set Object.Property2 = "ValidValue"
+	do $$$AssertTrue(Filter.IsValid(Object))
 	
+	set Object.Property1 = "ValidValue2"
+	set Object.Property2 = "InValidValue"
 	do $$$AssertFalse(Filter.IsValid(Object))
+	
+	set Object.Property1 = "InValidValue"
+	set Object.Property2 = "InValidValue"
+	do $$$AssertFalse(Filter.IsValid(Object))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/TECH/KeyValue/List/Test.cls.xml
===================================================================
diff -u -r1890 -r2582
--- vhUnitTest/TECH/KeyValue/List/Test.cls.xml	(.../Test.cls.xml)	(revision 1890)
+++ vhUnitTest/TECH/KeyValue/List/Test.cls.xml	(.../Test.cls.xml)	(revision 2582)
@@ -8,6 +8,50 @@
 <Implementation><![CDATA[	Set ..KeyValueList = ##class(TECH.KeyValue.List).%New()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: GetValuesByKey - 0 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("KeyElvenDertig")
+
+	Do $$$AssertEquals(Values.Count(), 0)
+]]></Implementation>
+</Method>
+
+<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) {
+		Do $$$AssertEquals(Values.GetAt(1), "Value1")
+	}
+]]></Implementation>
+</Method>
+
+<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) {
+		Do $$$AssertEquals(Values.GetAt(1), "Value2")
+		Do $$$AssertEquals(Values.GetAt(2), "Value3")
+	}
+]]></Implementation>
+</Method>
 </Class>