Index: vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml
===================================================================
diff -u -r45935 -r45941
--- vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 45935)
+++ vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 45941)
@@ -81,46 +81,48 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ZetKorttekst zet de korttekst">
+<Method name="Test: Save persisteert het product">
 <Implementation><![CDATA[
-	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId)
+	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
 	
-	Do $$$AssertEquals(Product.GeefKorttekst(),"")
-	Do Product.ZetKorttekst("Korttekst")
-	Do $$$AssertEquals(Product.GeefKorttekst(),"Korttekst")
-	Do Product.ZetKorttekst("Korttekst2")
-	Do $$$AssertEquals(Product.GeefKorttekst(),"Korttekst2")
+	Do DataMProductMock.VerwachtMethodCall("Save").DanDoeNiks()
+	
+	Do Product.Save()
+	
+	Do DataMProductMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ZetIdentNr zet het identnummer">
+<Method name="Test: ZetKorttekst zet de korttekst">
 <Implementation><![CDATA[
-	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId)
+	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
 	
-	Do $$$AssertEquals(Product.GeefIdentNr(),"")
-	Do Product.ZetIdentNr("IdentNummer")
-	Do $$$AssertEquals(Product.GeefIdentNr(),"IdentNummer")
-	Do Product.ZetIdentNr("IdentNummer2")
-	Do $$$AssertEquals(Product.GeefIdentNr(),"IdentNummer2")
+	Do DataMProductMock.VerwachtMethodCall("ZetKorttekst","Korttekst").DanDoeNiks()
+	
+	Do Product.ZetKorttekst("Korttekst")
+	
+	Do DataMProductMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Save persisteert het product">
+<Method name="Test: ZetIdentNr zet het IdentNummer">
 <Implementation><![CDATA[
-	set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
 	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
 	
-	Do DataMProductMock.VerwachtMethodCall("Save").DanDoeNiks()
+	Do DataMProductMock.VerwachtMethodCall("ZetIdentNr","IdentNummer").DanDoeNiks()
 	
-	Do Product.Save()
+	Do Product.ZetIdentNr("IdentNummer")
 	
 	Do DataMProductMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: ZetLeverancierId zet het LeverancierId">
 <Implementation><![CDATA[
-	set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
 	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
 	
 	Do DataMProductMock.VerwachtMethodCall("ZetLeverancierId","LeverancierId").DanDoeNiks()
@@ -133,7 +135,7 @@
 
 <Method name="Test: ZetHoofdGroep zet de HoofdGroep">
 <Implementation><![CDATA[
-	set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
 	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
 	
 	Do DataMProductMock.VerwachtMethodCall("ZetHoofdGroep","HoofdGroep").DanDoeNiks()
@@ -146,7 +148,7 @@
 
 <Method name="Test: ZetGroep zet de Groep">
 <Implementation><![CDATA[
-	set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
 	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
 	
 	Do DataMProductMock.VerwachtMethodCall("ZetGroep","Groep").DanDoeNiks()
@@ -159,7 +161,7 @@
 
 <Method name="Test: ZetSubGroep zet de SubGroep">
 <Implementation><![CDATA[
-	set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
+	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
 	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
 	
 	Do DataMProductMock.VerwachtMethodCall("ZetSubGroep","SubGroep").DanDoeNiks()
Index: vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml
===================================================================
diff -u -r45935 -r45941
--- vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 45935)
+++ vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 45941)
@@ -39,6 +39,7 @@
 <Implementation><![CDATA[
 	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New(..#ProductId)
 	
+	Do Product.ZetIdentNr("IdentNummer")
 	Do Product.ZetKorttekst("Korttekst")
 	Do Product.ZetLeverancierId("L||LeverancierId")
 	Do Product.ZetHoofdGroep("HoofdGroep")	
@@ -50,6 +51,7 @@
 	Do $$$AssertEquals(Product.GeefHoofdGroep(),"HoofdGroep")
 	Do $$$AssertEquals(Product.GeefLeverancierID(),"L||LeverancierId")
 	Do $$$AssertEquals(Product.GeefKorttekst(),"Korttekst")
+	Do $$$AssertEquals(Product.GeefIdentNr(),"IdentNummer")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Save/TestVereisteVelden.cls.xml
===================================================================
diff -u -r45935 -r45941
--- vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Save/TestVereisteVelden.cls.xml	(.../TestVereisteVelden.cls.xml)	(revision 45935)
+++ vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Save/TestVereisteVelden.cls.xml	(.../TestVereisteVelden.cls.xml)	(revision 45941)
@@ -8,6 +8,17 @@
 <Default>1000</Default>
 </Parameter>
 
+<Method name="Test: Het IdentNr is vereist om een product te kunnen saven">
+<Implementation><![CDATA[
+	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New(..#ProductId)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("IdentNr is vereist.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+	
+	Do Product.Save()
+]]></Implementation>
+</Method>
+
 <Method name="Test: De Korttekst is vereist om een product te kunnen saven">
 <Implementation><![CDATA[
 	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New(..#ProductId)
Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45935 -r45941
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45935)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45941)
@@ -704,6 +704,7 @@
 <Implementation><![CDATA[
 	Set Messages = ##class(%ListOfDataTypes).%New()
 	
+	Do:'$Length(..GeefKorttekst()) Messages.Insert("IdentNr is vereist.")
 	Do:'$Length(..GeefKorttekst()) Messages.Insert("Korttekst is vereist.")
 	Do:'$Length(..GeefLeverancierID()) Messages.Insert("LeverancierId is vereist.")
 	Do:'$Length(..GeefHoofdGroep()) Messages.Insert("Hoofdgroep is vereist.")