Index: Tools/Mock/MethodCallStub.cls.xml
===================================================================
diff -u -r1300 -r1699
--- Tools/Mock/MethodCallStub.cls.xml	(.../MethodCallStub.cls.xml)	(revision 1300)
+++ Tools/Mock/MethodCallStub.cls.xml	(.../MethodCallStub.cls.xml)	(revision 1699)
@@ -77,26 +77,37 @@
 
 <Method name="DanReturn">
 <FormalSpec>ReturnWaarde:%String</FormalSpec>
+<ReturnType>Tools.Mock.MethodCallStub</ReturnType>
 <Implementation><![CDATA[
 	 Set ..HeeftReturnWaarde = 1
 	 Set ..ReturnWaarde = ReturnWaarde
+	 quit $this
 ]]></Implementation>
 </Method>
 
 <Method name="DanDoeNiks">
+<ReturnType>Tools.Mock.MethodCallStub</ReturnType>
+<Implementation><![CDATA[	quit $this
+]]></Implementation>
 </Method>
 
 <Method name="DanException">
 <FormalSpec>Exception:TECH.Exceptions.BaseException</FormalSpec>
-<Implementation><![CDATA[	set ..Exception = Exception
+<ReturnType>Tools.Mock.MethodCallStub</ReturnType>
+<Implementation><![CDATA[
+	set ..Exception = Exception
+	quit
 ]]></Implementation>
 </Method>
 
 <Method name="ExactAantalKeer">
 <Description>
 Verwacht dat deze method call AantalKeer wordt opgeroepen.</Description>
 <FormalSpec>AantalKeer:%Integer</FormalSpec>
-<Implementation><![CDATA[	Set ..VerwachtAantalKeerOpgeroepen = AantalKeer
+<ReturnType>Tools.Mock.MethodCallStub</ReturnType>
+<Implementation><![CDATA[
+	Set ..VerwachtAantalKeerOpgeroepen = AantalKeer
+	quit $this
 ]]></Implementation>
 </Method>