Index: vhTest/Fake/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(revision 72881)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.PM.Maatwerk.impl.VhConfigRepository">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.PM.Maatwerk.impl.VhConfigRepository</Super>
+
+<Method name="BestaatVhConfigVoorCID">
+<FormalSpec>CID:%String,IsTestData:%Boolean=0</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="BestaatViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="Bewaar">
+<FormalSpec>Data:TECH.Persistent</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="Dupliceer">
+<FormalSpec>Data:TECH.Persistent,Deep:%Boolean=0</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefVhConfig">
+<FormalSpec>CID:%String,IsTestData:%Boolean=0</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="Maak">
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="SaveVhConfig">
+<FormalSpec>CID:%String,VhConfig:APPS.PM.Maatwerk.dto.VhConfig,IsTestData:%Boolean=0</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderTestData">
+<FormalSpec>OfferteID:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderViaObject">
+<FormalSpec>Data:TECH.Persistent</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="ZoekAlle">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml
===================================================================
diff -u -r72876 -r72881
--- WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 72876)
+++ WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 72881)
@@ -29,15 +29,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>EncowayJsonConverter:WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter="",EncowayHttpClient:WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient=""</FormalSpec>
+<FormalSpec>EncowayJsonConverter:WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter="",EncowayHttpClient:WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient="",VhConfigRepository:APPS.PM.Maatwerk.impl.VhConfigRepository=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..EncowayJsonConverter = $$$Inject(EncowayJsonConverter, ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New())
 	Set ..EncowayHttpClient = $$$Inject(EncowayHttpClient, ##class(WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient).%New())
-	Set ..VhConfigRepository = ##class(APPS.PM.Maatwerk.impl.VhConfigRepository).%New()
+	Set ..VhConfigRepository = $$$Inject(VhConfigRepository, ##class(APPS.PM.Maatwerk.impl.VhConfigRepository).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -52,7 +52,7 @@
 	#dim IsTestRunTimeContext As %Boolean = ..IsTestRunTimeContext()
 	
 	If (CID = "") {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Berekenen VHConfig is mislukt aangezien de CID leeg is."))
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ophalen VHConfig is mislukt aangezien de CID leeg is."))
 	}	
 	
 	If (..VhConfigRepository.BestaatVhConfigVoorCID(CID, IsTestRunTimeContext))
Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml
===================================================================
diff -u -r72853 -r72881
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 72853)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/GeefMaatwerkDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 72881)
@@ -5,23 +5,29 @@
 
 <Method name="Test: Standaard gedrag">
 <Implementation><![CDATA[
+	#dim DomKenmerken As DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken  = ##class(DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerkenv01).%New()
 	#dim DummyCID As %String = "ABC123"
 	#dim DummyMaatwerkDetailsRequestJsonStream As %Stream.GlobalBinary = " { ""CID"": """ _ DummyCID _ """} "
 	#dim DummyResponse As %Stream.GlobalBinary = "{""CID"": null, ""VhConfig"": {""isValid"": ""null"", ""MaatwerkDetails"": { ""Halffabrikaten"": {}, ""Kosten"": [], ""VerwijderdeHalffabItems"": [] }, ""Kenmerken"": {}, ""Model"": null, ""BerekendeKenmerken"": {} }}"
 	Set DummyResponse = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse).%New()
 	
 	Set EncowayJsonConverterMock = ##class(vhTest.Mock.WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
 	Do EncowayJsonConverterMock.VerwachtMethodCall("Stringify", $$$ElkeWaarde).DanReturn(DummyMaatwerkDetailsRequestJsonStream)
-	Do EncowayJsonConverterMock.VerwachtMethodCall("Parse", DummyResponse).DanReturn(DummyResponse)
+	Do EncowayJsonConverterMock.VerwachtMethodCall("ParseMaatwerkDetailsResponse", DummyResponse).DanReturn(DummyResponse)
 	
 	Set EncowayHttpClientMock = ##class(vhTest.Mock.WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient).%New()
 	Do EncowayHttpClientMock.VerwachtMethodCall("HaalOpVhConfig", DummyMaatwerkDetailsRequestJsonStream).DanReturn(DummyResponse)
 	
-	Set EncowayService = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway).%New(EncowayJsonConverterMock, EncowayHttpClientMock)
-	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayService.GeefMaatwerkDetails(DummyCID)
+	Set VhConfigRepositoryMock = ##class(vhTest.Mock.APPS.PM.Maatwerk.impl.VhConfigRepository).%New()
+	Do VhConfigRepositoryMock.VerwachtMethodCall("BestaatVhConfigVoorCID", DummyCID, $$$True).DanReturn($$$False)
+	Do VhConfigRepositoryMock.VerwachtMethodCall("SaveVhConfig", DummyCID, "",$$$True).DanDoeNiks()
 	
+	Set EncowayService = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway).%New(EncowayJsonConverterMock, EncowayHttpClientMock, VhConfigRepositoryMock)
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayService.GeefMaatwerkDetails(DummyCID, DomKenmerken)
+	
 	Do EncowayJsonConverterMock.Verifieer()
 	Do EncowayHttpClientMock.Verifieer()
+	Do VhConfigRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: vhTest/Mock/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(revision 72881)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.PM.Maatwerk.impl.VhConfigRepository">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.PM.Maatwerk.impl.VhConfigRepository,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="%OnNew">
+<FormalSpec>Gateway:TECH.Persistent.Gateway="",QueryAPI:TECH.Query.QueryAPI=""</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="BestaatVhConfigVoorCID">
+<FormalSpec>CID:%String,IsTestData:%Boolean=0</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("BestaatVhConfigVoorCID",CID,IsTestData)
+]]></Implementation>
+</Method>
+
+<Method name="BestaatViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("BestaatViaID",ID)
+]]></Implementation>
+</Method>
+
+<Method name="Bewaar">
+<FormalSpec>Data:TECH.Persistent</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Bewaar",Data)
+]]></Implementation>
+</Method>
+
+<Method name="Dupliceer">
+<FormalSpec>Data:TECH.Persistent,Deep:%Boolean=0</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Dupliceer",Data,Deep)
+]]></Implementation>
+</Method>
+
+<Method name="GeefVhConfig">
+<FormalSpec>CID:%String,IsTestData:%Boolean=0</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVhConfig",CID,IsTestData)
+]]></Implementation>
+</Method>
+
+<Method name="GeefViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefViaID",ID)
+]]></Implementation>
+</Method>
+
+<Method name="Maak">
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Maak")
+]]></Implementation>
+</Method>
+
+<Method name="SaveVhConfig">
+<FormalSpec>CID:%String,VhConfig:APPS.PM.Maatwerk.dto.VhConfig,IsTestData:%Boolean=0</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("SaveVhConfig",CID,VhConfig,IsTestData)
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderTestData">
+<FormalSpec>OfferteID:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderTestData",OfferteID)
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderViaID",ID)
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderViaObject">
+<FormalSpec>Data:TECH.Persistent</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderViaObject",Data)
+]]></Implementation>
+</Method>
+
+<Method name="ZoekAlle">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekAlle")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml
===================================================================
diff -u -r72876 -r72881
--- APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 72876)
+++ APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 72881)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.PM.Maatwerk.impl.VhConfigRepository">
-<Super>TECH.Persistentie.impl.Repository</Super>
+<Super>TECH.Persistentie.impl.Repository,TECH.Mockable</Super>
 
 <Parameter name="DataClassName">
 <Type>%String</Type>