Index: vhUnitTest/Tools/ExportKlasseDto.cls.xml
===================================================================
diff -u -r957 -r2935
--- vhUnitTest/Tools/ExportKlasseDto.cls.xml	(.../ExportKlasseDto.cls.xml)	(revision 957)
+++ vhUnitTest/Tools/ExportKlasseDto.cls.xml	(.../ExportKlasseDto.cls.xml)	(revision 2935)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.Tools.ExportKlasseDto">
-<Super>%RegisteredObject</Super>
+<Super>TECH.DataTransferObject</Super>
 
 <Property name="StringProperty">
 <Type>%String</Type>
Index: vhUnitTest/Tools/Mock/MockClassBase/MethodCallOverride/Test.cls.xml
===================================================================
diff -u -r2928 -r2935
--- vhUnitTest/Tools/Mock/MockClassBase/MethodCallOverride/Test.cls.xml	(.../Test.cls.xml)	(revision 2928)
+++ vhUnitTest/Tools/Mock/MockClassBase/MethodCallOverride/Test.cls.xml	(.../Test.cls.xml)	(revision 2935)
@@ -43,10 +43,8 @@
 	Set TeMatchenProduct1.StringProperty = "String 1"
 	Set TeMatchenProduct2.StringProperty = "String 2"
 
-	Set Matcher1 = ##class(Tools.Mock.ArgumentMatchers.ObjectMatcher).%New(TeMatchenProduct1)
-	Set Matcher2 = ##class(Tools.Mock.ArgumentMatchers.ObjectMatcher).%New(TeMatchenProduct2)
-	Do ..Mock.IndienMethodCall("FunctieMetParameter",Matcher1).DanReturn("A")
-	Do ..Mock.IndienMethodCall("FunctieMetParameter",Matcher2).DanReturn("B")
+	Do ..Mock.IndienMethodCall("FunctieMetParameter",..Matches.DataTransferObject(TeMatchenProduct1)).DanReturn("A")
+	Do ..Mock.IndienMethodCall("FunctieMetParameter",..Matches.DataTransferObject(TeMatchenProduct2)).DanReturn("B")
 
 	Do $$$AssertEquals("A", ..Mock.FunctieMetParameter(TeMatchenProduct1))
 	Do $$$AssertEquals("B", ..Mock.FunctieMetParameter(TeMatchenProduct2))