Index: vhUnitTest/zTryout/LLA/ParseCacheObjectToJson/Test.cls.xml
===================================================================
diff -u -r62363 -r62365
--- vhUnitTest/zTryout/LLA/ParseCacheObjectToJson/Test.cls.xml	(.../Test.cls.xml)	(revision 62363)
+++ vhUnitTest/zTryout/LLA/ParseCacheObjectToJson/Test.cls.xml	(.../Test.cls.xml)	(revision 62365)
@@ -51,23 +51,23 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test JSON GeefProductRestRequest met ingegeven kenmerken zonder ingevulde properties van list type">
+<Method name="aTest JSON GeefProductRestRequest met ingegeven kenmerken zonder ingevulde properties van list type">
 <Implementation><![CDATA[
 	#dim ProductData As DOM.PM.dto.ProductData = ..GeefProductData()
 	
-	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ..GeefIngegevenKenmerkenBasis()
+	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken = ..GeefIngegevenKenmerkenBasis()
 
 	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..GeefProductRestRequestBasis()
 	Set GeefProductRestRequest.IngegevenKenmerken = IngegevenKenmerken
 	Set GeefProductRestRequest.ProductData = ProductData
 		
-	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken: { _class:'zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken', ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, NietMeeleveren:[], Onderdelen:[], ProductieWijze:""DummyProductieWijze"", VersieNr:""DummyVersieNr""}, KlantID:""DummyKlantIDValue"", ProductData: { _class:'DOM.PM.dto.ProductData', DossierNummer:""DummyDossierNummer"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, PRNr:1}}"
+	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, NietMeeleveren:[], Onderdelen:[], ProductieWijze:""DummyProductieWijze"", VersieNr:""DummyVersieNr""}, KlantID:""DummyKlantIDValue"", ProductData: { _class:'DOM.PM.dto.ProductData', DossierNummer:""DummyDossierNummer"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, PRNr:1}}"
 	
 	Do ..AssertJson(GeefProductRestRequest, ExpectedJsonString)
 ]]></Implementation>
 </Method>
 
-<Method name="Test JSON met ingegeven kenmerken, met een array object">
+<Method name="aTest JSON met ingegeven kenmerken, met een array object">
 <Implementation><![CDATA[
 	#dim ProductData As DOM.PM.dto.ProductData = ..GeefProductData()
 	
@@ -79,25 +79,25 @@
 	Set GeefProductRestRequest.IngegevenKenmerken = IngegevenKenmerken
 	Set GeefProductRestRequest.ProductData = ProductData
 		
-	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken: { _class:'zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken', ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{MatX: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0},MatY: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0}}, NietMeeleveren:[], Onderdelen:[], ProductieWijze:""DummyProductieWijze"", VersieNr:""DummyVersieNr""}, KlantID:""DummyKlantIDValue"", ProductData: { _class:'DOM.PM.dto.ProductData', DossierNummer:""DummyDossierNummer"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, PRNr:1}}"
+	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{MatX: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0},MatY: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0}}, NietMeeleveren:[], Onderdelen:[], ProductieWijze:""DummyProductieWijze"", VersieNr:""DummyVersieNr""}, KlantID:""DummyKlantIDValue"", ProductData: { _class:'DOM.PM.dto.ProductData', DossierNummer:""DummyDossierNummer"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, PRNr:1}}"
 	
 	Do ..AssertJson(GeefProductRestRequest, ExpectedJsonString)
 ]]></Implementation>
 </Method>
 
-<Method name="Test JSON met ingegeven kenmerken, met een list object">
+<Method name="aTest JSON met ingegeven kenmerken, met een list object">
 <Implementation><![CDATA[
 	#dim ProductData As DOM.PM.dto.ProductData = ..GeefProductData()
 	
-	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ..GeefIngegevenKenmerkenBasis()
+	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken = ..GeefIngegevenKenmerkenBasis()
 	Set IngegevenKenmerken.GekoppeldeIngegevenKenmerken = ..GeefArrayGekoppeldeIngegevenKenmerken()
 	Set IngegevenKenmerken.NietMeeleveren = ..GeefNietMeeleveren()
 		
 	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..GeefProductRestRequestBasis()
 	Set GeefProductRestRequest.IngegevenKenmerken = IngegevenKenmerken
 	Set GeefProductRestRequest.ProductData = ProductData
 		
-	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken: { _class:'zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken', ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{MatX: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0},MatY: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0}}, NietMeeleveren:[""NietMeeleveren1"",""NietMeeleveren2""], Onderdelen:[], ProductieWijze:""DummyProductieWijze"", VersieNr:""DummyVersieNr""}, KlantID:""DummyKlantIDValue"", ProductData: { _class:'DOM.PM.dto.ProductData', DossierNummer:""DummyDossierNummer"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, PRNr:1}}"
+	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{MatX: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0},MatY: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0}}, NietMeeleveren:[""NietMeeleveren1"",""NietMeeleveren2""], Onderdelen:[], ProductieWijze:""DummyProductieWijze"", VersieNr:""DummyVersieNr""}, KlantID:""DummyKlantIDValue"", ProductData: { _class:'DOM.PM.dto.ProductData', DossierNummer:""DummyDossierNummer"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, PRNr:1}}"
 	
 	Do ..AssertJson(GeefProductRestRequest, ExpectedJsonString)
 ]]></Implementation>
@@ -176,9 +176,9 @@
 </Method>
 
 <Method name="GeefIngegevenKenmerkenBasis">
-<ReturnType>zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken</ReturnType>
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken</ReturnType>
 <Implementation><![CDATA[
-	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ##class(zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken).%New()
+	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = ##class(DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken).%New()
 	Set IngegevenKenmerken.ProductieWijze = "DummyProductieWijze"
 	Set IngegevenKenmerken.VersieNr = "DummyVersieNr"