Index: vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml
===================================================================
diff -u -r3022 -r3023
--- vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 3022)
+++ vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 3023)
@@ -1,7 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhTest.Fake.TECH.PubSub.impl.PubSubAPI">
-<Super>TECH.RegisteredObject</Super>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.PubSub.PubSubAPI,Tools.Mock.MockClassBase</Super>
+
+<Property name="EventDispatcher">
+<Type>vhTest.Fake.TECH.PubSub.impl.EventDispatcher</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="MockInstance">
+<ClassMethod>1</ClassMethod>
+<ReturnType>vhTest.Fake.TECH.PubSub.impl.PubSubAPI</ReturnType>
+<Implementation><![CDATA[
+	Do ##class(TECH.Context).Instance().PushPubSubAPIClassName(##class(vhTest.Fake.TECH.PubSub.impl.PubSubAPI).%ClassName(1))
+	Quit ##class(TECH.Context).Instance().GeefPubSubAPI()
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..EventDispatcher = ##class(vhTest.Fake.TECH.PubSub.impl.EventDispatcher).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefEventRaiser">
+<ReturnType>TECH.PubSub.EventRaiser</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.PubSub.impl.SimpelEventRaiser).%New(..EventDispatcher)
+]]></Implementation>
+</Method>
+
+<Method name="RemoveSubscription">
+<FormalSpec>Classname:%String,Methodname:%String="StartVerwerking"</FormalSpec>
+<Implementation><![CDATA[	Do ..EventDispatcher.RemoveSubscription(Classname, Methodname)
+]]></Implementation>
+</Method>
+
+<Method name="ResetSubscriptions">
+<Implementation><![CDATA[	Do ..EventDispatcher.ResetSubscriptions()
+]]></Implementation>
+</Method>
 </Class>