Index: vhUnitTest/APPS/PM/Kenmerk/TestProductKenmerken.cls.xml
===================================================================
diff -u -r29059 -r40170
--- vhUnitTest/APPS/PM/Kenmerk/TestProductKenmerken.cls.xml	(.../TestProductKenmerken.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/Kenmerk/TestProductKenmerken.cls.xml	(.../TestProductKenmerken.cls.xml)	(revision 40170)
@@ -6,17 +6,37 @@
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do ##super()
 	Do ..OnAfterAllTests()
 	
 	Set RepositoryManager = ##class(APPS.PM.Kenmerk.RepositoryManager).%New()
 	Set Repository = ##class(UnitTestRepository).%New()
 	Do RepositoryManager.RegistreerRepository(Repository)
 	Set Repository = ##class(UnitTestRepository2).%New()
 	Do RepositoryManager.RegistreerRepository(Repository)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Set RepositoryManager = ##class(APPS.PM.Kenmerk.RepositoryManager).%New()
 	
- 	Quit $$$OK
+	Set Repository = ##class(UnitTestRepository).%New()
+	If (RepositoryManager.HeeftRepository(Repository.GeefKenmerkGroep()))
+	{
+		Do RepositoryManager.GeefRepository(Repository.GeefKenmerkGroep()).Delete()
+		Do RepositoryManager.VerwijderRepository(Repository.GeefKenmerkGroep())
+	}
+	
+	Set Repository = ##class(UnitTestRepository2).%New()
+	If (RepositoryManager.HeeftRepository(Repository.GeefKenmerkGroep()))
+	{
+		Do RepositoryManager.GeefRepository(Repository.GeefKenmerkGroep()).Delete()
+		Do RepositoryManager.VerwijderRepository(Repository.GeefKenmerkGroep())
+	}
+	
+	Do ##super()
 ]]></Implementation>
 </Method>
 
@@ -100,29 +120,6 @@
 	Do $$$AssertEquals(ProductenKenmerken.Kenmerken.GetAt(1).PRNr,1001)
 ]]></Implementation>
 </Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set RepositoryManager = ##class(APPS.PM.Kenmerk.RepositoryManager).%New()
-	
-	Set Repository = ##class(UnitTestRepository).%New()
-	If (RepositoryManager.HeeftRepository(Repository.GeefKenmerkGroep()))
-	{
-		Do RepositoryManager.GeefRepository(Repository.GeefKenmerkGroep()).Delete()
-		Do RepositoryManager.VerwijderRepository(Repository.GeefKenmerkGroep())
-	}
-	
-	Set Repository = ##class(UnitTestRepository2).%New()
-	If (RepositoryManager.HeeftRepository(Repository.GeefKenmerkGroep()))
-	{
-		Do RepositoryManager.GeefRepository(Repository.GeefKenmerkGroep()).Delete()
-		Do RepositoryManager.VerwijderRepository(Repository.GeefKenmerkGroep())
-	}
-	
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>