Index: vhLib/Mail.mac.rou
===================================================================
diff -u -r408 -r871
--- vhLib/Mail.mac.rou	(.../Mail.mac.rou)	(revision 408)
+++ vhLib/Mail.mac.rou	(.../Mail.mac.rou)	(revision 871)
@@ -181,7 +181,7 @@
 GeefMailAdresFromRuntimeContext()
 	New RedirectTo
 	Set RedirectTo=##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen()
-	If $E(RedirectTo,1,3)="SYS" {
+	If ( $E(RedirectTo,1,3)="SYS" )  || ( RedirectTo = "SU" ) {
 		Set RedirectTo=""
 	}
 	;Set RedirectTo=$$GeefVolledigEmailAdres(RedirectTo)   ; Wordt sowieso aangepast door method MaakEmailAdressenAtVanhoeckeBe() 
Index: Tools/UnitTest.inc.rou
===================================================================
diff -u -r833 -r871
--- Tools/UnitTest.inc.rou	(.../UnitTest.inc.rou)	(revision 833)
+++ Tools/UnitTest.inc.rou	(.../UnitTest.inc.rou)	(revision 871)
@@ -14,6 +14,7 @@
 #define DummyDecimal				0.0
 #define DummyListOfDataTypes()		##class(%ListOfDataTypes).%New()
 #define DummyTimeStamp				##class(vhTest.Utils.FakeTECHDateTime).CurrentTimeStamp()
+#define DummyTime					##class(vhTest.Utils.FakeTECHDateTime).CurrentTime()
 #define DummyDate					##class(vhTest.Utils.FakeTECHDateTime).CurrentDate()
 #define DummyObject 				##class(TECH.RegisteredObject).%New()
 
Index: vhLib/Class.mac.rou
===================================================================
diff -u -r699 -r871
--- vhLib/Class.mac.rou	(.../Class.mac.rou)	(revision 699)
+++ vhLib/Class.mac.rou	(.../Class.mac.rou)	(revision 871)
@@ -32,28 +32,29 @@
  
  ; 
  ;----------------------------------------------------------------------------------------------------
-arrProperties(ClassName,arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly)
+arrProperties(ClassName,arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly,flagDeeperLevel)
  set flagRequired = $get(flagRequired , "A")
  set flagCalculated = $get(flagCalculated , "A" )
  set flagEmbeddedOnly = $get(flagEmbeddedOnly, 0 )
+ set flagDeeperLevel = $get(flagDeeperLevel, 1 )
  
  kill arrHULP($job)
  kill arrProperties
- 
- do BuildarrProperties(ClassName,.arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly)
+ do BuildarrProperties(ClassName,.arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly,flagDeeperLevel)
  quit
  
  // returns arr(Property) = $listbuild( items )  .. volgorde van items kan je vinden in vhLib.Class.inc
  ; ps : vraag mij niede wat er hier allemaal gebeurd , snap het ondertussen zelf al niet meer maar blijkbaar werkt het toch 
-BuildarrProperties(ClassName,arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly)         
+BuildarrProperties(ClassName,arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly,flagDeeperLevel)         
  new IdxProperty set IdxProperty = ""
  new objCompiledClass , Counter
  
- new PropertyName , PropertyType , flagCanSave , flagDeeperLevel
+ new PropertyName , PropertyType , flagCanSave
  
  set flagRequired = $get(flagRequired , "A")
  set flagCalculated = $get(flagCalculated , "A" )
  set flagEmbeddedOnly = $get(flagEmbeddedOnly, 0 )
+ set flagDeeperLevel = $get(flagDeeperLevel , 1)
  
  set arrHULP($job,"ClassName") = $get(arrHULP($job,"ClassName"))
          
@@ -71,11 +72,11 @@
             	set PropertyName = $select($length(arrHULP($job,"ClassName")):arrHULP($job,"ClassName")_".",1:"")_PropertyName
             	if flagCanSave set arrProperties(PropertyName) = $$BuildarrPropertiesListBuild(ClassName,PropertyName) 
         	}else { 
-	           set flagDeeperLevel = ( $$IsEmbedded(PropertyType) && '$length($$Collection(ClassName,PropertyName)))
+	           set:flagDeeperLevel'="F" flagDeeperLevel = ( $$IsEmbedded(PropertyType) && '$length($$Collection(ClassName,PropertyName)))
 	           if 'flagDeeperLevel set arrProperties(PropertyName) = $$BuildarrPropertiesListBuild(ClassName,PropertyName)
-    	       if flagDeeperLevel,'$$IsSwizzled(ClassName,PropertyName) { 
+    	       if ( (flagDeeperLevel ) || ( flagDeeperLevel = "F" ) ) ,'$$IsSwizzled(ClassName,PropertyName) { 
 	           	 	set arrHULP($job,"ClassName") = $select($length(arrHULP($job,"ClassName")):arrHULP($job,"ClassName")_".",1:"") _ PropertyName
-             		do BuildarrProperties(PropertyType,.arrProperties,flagRequired,flagCalculated) 
+             		do BuildarrProperties(PropertyType,.arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly,flagDeeperLevel) 
              	}
             }
          }