Index: vhTest/Utils/TECH/PubSub/EventSubscription/Tester.cls.xml
===================================================================
diff -u
--- vhTest/Utils/TECH/PubSub/EventSubscription/Tester.cls.xml	(revision 0)
+++ vhTest/Utils/TECH/PubSub/EventSubscription/Tester.cls.xml	(revision 2440)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.TECH.PubSub.EventSubscription.Tester">
+<Super>%RegisteredObject</Super>
+
+<Property name="EventType">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>EventType:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..EventType = EventType
+	Do ..ResetTeller()
+	Set Subscription = ##class(TECH.PubSub.EventSubscription).%New(..EventType,..%ClassName(1),"CatchMethod")
+	Do Subscription.%Save()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Deregistreer">
+<Implementation><![CDATA[
+	#dim EventType As %String = ..EventType
+	#dim RespondingClass As %String = ..%ClassName(1)
+	#dim RespondingMethod As %String = "CatchMethod"
+	&SQL(DELETE FROM TECH_PubSub.EventSubscription WHERE EventType = :EventType AND RespondingClass = :RespondingClass AND RespondingMethod = :RespondingMethod)
+]]></Implementation>
+</Method>
+
+<Method name="ResetTeller">
+<Implementation><![CDATA[
+	#dim Teller As TECH.FrequentieTabel = ..GeefTeller()
+	Do Teller.VerhoogMetAantal(..EventType,-Teller.GeefFrequentieVanItem(..EventType))
+]]></Implementation>
+</Method>
+
+<Method name="GeefAantalKeerGeraised">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	#dim Teller As TECH.FrequentieTabel = ..GeefTeller()
+	Quit Teller.GeefFrequentieVanItem(..EventType)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTeller">
+<ClassMethod>1</ClassMethod>
+<ReturnType>TECH.FrequentieTabel</ReturnType>
+<Implementation><![CDATA[
+	If ('$IsObject($Get(%EventTestTeller))) Set %EventTestTeller = ##class(TECH.FrequentieTabel).%New()
+	Quit %EventTestTeller
+]]></Implementation>
+</Method>
+
+<Method name="CatchMethod">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<Implementation><![CDATA[
+	#dim Teller As TECH.FrequentieTabel = ..GeefTeller()
+	Do Teller.Verhoog(Event.Type)
+]]></Implementation>
+</Method>
+
+<Method name="%OnClose">
+<Description><![CDATA[
+This callback method is invoked by the <METHOD>%Close</METHOD> method to 
+provide notification that the current object is being closed.
+
+<P>The return value of this method is ignored.]]></Description>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do ..Deregistreer()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/TECH/Persistent/OnAfterSave/TestWijziging.cls.xml
===================================================================
diff -u -r957 -r2440
--- vhUnitTest/TECH/Persistent/OnAfterSave/TestWijziging.cls.xml	(.../TestWijziging.cls.xml)	(revision 957)
+++ vhUnitTest/TECH/Persistent/OnAfterSave/TestWijziging.cls.xml	(.../TestWijziging.cls.xml)	(revision 2440)
@@ -24,7 +24,7 @@
 
 <Method name="TestZonderDataWijziging">
 <Implementation><![CDATA[
-	set EventTester = ##class(vhUnitTest.EventTester).%New("vhUnitTestTECHPersistentOnAfterSaveEvent")
+	set EventTester = ##class(vhTest.Utils.TECH.PubSub.EventSubscription.Tester).%New("vhUnitTestTECHPersistentOnAfterSaveEvent")
 	
 	set DummyData = ##class(vhUnitTest.TECH.Persistent.OnAfterSave.DummyTableMetOnAfterEvent).%OpenId(1)
 	do DummyData.Save()
@@ -35,7 +35,7 @@
 
 <Method name="TestMetDataWijziging">
 <Implementation><![CDATA[
-	set EventTester = ##class(vhUnitTest.EventTester).%New("vhUnitTestTECHPersistentOnAfterSaveEvent")
+	set EventTester = ##class(vhTest.Utils.TECH.PubSub.EventSubscription.Tester).%New("vhUnitTestTECHPersistentOnAfterSaveEvent")
 	
 	set DummyData = ##class(vhUnitTest.TECH.Persistent.OnAfterSave.DummyTableMetOnAfterEvent).%OpenId(1)
 	set DummyData.Dummy = "IK_TRIGGER_EEN_DATA_WIJZIGING"