Index: vhUnitTest/TECH/KeyValueList/InsertKeyValuePair/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/KeyValueList/InsertKeyValuePair/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/KeyValueList/InsertKeyValuePair/Test.cls.xml	(revision 1770)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.KeyValueList.InsertKeyValuePair.Test">
+<Super>vhUnitTest.TECH.KeyValueList.TestBase</Super>
+
+<Method name="Test: Inserting existing key throws Exception">
+<Implementation><![CDATA[
+	#Define Key "Key"
+	#Dim SubStrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Key already exists :",$$$Key)
+	
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException", SubStrings))
+
+	Do ..KeyValueList.InsertKeyValuePair($$$Key, "")
+	Do ..KeyValueList.InsertKeyValuePair($$$Key, "")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Inserting unique key">
+<Implementation><![CDATA[
+	#Define Key1 "Key1"
+	#Define Key2 "Key2"
+	
+	Do ..KeyValueList.InsertKeyValuePair($$$Key1, "")
+	Do ..KeyValueList.InsertKeyValuePair($$$Key2, "")
+	
+	Do $$$AssertEquals(..KeyValueList.GetAt(1).Key, $$$Key1)
+	Do $$$AssertEquals(..KeyValueList.GetAt(2).Key, $$$Key2)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/KeyValueList/TestBase.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/KeyValueList/TestBase.cls.xml	(revision 0)
+++ vhUnitTest/TECH/KeyValueList/TestBase.cls.xml	(revision 1770)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.KeyValueList.TestBase">
+<Abstract>1</Abstract>
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="KeyValueList">
+<Type>TECH.KeyValueList</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestCase:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestCase)
+	Set ..KeyValueList = ##class(TECH.KeyValueList).%New()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/Query/impl/InsertStatementBuilder/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Query/impl/InsertStatementBuilder/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Query/impl/InsertStatementBuilder/Test.cls.xml	(revision 1770)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.Query.impl.InsertStatementBuilder.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="InsertStatementBuilderImpl">
+<Type>TECH.Query.impl.InsertStatementBuilder</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	set ..InsertStatementBuilderImpl =	##class(TECH.Query.impl.InsertStatementBuilder).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: One field one value">
+<Implementation><![CDATA[
+	set Values = ##class(TECH.KeyValueList).%New()
+	do Values.InsertKeyValuePair("Field1","Value1")
+	
+	Do ..AssertStatement(Values, "INSERT INTO Package.Table (Field1) VALUES ('Value1')")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Two field two values">
+<Implementation><![CDATA[
+	set Values = ##class(TECH.KeyValueList).%New()
+	do Values.InsertKeyValuePair("Field1", "Value1")
+	do Values.InsertKeyValuePair("Field2", "Value2")
+	
+	Do ..AssertStatement(Values, "INSERT INTO Package.Table (Field1,Field2) VALUES ('Value1','Value2')")
+]]></Implementation>
+</Method>
+
+<Method name="AssertStatement">
+<FormalSpec>Values:TECH.KeyValueList,ExpectedStatement:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	do $$$AssertEquals(..InsertStatementBuilderImpl.Build( "Package.Table",Values),ExpectedStatement)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/KeyValueList/FindByKey/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/KeyValueList/FindByKey/Test.cls.xml	(revision 0)
+++ vhUnitTest/TECH/KeyValueList/FindByKey/Test.cls.xml	(revision 1770)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.TECH.KeyValueList.FindByKey.Test">
+<Super>vhUnitTest.TECH.KeyValueList.TestBase</Super>
+
+<Method name="Test: Key wasn&apos;t found returns empty value">
+<Implementation><![CDATA[	Do $$$AssertEquals(..KeyValueList.FindByKey("UnExistingKey"),"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Key was found returns KeyValuePair">
+<Implementation><![CDATA[
+	Set KeyValuePair1 = ##class(TECH.KeyValuePair).%New("Key1", "Value1")
+	
+	Do ..KeyValueList.Insert(KeyValuePair1)
+	Do $$$AssertEquals(..KeyValueList.FindByKey("Key1"),KeyValuePair1)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>