Index: TECH/Persistentie/GlobalPersistenceMgr.cls.xml
===================================================================
diff -u -r1956 -r2317
--- TECH/Persistentie/GlobalPersistenceMgr.cls.xml	(.../GlobalPersistenceMgr.cls.xml)	(revision 1956)
+++ TECH/Persistentie/GlobalPersistenceMgr.cls.xml	(.../GlobalPersistenceMgr.cls.xml)	(revision 2317)
@@ -16,7 +16,7 @@
 <ClassType/>
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="OpenNodes">
 <Type>TECH.Persistentie.GlobalNode</Type>
@@ -25,7 +25,7 @@
 </Property>
 
 <Property name="%GlobalPersistenceMgrInstance">
-<Type>GlobalPersistenceMgr</Type>
+<Type>TECH.Persistentie.GlobalPersistenceMgr</Type>
 <Private>1</Private>
 </Property>
 
@@ -46,6 +46,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetInstance">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>GlobalPersistenceMgrInstance:TECH.Persistentie.GlobalPersistenceMgr</FormalSpec>
+<Implementation><![CDATA[	Set %GlobalPersistenceMgrInstance = GlobalPersistenceMgrInstance
+]]></Implementation>
+</Method>
+
 <UDLText name="T">
 <Content><![CDATA[/* Op te roepen door OperatieScope, opdat binnen die scope meerdere objecten dezelfde in-memory versie gebruiken. */
 ]]></Content>
@@ -75,7 +82,7 @@
 
 <Method name="GeefNodeViaSubscriptLijst">
 <FormalSpec>GlobalNaam:%String,Subscripts:%ListOfDataTypes</FormalSpec>
-<ReturnType>GlobalNode</ReturnType>
+<ReturnType>TECH.Persistentie.GlobalNode</ReturnType>
 <Implementation><![CDATA[
 	#Dim NodeKey As %String = ##class(GlobalUtils).MaakNodeKey(GlobalNaam, Subscripts)
 	
@@ -97,7 +104,7 @@
 
 <Method name="GeefNode">
 <FormalSpec>GlobalNaam:%String,Subscript1:%String,Subscript2:%String,Subscript3:%String,Subscript4:%String,Subscript5:%String,Subscript6:%String</FormalSpec>
-<ReturnType>GlobalNode</ReturnType>
+<ReturnType>TECH.Persistentie.GlobalNode</ReturnType>
 <Implementation><![CDATA[
 	Set Subscripts = ##class(%ListOfDataTypes).%New()