Index: vhUnitTest/Tools/Mock/TestDoubleCreator/UpdateTestDouble/Test.cls.xml
===================================================================
diff -u -r1267 -r1271
--- vhUnitTest/Tools/Mock/TestDoubleCreator/UpdateTestDouble/Test.cls.xml	(.../Test.cls.xml)	(revision 1267)
+++ vhUnitTest/Tools/Mock/TestDoubleCreator/UpdateTestDouble/Test.cls.xml	(.../Test.cls.xml)	(revision 1271)
@@ -34,13 +34,13 @@
 	Do ..FakeCreator.UpdateTestDouble(..#DummyClassName)
 	Do ..AssertCallOpenClass()
 	Do ..AssertCallHeeftKlasseNodig()
-	Do $$$AssertEquals(..FakeCreator.OpenOrCreateAantalOproepen,0)
-	Do $$$AssertEquals(..FakeCreator.CreateInstanceMethodAantalOproepen,0)
-	Do $$$AssertEquals(..FakeCreator.GetMethodBodyAantalOproepen,0)
-	Do $$$AssertEquals(..FakeCreator.GetDescriptionAantalOproepen,0)
-	Do $$$AssertEquals(..FakeCreator.GetSuperClassesAantalOproepen,0)
-	Do $$$AssertEquals(..FakeCreator.GetTestDoubleClassNameAantalOproepen,0)
-	Do $$$AssertEquals(..FakeCreator.SkipMethodAantalOproepen,0)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("OpenOrCreate"),0)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("CreateInstanceMethod"),0)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetMethodBody"),0)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetDescription"),0)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetSuperClasses"),0)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetTestDoubleClassName"),0)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("SkipMethod"),0)
 	Do ..AssertSvnHelperCalls(0)
 ]]></Implementation>
 </Method>
@@ -51,16 +51,15 @@
 	Do ..FakeCreator.SetSkipMethods($$$True)
 	
 	Do ..FakeCreator.UpdateTestDouble(..#DummyClassName)
-	
 	Do ..AssertCallOpenClass()
 	Do ..AssertCallHeeftKlasseNodig()
 	Do ..AssertCallGetTestDoubleClassName()
 	Do ..AssertCallOpenOrCreate()
-	Do $$$AssertEquals(..FakeCreator.GetDescriptionAantalOproepen,1)
-	Do $$$AssertEquals(..FakeCreator.CreateInstanceMethodAantalOproepen,1)
-	Do $$$AssertEquals(..FakeCreator.GetMethodBodyAantalOproepen,0)
-	Do $$$AssertEquals(..FakeCreator.GetSuperClassesAantalOproepen,1)
-	Do $$$AssertEquals(..FakeCreator.SkipMethodAantalOproepen,1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetDescription"),1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("CreateInstanceMethod"),1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetMethodBody"),0)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetSuperClasses"),1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("SkipMethod"),1)
 	Do $$$AssertTrue($IsObject(..FakeCreator.GeneratedClass))
 	Do ..AssertSvnHelperCalls(1)
 ]]></Implementation>
@@ -77,42 +76,42 @@
 	Do ..AssertCallHeeftKlasseNodig()
 	Do ..AssertCallGetTestDoubleClassName()
 	Do ..AssertCallOpenOrCreate()
-	Do $$$AssertEquals(..FakeCreator.GetDescriptionAantalOproepen,1)
-	Do $$$AssertEquals(..FakeCreator.CreateInstanceMethodAantalOproepen,1)
-	Do $$$AssertEquals(..FakeCreator.GetMethodBodyAantalOproepen,1)
-	Do $$$AssertEquals(..FakeCreator.GetSuperClassesAantalOproepen,1)
-	Do $$$AssertEquals(..FakeCreator.SkipMethodAantalOproepen,1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetDescription"),1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("CreateInstanceMethod"),1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetMethodBody"),1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetSuperClasses"),1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("SkipMethod"),1)
 	Do $$$AssertTrue($IsObject(..FakeCreator.GeneratedClass))
 	Do ..AssertSvnHelperCalls(1)
 ]]></Implementation>
 </Method>
 
 <Method name="AssertCallOpenClass">
 <Private>1</Private>
-<Implementation><![CDATA[	Do $$$AssertEquals(..FakeCreator.OpenClassAantalOproepen,1)
+<Implementation><![CDATA[	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("OpenClass"),1)
 ]]></Implementation>
 </Method>
 
 <Method name="AssertCallHeeftKlasseNodig">
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do $$$AssertEquals(..FakeCreator.HeeftKlasseNodigAantalOproepen,1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("HeeftKlasseNodig"),1)
 	DO $$$AssertObject(..FakeCreator.TestClass, ..FakeCreator.HeeftKlasseNodigParameterClass)
 ]]></Implementation>
 </Method>
 
 <Method name="AssertCallGetTestDoubleClassName">
 <Private>1</Private>
 <Implementation><![CDATA[
-    Do $$$AssertEquals(..FakeCreator.GetTestDoubleClassNameAantalOproepen,1)
+    Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("GetTestDoubleClassName"),1)
 	DO $$$AssertEquals(..FakeCreator.GetTestDoubleClassNameParameterClassName,..#DummyClassName)
 ]]></Implementation>
 </Method>
 
 <Method name="AssertCallOpenOrCreate">
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do $$$AssertEquals(..FakeCreator.OpenOrCreateAantalOproepen,1)
+	Do $$$AssertEquals(..FakeCreator.FakeHelper.GeefAantalKeerOpgeroepen("OpenOrCreate"),1)
 	Do $$$AssertEquals(..FakeCreator.OpenOrCreateParameterClassName,..#DummyClassName)
 	Do $$$AssertEquals(..FakeCreator.OpenOrCreateParameterTestDoubleClassName,"DummyFake"_..#DummyClassName)
 ]]></Implementation>
@@ -121,8 +120,8 @@
 <Method name="AssertSvnHelperCalls">
 <FormalSpec>VerwachtAantalKeerOpgeroepen:%Integer</FormalSpec>
 <Implementation><![CDATA[
-	Do $$$AssertEquals(..FakeSvnHelper.GeefAantalKeerOpgeroepen("CompileImportedSourceCode"),VerwachtAantalKeerOpgeroepen)
-	Do $$$AssertEquals(..FakeSvnHelper.GeefAantalKeerOpgeroepen("SVNExport"),VerwachtAantalKeerOpgeroepen)
+	Do $$$AssertEquals(..FakeSvnHelper.FakeHelper.GeefAantalKeerOpgeroepen("CompileImportedSourceCode"),VerwachtAantalKeerOpgeroepen)
+	Do $$$AssertEquals(..FakeSvnHelper.FakeHelper.GeefAantalKeerOpgeroepen("SVNExport"),VerwachtAantalKeerOpgeroepen)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/Tools/Mock/TestDoubleCreator/UpdateTestDouble/FakeCreator.cls.xml
===================================================================
diff -u -r1267 -r1271
--- vhUnitTest/Tools/Mock/TestDoubleCreator/UpdateTestDouble/FakeCreator.cls.xml	(.../FakeCreator.cls.xml)	(revision 1267)
+++ vhUnitTest/Tools/Mock/TestDoubleCreator/UpdateTestDouble/FakeCreator.cls.xml	(.../FakeCreator.cls.xml)	(revision 1271)
@@ -3,54 +3,18 @@
 <Class name="vhUnitTest.Tools.Mock.TestDoubleCreator.UpdateTestDouble.FakeCreator">
 <Super>Tools.Mock.TestDoubleCreator</Super>
 
-<Property name="CreateInstanceMethodAantalOproepen">
-<Type>%Integer</Type>
-<InitialExpression>0</InitialExpression>
+<Property name="FakeHelper">
+<Type>vhTest.Fake.Helper</Type>
 </Property>
 
-<Property name="GetMethodBodyAantalOproepen">
-<Type>%Integer</Type>
-<InitialExpression>0</InitialExpression>
-</Property>
-
-<Property name="GetDescriptionAantalOproepen">
-<Type>%Integer</Type>
-<InitialExpression>0</InitialExpression>
-</Property>
-
-<Property name="GetSuperClassesAantalOproepen">
-<Type>%Integer</Type>
-<InitialExpression>0</InitialExpression>
-</Property>
-
-<Property name="GetTestDoubleClassNameAantalOproepen">
-<Type>%Integer</Type>
-<InitialExpression>0</InitialExpression>
-</Property>
-
 <Property name="GetTestDoubleClassNameParameterClassName">
 <Type>%String</Type>
 </Property>
 
-<Property name="HeeftKlasseNodigAantalOproepen">
-<Type>%Integer</Type>
-<InitialExpression>0</InitialExpression>
-</Property>
-
 <Property name="HeeftKlasseNodigParameterClass">
 <Type>%Dictionary.ClassDefinition</Type>
 </Property>
 
-<Property name="SkipMethodAantalOproepen">
-<Type>%Integer</Type>
-<InitialExpression>0</InitialExpression>
-</Property>
-
-<Property name="OpenOrCreateAantalOproepen">
-<Type>%Integer</Type>
-<InitialExpression>0</InitialExpression>
-</Property>
-
 <Property name="OpenOrCreateParameterTestDoubleClassName">
 <Type>%String</Type>
 </Property>
@@ -59,11 +23,6 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="OpenClassAantalOproepen">
-<Type>%Integer</Type>
-<InitialExpression>0</InitialExpression>
-</Property>
-
 <Property name="HeeftKlasseNodig">
 <Type>%Boolean</Type>
 <Private>1</Private>
@@ -96,15 +55,15 @@
 
 <Method name="CreateInstanceMethod">
 <Private>1</Private>
-<Implementation><![CDATA[	Set ..CreateInstanceMethodAantalOproepen = ..CreateInstanceMethodAantalOproepen+1
+<Implementation><![CDATA[	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("CreateInstanceMethod")
 ]]></Implementation>
 </Method>
 
 <Method name="GetDescription">
 <Private>1</Private>
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	Set ..GetDescriptionAantalOproepen = ..GetDescriptionAantalOproepen+1
+	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("GetDescription")
 	Quit ""
 ]]></Implementation>
 </Method>
@@ -114,7 +73,8 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set ..GetMethodBodyAantalOproepen = ..GetMethodBodyAantalOproepen+1
+	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("GetMethodBody")
+	w !!!!, Method
 	Quit ""
 ]]></Implementation>
 </Method>
@@ -123,7 +83,7 @@
 <Private>1</Private>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	Set ..GetSuperClassesAantalOproepen = ..GetSuperClassesAantalOproepen+1
+	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("GetSuperClasses")
 	Quit ##class(%ListOfDataTypes).%New()
 ]]></Implementation>
 </Method>
@@ -134,7 +94,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set ..GetTestDoubleClassNameParameterClassName = ClassName
-	Set ..GetTestDoubleClassNameAantalOproepen = ..GetTestDoubleClassNameAantalOproepen+1
+	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("GetTestDoubleClassName")
 	Quit "DummyFake"_ClassName
 ]]></Implementation>
 </Method>
@@ -145,7 +105,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set ..HeeftKlasseNodigParameterClass = ClassDefinition
-	Set ..HeeftKlasseNodigAantalOproepen = ..HeeftKlasseNodigAantalOproepen+1
+	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("HeeftKlasseNodig")
 	Quit ..HeeftKlasseNodig
 ]]></Implementation>
 </Method>
@@ -155,7 +115,7 @@
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Set ..SkipMethodAantalOproepen = ..SkipMethodAantalOproepen+1
+	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("SkipMethod")
 	Quit ..SkipMethods
 ]]></Implementation>
 </Method>
@@ -167,7 +127,7 @@
 <Implementation><![CDATA[
 	Set ..OpenOrCreateParameterTestDoubleClassName = TestDoubleClassName
 	Set ..OpenOrCreateParameterClassName = ClassName
-	Set ..OpenOrCreateAantalOproepen = ..OpenOrCreateAantalOproepen+1
+	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("OpenOrCreate")
 	Set ..GeneratedClass = ..GetNewClassDefinition(TestDoubleClassName)
 	Quit ..GeneratedClass
 ]]></Implementation>
@@ -178,7 +138,7 @@
 <Private>1</Private>
 <ReturnType>%Dictionary.ClassDefinition</ReturnType>
 <Implementation><![CDATA[
-	set ..OpenClassAantalOproepen = ..OpenClassAantalOproepen+1
+	Do ..FakeHelper.IncrementeerAantalKeerOpgeroepen("OpenClass")
 	Set ..TestClass = ..GetNewClassDefinition(ClassName)
 	
 	set Method = ##class(%Dictionary.MethodDefinition).%New()
@@ -215,6 +175,19 @@
 <Implementation><![CDATA[	Quit $$$True
 ]]></Implementation>
 </Method>
+
+<Method name="%OnNew">
+<FormalSpec>svnHelper:svn.Helper</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do ##super(svnHelper)
+	Set ..FakeHelper = ##class(vhTest.Fake.Helper).%New()
+	quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/Tools/Mock/TestMock.cls.xml
===================================================================
diff -u -r957 -r1271
--- vhUnitTest/Tools/Mock/TestMock.cls.xml	(.../TestMock.cls.xml)	(revision 957)
+++ vhUnitTest/Tools/Mock/TestMock.cls.xml	(.../TestMock.cls.xml)	(revision 1271)
@@ -28,7 +28,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestGeenParametersGeenReturn">
+<Method name="aTestGeenParametersGeenReturn">
 <Implementation><![CDATA[
 		Do ..MockVoorbeeld.IndienMethodCall("GeenParametersGeenReturn")