Index: vectorcast/Hercules_RM46_HD_Project/environment/MODESTANDBY/MODESTANDBY.tst
===================================================================
diff -u -r438ee57ac301108f5eabb88c021e4a9bffb3f90e -rd0cad2f8d8ecfd8542a0862ba6e6b080ba2fa4a1
--- vectorcast/Hercules_RM46_HD_Project/environment/MODESTANDBY/MODESTANDBY.tst	(.../MODESTANDBY.tst)	(revision 438ee57ac301108f5eabb88c021e4a9bffb3f90e)
+++ vectorcast/Hercules_RM46_HD_Project/environment/MODESTANDBY/MODESTANDBY.tst	(.../MODESTANDBY.tst)	(revision d0cad2f8d8ecfd8542a0862ba6e6b080ba2fa4a1)
@@ -114,11 +114,15 @@
 TEST.NEW
 TEST.NAME:execStandbyMode.005
 TEST.IMPORT_FAILURES:
-(I) @LINE: 160
-    >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
 (I) @LINE: 164
     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
+(I) @LINE: 168
+    >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 160
+    >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 164
+    >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 154
     >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 158
@@ -174,11 +178,15 @@
 TEST.NEW
 TEST.NAME:execStandbyMode.006
 TEST.IMPORT_FAILURES:
-(I) @LINE: 216
+(I) @LINE: 224
     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 218
+(I) @LINE: 226
     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 216
+    >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 218
+    >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 206
     >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 208
@@ -254,11 +262,15 @@
 TEST.NEW
 TEST.NAME:execStandbyMode.008
 TEST.IMPORT_FAILURES:
-(I) @LINE: 292
+(I) @LINE: 304
     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 295
+(I) @LINE: 307
     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 292
+    >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 295
+    >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 278
     >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 281
@@ -313,11 +325,15 @@
 TEST.NEW
 TEST.NAME:execStandbyMode.009
 TEST.IMPORT_FAILURES:
-(I) @LINE: 347
+(I) @LINE: 363
     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 350
+(I) @LINE: 366
     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 347
+    >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 350
+    >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 329
     >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 332
@@ -423,11 +439,15 @@
 TEST.NEW
 TEST.NAME:execStandbyMode.012
 TEST.IMPORT_FAILURES:
-(I) @LINE: 453
+(I) @LINE: 473
     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 457
+(I) @LINE: 477
     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 453
+    >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 457
+    >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 431
     >>>     >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 435
@@ -3290,7 +3310,7 @@
 TEST.SUBPROGRAM:isDGDisinfectValid
 TEST.NEW
 TEST.NAME:isDGDisinfectValid.004
-TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastHeatDisCompleteDateEpoch:<<MAX>>
+TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastHeatDisCompleteDateEpoch:4000
 TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].isDGUsageInfoAvailable:1
 TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0
 TEST.END
@@ -3398,6 +3418,7 @@
 TEST.NEW
 TEST.NAME:isDGDisinfectValid_all_true
 TEST.VALUE:ModeStandby.isDGDisinfectValid.return:0
+TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastChemDisStartDateEpoch:200
 TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastChemDisCompleteDateEpoch:200
 TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastChemDisFlushCompleteDateEpoch:220
 TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastHeatDisCompleteDateEpoch:150
@@ -3459,6 +3480,40 @@
 TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0
 TEST.END
 
+-- Test Case: isDGDisinfectValid_flush_time_expired
+TEST.UNIT:ModeStandby
+TEST.SUBPROGRAM:isDGDisinfectValid
+TEST.NEW
+TEST.NAME:isDGDisinfectValid_flush_time_expired
+TEST.VALUE:ModeStandby.isDGDisinfectValid.return:1
+TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastChemDisStartDateEpoch:100
+TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastChemDisCompleteDateEpoch:200
+TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastChemDisFlushCompleteDateEpoch:220
+TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastHeatDisCompleteDateEpoch:150
+TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].isDGUsageInfoAvailable:1
+TEST.VALUE:uut_prototype_stubs.getRTCTimestamp.return:8000
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[0]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[1]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[2]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[3]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[4]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[5]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[6]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[7]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[8]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[9]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[10]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[11]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[12]:150
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[13]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[14]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[15]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[16]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[17]:0
+TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferLength:18
+TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0
+TEST.END
+
 -- Subprogram: setRequestedCleaningMode
 
 -- Test Case: setRequestedCleaningMode.001