Index: vhUnitTest/AXimpl/common/AxProductValidator/IsGeldig/Test.cls.xml
===================================================================
diff -u -r58153 -r58155
--- vhUnitTest/AXimpl/common/AxProductValidator/IsGeldig/Test.cls.xml	(.../Test.cls.xml)	(revision 58153)
+++ vhUnitTest/AXimpl/common/AxProductValidator/IsGeldig/Test.cls.xml	(.../Test.cls.xml)	(revision 58155)
@@ -28,6 +28,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
  	Do ##super()
@@ -44,6 +49,16 @@
 	Set ..SoprIteratorFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
 	Set ..ProductTypeApi = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
 	Set ..AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
+	
+	Set ..Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
+	Set ..Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
+	Set ..Product.Basis.IdentNummer = "0.123.451.0"
+	
+	Do ..AxProductFactory.IndienMethodCall("Maak", ..#ProductId).DanReturn(..Product)
+	Do ..SoprIteratorFilter.IndienMethodCall("IsValid", ..Product).DanReturn($$$True)
+	Do ..IsOngewenstProductInMigratieFilter.IndienMethodCall("IsValid", ..Product).DanReturn($$$False)
+	Do ..ProductTypeApi.IndienMethodCall("IsSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
+	Do ..ProductTypeApi.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
 ]]></Implementation>
 </Method>
 
@@ -56,243 +71,124 @@
 
 <Method name="Test: Default werking =&gt; IsValid = True">
 <Implementation><![CDATA[
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
-	
-	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
-	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
-	
-	#dim SoprIteratorFilterStub As AX.Uitgaand.PM.impl.SoprIteratorFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
-	Do SoprIteratorFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$True)
-	
-	#dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
-	Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$False)
-	
-	#dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
-	
-	Set ..AxProductFactory = AxProductFactoryStub
-	Set ..SoprIteratorFilter = SoprIteratorFilterStub
-	Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub
-	Set ..ProductTypeApi = ProductTypeApiStub
-	
-	#dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory)
+	#dim AxProductValidator As AXimpl.common.AxProductValidator = ..GeefAxProductValidator()
 	#dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId)
 	
 	Do $$$AssertTrue(Result)
-	Do $$$AssertEquals(Product.Basis.IdentNummer, "0.123.451.0")
+	Do $$$AssertEquals(..Product.Basis.IdentNummer, "0.123.451.0")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: SoprIteratorFilter geeft False =&gt; IsValid = False">
 <Implementation><![CDATA[
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
-	
-	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
-	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
-	
 	#dim SoprIteratorFilterStub As AX.Uitgaand.PM.impl.SoprIteratorFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
-	Do SoprIteratorFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$False)
+	Do SoprIteratorFilterStub.IndienMethodCall("IsValid", ..Product).DanReturn($$$False)
 	
-	#dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
-	Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$False)
-	
-	Set ..AxProductFactory = AxProductFactoryStub
 	Set ..SoprIteratorFilter = SoprIteratorFilterStub
-	Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub
 	
-	#dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory)
+	#dim AxProductValidator As AXimpl.common.AxProductValidator = ..GeefAxProductValidator()
 	#dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId)
 	
 	Do $$$AssertFalse(Result)
-	Do $$$AssertEquals(Product.Basis.IdentNummer, "0.123.451.0")
+	Do $$$AssertEquals(..Product.Basis.IdentNummer, "0.123.451.0")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: IsOngewenstProductInMigratieFilter geeft True =&gt; IsValid = False">
 <Implementation><![CDATA[
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
-	
-	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
-	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
-	
-	#dim SoprIteratorFilterStub As AX.Uitgaand.PM.impl.SoprIteratorFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
-	Do SoprIteratorFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$True)
-	
 	#dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
-	Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$True)
+	Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", ..Product).DanReturn($$$True)
 	
-	#dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
-	
-	Set ..AxProductFactory = AxProductFactoryStub
-	Set ..SoprIteratorFilter = SoprIteratorFilterStub
 	Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub
-	Set ..ProductTypeApi = ProductTypeApiStub
 	
-	#dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory)
+	#dim AxProductValidator As AXimpl.common.AxProductValidator = ..GeefAxProductValidator()
 	#dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId)
 	
 	Do $$$AssertFalse(Result)
-	Do $$$AssertEquals(Product.Basis.IdentNummer, "0.123.451.0")
+	Do $$$AssertEquals(..Product.Basis.IdentNummer, "0.123.451.0")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: IdentNummer begint met 6 =&gt; IsValid = False">
 <Implementation><![CDATA[
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
-	Set Product.Basis.IdentNummer = "6.123.451.0"
+	Set ..Product.Basis.IdentNummer = "6.123.451.0"
 	
-	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
-	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
-	
-	#dim SoprIteratorFilterStub As AX.Uitgaand.PM.impl.SoprIteratorFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
-	Do SoprIteratorFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$True)
-	
-	#dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
-	Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$False)
-	
-	#dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
-	
-	Set ..AxProductFactory = AxProductFactoryStub
-	Set ..SoprIteratorFilter = SoprIteratorFilterStub
-	Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub
-	Set ..ProductTypeApi = ProductTypeApiStub
-	
-	#dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory)
+	#dim AxProductValidator As AXimpl.common.AxProductValidator = ..GeefAxProductValidator()
 	#dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId)
 	
 	Do $$$AssertFalse(Result)
-	Do $$$AssertEquals(Product.Basis.IdentNummer, "6.123.451.0")
+	Do $$$AssertEquals(..Product.Basis.IdentNummer, "6.123.451.0")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: LinkType in S en is geen IsSpaceTowerProduct =&gt; IsValid = False">
 <Implementation><![CDATA[
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).MoederZonderStock()
+	Set ..Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).MoederZonderStock()
 	
-	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
-	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
-	
-	#dim SoprIteratorFilterStub As AX.Uitgaand.PM.impl.SoprIteratorFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
-	Do SoprIteratorFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$True)
-	
-	#dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
-	Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$False)
-	
-	#dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
-	
-	Set ..AxProductFactory = AxProductFactoryStub
-	Set ..SoprIteratorFilter = SoprIteratorFilterStub
-	Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub
-	Set ..ProductTypeApi = ProductTypeApiStub
-	
-	#dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory)
+	#dim AxProductValidator As AXimpl.common.AxProductValidator = ..GeefAxProductValidator()
 	#dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId)
 	
 	Do $$$AssertFalse(Result)
-	Do $$$AssertEquals(Product.Basis.IdentNummer, "0.123.451.0")
+	Do $$$AssertEquals(..Product.Basis.IdentNummer, "0.123.451.0")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: IsSpaceTowerProduct maar LinkType in niet S =&gt; IsValid = True">
 <Implementation><![CDATA[
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
-	
-	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
-	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
-	
-	#dim SoprIteratorFilterStub As AX.Uitgaand.PM.impl.SoprIteratorFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
-	Do SoprIteratorFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$True)
-	
-	#dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
-	Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$False)
-	
 	#dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
 	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", ..#ProductId).DanReturn($$$True)
 	Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
 	
-	Set ..AxProductFactory = AxProductFactoryStub
-	Set ..SoprIteratorFilter = SoprIteratorFilterStub
-	Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
-	#dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory)
+	#dim AxProductValidator As AXimpl.common.AxProductValidator = ..GeefAxProductValidator()
 	#dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId)
 	
 	Do $$$AssertTrue(Result)
-	Do $$$AssertEquals(Product.Basis.IdentNummer, "0.123.451.0")
+	Do $$$AssertEquals(..Product.Basis.IdentNummer, "0.123.451.0")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: LinkType in S en IsSpaceTowerProduct =&gt; IsValid = True">
 <Implementation><![CDATA[
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).MoederZonderStock()
+	Set ..Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).MoederZonderStock()
 	
-	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
-	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
-	
-	#dim SoprIteratorFilterStub As AX.Uitgaand.PM.impl.SoprIteratorFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
-	Do SoprIteratorFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$True)
-	
-	#dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
-	Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$False)
-	
 	#dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
 	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", ..#ProductId).DanReturn($$$True)
 	Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
 	
-	Set ..AxProductFactory = AxProductFactoryStub
-	Set ..SoprIteratorFilter = SoprIteratorFilterStub
-	Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
-	#dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory)
+	#dim AxProductValidator As AXimpl.common.AxProductValidator = ..GeefAxProductValidator()
 	#dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId)
 	
 	Do $$$AssertTrue(Result)
-	Do $$$AssertEquals(Product.Basis.IdentNummer, "0.123.451.0")
+	Do $$$AssertEquals(..Product.Basis.IdentNummer, "0.123.451.0")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: IsLadeVanSpaceTowerProduct =&gt; IsValid = False">
 <Implementation><![CDATA[
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
-	
-	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
-	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
-	
-	#dim SoprIteratorFilterStub As AX.Uitgaand.PM.impl.SoprIteratorFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
-	Do SoprIteratorFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$True)
-	
-	#dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
-	Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$False)
-	
 	#dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
 	Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
 	Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$True)
 	
-	Set ..AxProductFactory = AxProductFactoryStub
-	Set ..SoprIteratorFilter = SoprIteratorFilterStub
-	Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
-	#dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory)
+	#dim AxProductValidator As AXimpl.common.AxProductValidator = ..GeefAxProductValidator()
 	#dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId)
 	
 	Do $$$AssertFalse(Result)
-	Do $$$AssertEquals(Product.Basis.IdentNummer, "0.123.451.0")
+	Do $$$AssertEquals(..Product.Basis.IdentNummer, "0.123.451.0")
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAxProductValidator">
+<Private>1</Private>
+<ReturnType>AXimpl.common.AxProductValidator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory)
+]]></Implementation>
+</Method>
 </Class>