Index: vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/Base.cls.xml
===================================================================
diff -u -r42453 -r42475
--- vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/Base.cls.xml	(.../Base.cls.xml)	(revision 42453)
+++ vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/Base.cls.xml	(.../Base.cls.xml)	(revision 42475)
@@ -41,10 +41,6 @@
 	set Query = "Delete APPS_VKP_impl.Offerte where DocumentReferenties->OrderReferentie = ?"
 	do ExecDynQuery^vhLib.Query(Query,$LB("UnitTestOrderReferentie"))
 	
-	Set ..PubSubAPI = ##class(vhTest.Fake.TECH.PubSub.impl.PubSubAPI).MockInstance()
-	Do ..PubSubAPI.RemoveSubscription("APPS.VKP.Offerte.impl.BesteldeOfferteVerwerkingEventHandler")
-	Do ..PubSubAPI.RemoveSubscription("APPS.VKP.Order.impl.OrderIngaveService.MaakOrderVanOfferte.ProductMaker")
-	
 	set ..KlantID = ..GeefKlantID()
 ]]></Implementation>
 </Method>
@@ -62,7 +58,9 @@
 </Method>
 
 <Method name="OnAfterAllTests">
-<Implementation><![CDATA[	Do ..PubSubAPI.ResetSubscriptions()
+<Implementation><![CDATA[
+	Do ..PubSubAPI.ResetSubscriptions()
+	Do ##super()
 ]]></Implementation>
 </Method>
 
@@ -171,6 +169,10 @@
 	Do ECommerceAPIStub.IndienMethodCall("GeefExterneVerkoopService").DanReturn(ExterneVerkoopServiceStub)
 
 	Do ..SetupMockKlantInstellingService(ECommerceAPIStub)
+	
+	Set ..PubSubAPI = ##class(vhTest.Fake.TECH.PubSub.impl.PubSubAPI).MockInstance()
+	Do ..PubSubAPI.RemoveSubscription("APPS.VKP.Offerte.impl.BesteldeOfferteVerwerkingEventHandler")
+	Do ..PubSubAPI.RemoveSubscription("APPS.VKP.Order.impl.OrderIngaveService.MaakOrderVanOfferte.ProductMaker")
 ]]></Implementation>
 </Method>