Index: vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst
===================================================================
diff -u -r21bb14a0d27232f100eb539963ecb6f51821df7b -r21e16693d7682f32f952a6c888efc0a3658df11e
--- vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst	(.../RESERVOIRS.tst)	(revision 21bb14a0d27232f100eb539963ecb6f51821df7b)
+++ vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst	(.../RESERVOIRS.tst)	(revision 21e16693d7682f32f952a6c888efc0a3658df11e)
@@ -221,9 +221,10 @@
 TEST.NEW
 TEST.NAME:execReservoirs.002
 TEST.IMPORT_FAILURES:
-(E) @LINE: 229 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
-    >>> Unexpected end of command - stopped at character 55
-    >>> Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 229 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
+    >>>     >>> Unexpected end of command - stopped at character 55
+    >>>     >>> Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.STUB:Reservoirs.checkReservoirMaxVolume
 TEST.STUB:Reservoirs.calculateActiveReservoirCycleTime
@@ -625,14 +626,17 @@
 TEST.NEW
 TEST.NAME:handleReservoirMgmtFillState_DoneFilling
 TEST.IMPORT_FAILURES:
-(I) @LINE: 645
+(I) @LINE: 639
     >>> 'DG_GEN_IDLE_MODE_STATE_FLUSH_WATER' was specified as a macro, but it is in the symbol dictionary.
-(E) @LINE: 646 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:1.0
-    >>> Unexpected end of command - stopped at character 55
-    >>> Command Ignored
-(E) @LINE: 654 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.recirculationLevelPct:1.0
-    >>> Unexpected end of command - stopped at character 58
-    >>> Command Ignored
+(E) Errors from previous script import(s)
+    >>> (I) @LINE: 645
+    >>>     >>> 'DG_GEN_IDLE_MODE_STATE_FLUSH_WATER' was specified as a macro, but it is in the symbol dictionary.
+    >>> (E) @LINE: 646 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:1.0
+    >>>     >>> Unexpected end of command - stopped at character 55
+    >>>     >>> Command Ignored
+    >>> (E) @LINE: 654 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.recirculationLevelPct:1.0
+    >>>     >>> Unexpected end of command - stopped at character 58
+    >>>     >>> Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.STUB:Reservoirs.getReservoirRecirculationMaxPercent
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_GENE
@@ -650,9 +654,10 @@
 TEST.NEW
 TEST.NAME:handleReservoirMgmtFillState_RecircAlarm
 TEST.IMPORT_FAILURES:
-(E) @LINE: 668 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:1.0
-    >>> Unexpected end of command - stopped at character 55
-    >>> Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 668 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:1.0
+    >>>     >>> Unexpected end of command - stopped at character 55
+    >>>     >>> Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.STUB:Reservoirs.getReservoirRecirculationMaxPercent
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_GENE
@@ -671,12 +676,13 @@
 TEST.NEW
 TEST.NAME:handleReservoirMgmtFillState_StillFilling
 TEST.IMPORT_FAILURES:
-(E) @LINE: 687 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
-    >>> Unexpected end of command - stopped at character 55
-    >>> Command Ignored
-(E) @LINE: 694 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
-    >>> Unexpected end of command - stopped at character 58
-    >>> Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 687 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
+    >>>     >>> Unexpected end of command - stopped at character 55
+    >>>     >>> Command Ignored
+    >>> (E) @LINE: 694 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
+    >>>     >>> Unexpected end of command - stopped at character 58
+    >>>     >>> Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.STUB:Reservoirs.getReservoirRecirculationMaxPercent
 TEST.VALUE:Reservoirs.<<GLOBAL>>.dgOpMode:DG_MODE_FILL
@@ -1083,12 +1089,13 @@
 TEST.NEW
 TEST.NAME:initReservoirs.001
 TEST.IMPORT_FAILURES:
-(E) @LINE: 1173 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:1.0
-    >>> Unexpected end of command - stopped at character 55
-    >>> Command Ignored
-(E) @LINE: 1197 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
-    >>> Unexpected end of command - stopped at character 58
-    >>> Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 1173 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:1.0
+    >>>     >>> Unexpected end of command - stopped at character 55
+    >>>     >>> Command Ignored
+    >>> (E) @LINE: 1197 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
+    >>>     >>> Unexpected end of command - stopped at character 58
+    >>>     >>> Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.VALUE:Reservoirs.<<GLOBAL>>.reservoirsState:TREATMENT_RESERVOIR_MGMT_DRAIN_RESERVOIR_STATE
 TEST.VALUE:Reservoirs.<<GLOBAL>>.timeStartMS:1
@@ -1211,12 +1218,13 @@
 TEST.NEW
 TEST.NAME:publishReservoirData.001
 TEST.IMPORT_FAILURES:
-(E) @LINE: 1288 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
-    >>> Unexpected end of command - stopped at character 55
-    >>> Command Ignored
-(E) @LINE: 1301 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
-    >>> Unexpected end of command - stopped at character 58
-    >>> Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 1288 TEST.VALUE:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
+    >>>     >>> Unexpected end of command - stopped at character 55
+    >>>     >>> Command Ignored
+    >>> (E) @LINE: 1301 TEST.EXPECTED:Reservoirs.<<GLOBAL>>.recirculationLevelPct:0.0
+    >>>     >>> Unexpected end of command - stopped at character 58
+    >>>     >>> Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.VALUE:Reservoirs.<<GLOBAL>>.reservoirsState:TREATMENT_RESERVOIR_MGMT_START_STATE
 TEST.VALUE:Reservoirs.<<GLOBAL>>.timeDepleteMS:0