Index: vhUnitTest/APPS/PM/TestKenmMWFPlugin.cls.xml
===================================================================
diff -u -r29059 -r40165
--- vhUnitTest/APPS/PM/TestKenmMWFPlugin.cls.xml	(.../TestKenmMWFPlugin.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/TestKenmMWFPlugin.cls.xml	(.../TestKenmMWFPlugin.cls.xml)	(revision 40165)
@@ -17,6 +17,46 @@
 <Default>UTKenmerkGroep</Default>
 </Parameter>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Do ..OnAfterAllTests()
+	
+	Set ModifiedSubscription = ##class(TECH.PubSub.EventSubscription).%New("KenmerkenModifiedEvent","vhUnitTest.APPS.PM.KenmMWFPluginMock","KenmerkenModEventListener")
+	Do ModifiedSubscription.%Save()
+	Set ModifiedSubscription = ##class(TECH.PubSub.EventSubscription).%New("KenmerkModifiedEvent","vhUnitTest.APPS.PM.KenmMWFPluginMock","KenmerkModEventListener")
+	Do ModifiedSubscription.%Save()
+	
+	Set MetaGroep = ##class(Prod.Kenmerk.MetaGroep).%New()
+	Set MetaGroep.Code = "UTKenmerkGroep"
+	Set MetaGroep.GeneratieTypeIsRelevant = 0
+	Set MetaGroep.MultipleKenmerkenSetsToegelaten = 0
+	Set MetaGroep.IsAanwezigInViewerEditor = 0
+	
+	Set MetaDefinitie = ##class(Prod.Kenmerk.MetaDefinitie).%New()
+	Set MetaDefinitie.Kenmerk = "Kenmerk1"
+	Do MetaGroep.MetaDefinities.Insert(MetaDefinitie)
+	
+	Set MetaDefinitie = ##class(Prod.Kenmerk.MetaDefinitie).%New()
+	Set MetaDefinitie.Kenmerk = "Kenmerk2"
+	Do MetaGroep.MetaDefinities.Insert(MetaDefinitie)
+	
+	Set MetaDefinitie = ##class(Prod.Kenmerk.MetaDefinitie).%New()
+	Set MetaDefinitie.Kenmerk = "Kenmerk3"
+	Do MetaGroep.MetaDefinities.Insert(MetaDefinitie)
+	
+ 	Quit MetaGroep.%Save()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ##class(Prod.Kenmerk.MetaGroep).%DeleteId("UTKenmerkGroep")
+	&SQL(DELETE FROM TECH_PubSub.EventSubscription WHERE RespondingClass = 'vhUnitTest.APPS.PM.KenmMWFPluginMock')
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestPlugin">
 <Implementation><![CDATA[
 	/*
@@ -306,47 +346,6 @@
 	Do Halffab2.Delete()
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ..OnAfterAllTests()
-	
-	Set ModifiedSubscription = ##class(TECH.PubSub.EventSubscription).%New("KenmerkenModifiedEvent","vhUnitTest.APPS.PM.KenmMWFPluginMock","KenmerkenModEventListener")
-	Do ModifiedSubscription.%Save()
-	Set ModifiedSubscription = ##class(TECH.PubSub.EventSubscription).%New("KenmerkModifiedEvent","vhUnitTest.APPS.PM.KenmMWFPluginMock","KenmerkModEventListener")
-	Do ModifiedSubscription.%Save()
-	
-	Set MetaGroep = ##class(Prod.Kenmerk.MetaGroep).%New()
-	Set MetaGroep.Code = "UTKenmerkGroep"
-	Set MetaGroep.GeneratieTypeIsRelevant = 0
-	Set MetaGroep.MultipleKenmerkenSetsToegelaten = 0
-	Set MetaGroep.IsAanwezigInViewerEditor = 0
-	
-	Set MetaDefinitie = ##class(Prod.Kenmerk.MetaDefinitie).%New()
-	Set MetaDefinitie.Kenmerk = "Kenmerk1"
-	Do MetaGroep.MetaDefinities.Insert(MetaDefinitie)
-	
-	Set MetaDefinitie = ##class(Prod.Kenmerk.MetaDefinitie).%New()
-	Set MetaDefinitie.Kenmerk = "Kenmerk2"
-	Do MetaGroep.MetaDefinities.Insert(MetaDefinitie)
-	
-	Set MetaDefinitie = ##class(Prod.Kenmerk.MetaDefinitie).%New()
-	Set MetaDefinitie.Kenmerk = "Kenmerk3"
-	Do MetaGroep.MetaDefinities.Insert(MetaDefinitie)
-	
- 	Quit MetaGroep.%Save()
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ##class(Prod.Kenmerk.MetaGroep).%DeleteId("UTKenmerkGroep")
-	&SQL(DELETE FROM TECH_PubSub.EventSubscription WHERE RespondingClass = 'vhUnitTest.APPS.PM.KenmMWFPluginMock')
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>