Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.env
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.env	(.../INT_RTC.env)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.env	(.../INT_RTC.env)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -6,6 +6,7 @@
 ENVIRO.STUB_BY_FUNCTION:ModePostTreat
 ENVIRO.STUB_BY_FUNCTION:ModeStandby
 ENVIRO.STUB_BY_FUNCTION:ModeTreatment
+ENVIRO.STUB_BY_FUNCTION:NVDataMgmt
 ENVIRO.STUB_BY_FUNCTION:OperationModes
 ENVIRO.UUT:RTC
 ENVIRO.STUB_BY_FUNCTION:SystemComm
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.mfg
===================================================================
diff -u -rd40825a3f9a6e9a246f79233c6734d935711fcbf -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.mfg	(.../INT_RTC.mfg)	(revision d40825a3f9a6e9a246f79233c6734d935711fcbf)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.mfg	(.../INT_RTC.mfg)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manage-config-options version="7">
   <config/>
+  <search-directory type="TESTABLE_SOURCE_DIR">$(VCAST_SRC_DIR)/../../fwcommon/FlashDrvr/</search-directory>
 </manage-config-options>
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.tst
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.tst	(.../INT_RTC.tst)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.tst	(.../INT_RTC.tst)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -2,7 +2,7 @@
 -- Test Case Script
 -- 
 -- Environment    : INT_RTC
--- Unit(s) Under Test: FPGA MessageSupport ModeInitPOST ModePostTreat ModeStandby ModeTreatment OperationModes RTC SystemComm SystemCommMessages TaskGeneral Timers Utilities mibspi sys_main
+-- Unit(s) Under Test: FPGA MessageSupport ModeInitPOST ModePostTreat ModeStandby ModeTreatment NVDataMgmt OperationModes RTC SystemComm SystemCommMessages TaskGeneral Timers Utilities mibspi sys_main
 -- 
 -- Script Features
 TEST.SCRIPT_FEATURE:C_DIRECT_ARRAY_INDEXING
@@ -64,6 +64,62 @@
 TEST.EXPECTED:ModePostTreat.<<GLOBAL>>.treatmentLogData.treatmentStartDateAndTime:1
 TEST.END
 
+-- Unit: NVDataMgmt
+
+-- Subprogram: areResourcesAvailableForNextJob
+
+-- Test Case: areResourcesAvailableForNextJob.001
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:areResourcesAvailableForNextJob
+TEST.NEW
+TEST.NAME:areResourcesAvailableForNextJob.001
+TEST.STUB:Utilities.getSemaphore
+TEST.STUB:SystemComm.uiCommunicated
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.recordJobQueue[0].memoryLocation:NVDATAMGMT_RTC
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.recordJobQueue[1].memoryLocation:NVDATAMGMT_RTC
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.recordQueueFrontIndex:0
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.recordQueueCount:5
+TEST.VALUE:Utilities.getSemaphore.return:TRUE
+TEST.VALUE:SystemComm.uiCommunicated.return:TRUE
+TEST.EXPECTED:NVDataMgmt.areResourcesAvailableForNextJob.return:TRUE
+TEST.END
+
+-- Subprogram: handleExecVerifyRTCWriteState
+
+-- Test Case: handleExecVerifyRTCWriteState.001
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecVerifyRTCWriteState
+TEST.NEW
+TEST.NAME:handleExecVerifyRTCWriteState.001
+TEST.STUB:NVDataMgmt.didCommandTimeout
+TEST.VALUE:NVDataMgmt.didCommandTimeout.state:NVDATAMGMT_EXEC_STATE_VERIFY_RTC_WRITE
+TEST.VALUE:NVDataMgmt.didCommandTimeout.return:TRUE
+TEST.VALUE:RTC.<<GLOBAL>>.RTCRAMStatus:RTC_RAM_STATUS_COMPLETE
+TEST.EXPECTED:NVDataMgmt.handleExecVerifyRTCWriteState.return:NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC
+TEST.END
+
+-- Subprogram: handleExecWriteToRAMState
+
+-- Test Case: handleExecWriteToRAMState.001
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecWriteToRAMState
+TEST.NEW
+TEST.NAME:handleExecWriteToRAMState.001
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.writtenRecordStatus:NVDATAMGMT_RECORD_NOT_VALID
+TEST.VALUE:RTC.<<GLOBAL>>.RTCRAMStatus:RTC_RAM_STATUS_COMPLETE
+TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.writtenRecordStatus:NVDATAMGMT_RECORD_NOT_CHECKED
+TEST.END
+
+-- Test Case: handleExecWriteToRAMState.002
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecWriteToRAMState
+TEST.NEW
+TEST.NAME:handleExecWriteToRAMState.002
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.writtenRecordStatus:NVDATAMGMT_RECORD_NOT_CHECKED
+TEST.VALUE:RTC.<<GLOBAL>>.RTCRAMStatus:RTC_RAM_STATUS_COMPLETE
+TEST.EXPECTED:NVDataMgmt.handleExecWriteToRAMState.return:NVDATAMGMT_EXEC_STATE_VERIFY_RTC_WRITE
+TEST.END
+
 -- Unit: SystemCommMessages
 
 -- Subprogram: handleHDRTCControlReg1StatusOverrideRequest
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC_cba.cvr
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC_cba.cvr	(.../INT_RTC_cba.cvr)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC_cba.cvr	(.../INT_RTC_cba.cvr)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -45,7 +45,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:11
-IMPORT.SOURCE.ORIG_FILENAME:RTC.c
+IMPORT.SOURCE.ORIG_FILENAME:NVDataMgmt.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -67,7 +67,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:12
-IMPORT.SOURCE.ORIG_FILENAME:Timers.c
+IMPORT.SOURCE.ORIG_FILENAME:RTC.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -89,7 +89,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:13
-IMPORT.SOURCE.ORIG_FILENAME:Utilities.c
+IMPORT.SOURCE.ORIG_FILENAME:Timers.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -111,7 +111,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:14
-IMPORT.SOURCE.ORIG_FILENAME:ModeInitPOST.c
+IMPORT.SOURCE.ORIG_FILENAME:Utilities.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -133,7 +133,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:15
-IMPORT.SOURCE.ORIG_FILENAME:ModePostTreat.c
+IMPORT.SOURCE.ORIG_FILENAME:ModeInitPOST.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -155,7 +155,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:16
-IMPORT.SOURCE.ORIG_FILENAME:ModeStandby.c
+IMPORT.SOURCE.ORIG_FILENAME:ModePostTreat.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -177,7 +177,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:17
-IMPORT.SOURCE.ORIG_FILENAME:ModeTreatment.c
+IMPORT.SOURCE.ORIG_FILENAME:ModeStandby.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -199,7 +199,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:18
-IMPORT.SOURCE.ORIG_FILENAME:OperationModes.c
+IMPORT.SOURCE.ORIG_FILENAME:ModeTreatment.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -221,7 +221,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:19
-IMPORT.SOURCE.ORIG_FILENAME:FPGA.c
+IMPORT.SOURCE.ORIG_FILENAME:OperationModes.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -243,7 +243,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:20
-IMPORT.SOURCE.ORIG_FILENAME:SystemComm.c
+IMPORT.SOURCE.ORIG_FILENAME:FPGA.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -265,7 +265,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:21
-IMPORT.SOURCE.ORIG_FILENAME:SystemCommMessages.c
+IMPORT.SOURCE.ORIG_FILENAME:SystemComm.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -287,7 +287,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:22
-IMPORT.SOURCE.ORIG_FILENAME:TaskGeneral.c
+IMPORT.SOURCE.ORIG_FILENAME:SystemCommMessages.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -309,7 +309,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:23
-IMPORT.SOURCE.ORIG_FILENAME:mibspi.c
+IMPORT.SOURCE.ORIG_FILENAME:TaskGeneral.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -331,6 +331,28 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:24
+IMPORT.SOURCE.ORIG_FILENAME:mibspi.c
+IMPORT.SOURCE.COVERAGE_STATUS:TRUE
+IMPORT.SOURCE.COVERAGE_TYPE:Function
+IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
+IMPORT.SOURCE.HAS_EMPTY_STATEMENTS:FALSE
+IMPORT.SOURCE.COVER_CATCH_AS_BRANCH:TRUE
+IMPORT.SOURCE.HAS_CATCH_STATEMENTS:FALSE
+IMPORT.SOURCE.EDG_COVERAGE:TRUE
+IMPORT.SOURCE.COVER_FUNCTION_PARAMETERS:FALSE
+IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:FALSE
+IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.HAS_NESTED_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.COVER_STATEMENTS_BY_BLOCK:FALSE
+IMPORT.SOURCE.COVERAGE_FOR_DECLARATIONS:INSTRUMENT_VARIABLE_DECLARATIONS_INITIALIZATIONS
+IMPORT.SOURCE.HAS_CONSTANT_BRANCH:FALSE
+IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE
+IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
+IMPORT.SOURCE.END
+IMPORT.SOURCE.BEGIN
+IMPORT.SOURCE.UNIT:25
 IMPORT.SOURCE.ORIG_FILENAME:sys_main.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
@@ -415,7 +437,7 @@
 
 
 RESULT.CBA.NOTES_END
-RESULT.CBA.UNIT: /home/asif/work/update_23rd/workspace_hd/fwcommon/RTC.c
+RESULT.CBA.UNIT: /home/fw/wshd/fwcommon/RTC.c
 RESULT.CBA.FUNCTION: convertBCD2Decimal
 RESULT.CBA.LINE.BEGIN
 RESULT.CBA.LINE: 0
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SAFETYSHUTDOWN/INT_SAFETYSHUTDOWN.env
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SAFETYSHUTDOWN/INT_SAFETYSHUTDOWN.env	(.../INT_SAFETYSHUTDOWN.env)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SAFETYSHUTDOWN/INT_SAFETYSHUTDOWN.env	(.../INT_SAFETYSHUTDOWN.env)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -1,7 +1,9 @@
 ENVIRO.NEW
 ENVIRO.NAME:INT_SAFETYSHUTDOWN
 ENVIRO.STUB_BY_FUNCTION:AlarmMgmt
+ENVIRO.STUB_BY_FUNCTION:Battery
 ENVIRO.STUB_BY_FUNCTION:BloodFlow
+ENVIRO.STUB_BY_FUNCTION:CPLD
 ENVIRO.STUB_BY_FUNCTION:DialInFlow
 ENVIRO.STUB_BY_FUNCTION:DialOutFlow
 ENVIRO.STUB_BY_FUNCTION:FPGA
@@ -14,12 +16,125 @@
 ENVIRO.STUB_BY_FUNCTION:Timers
 ENVIRO.STUB_BY_FUNCTION:Valves
 ENVIRO.STUB_BY_FUNCTION:Voltages
+ENVIRO.STUB_BY_FUNCTION:adc
 ENVIRO.STUB_BY_FUNCTION:gio
 ENVIRO.STUB_BY_FUNCTION:sys_main
 ENVIRO.MAX_VARY_RANGE: 20
 ENVIRO.STUB: ALL_BY_PROTOTYPE
 ENVIRO.TYPE_HANDLED_DIRS_ALLOWED:
 ENVIRO.LIBRARY_STUBS:
+ENVIRO.UNIT_PREFIX_USER_CODE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:adc
+#include "reg_adc.h"  
+adcBASE_t * ptr_adcBASE_t;
+#undef adcREG1
+#define adcREG1 ptr_adcBASE_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:AlarmMgmt
+#include "reg_mibspi.h"
+mibspiBASE_t * ptr_mibspiBASE_t;
+#undef mibspiREG3
+#define mibspiREG3 ptr_mibspiBASE_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:Battery
+#include "reg_i2c.h"  
+i2cBASE_t * ptr_i2cBASE_t;
+#undef i2cREG1
+#define i2cREG1 ptr_i2cBASE_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:BloodFlow
+#include "reg_etpwm.h" 
+#include  "reg_can.h"
+
+etpwmBASE_t * ptr_etpwmBASE_t ;
+#undef etpwmREG1
+#define etpwmREG1 ptr_etpwmBASE_t
+
+canBASE_t * ptr_canBASE_t;
+#undef canREG3
+#define canREG3 ptr_canBASE_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:CPLD
+#include "reg_gio.h" 
+#include "reg_mibspi.h"
+
+gioPORT_t * ptr_gioPORT_t1;
+#undef gioPORTB
+#define gioPORTB ptr_gioPORT_t1
+
+gioPORT_t * ptr_gioPORT_t2;
+#undef gioPORTA
+#define gioPORTA ptr_gioPORT_t2
+
+mibspiBASE_t * ptr_mibspiBASE_t;
+#undef mibspiREG5
+#define mibspiREG5 ptr_mibspiBASE_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:DialInFlow
+#include "reg_etpwm.h" 
+#include "reg_gio.h" 
+#include "reg_mibspi.h"
+
+etpwmBASE_t * ptr_etpwmBASE_t ;
+#undef etpwmREG2
+#define etpwmREG2 ptr_etpwmBASE_t
+
+gioPORT_t * ptr_gioPORT_t;
+#undef gioPORTA
+#define gioPORTA ptr_gioPORT_t
+
+mibspiBASE_t * ptr_mibspiBASE_t;
+#undef mibspiREG5
+#define mibspiREG5 ptr_mibspiBASE_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:DialOutFlow
+#include "reg_mibspi.h"  
+#include "reg_etpwm.h"
+#include "reg_gio.h"
+
+mibspiBASE_t * ptr_mibspiBase_t;
+#undef mibspiREG1
+#define mibspiREG1  ptr_mibspiBase_t
+
+etpwmBASE_t * ptr_etpwmBASE_t;
+#undef etpwmREG3
+#define etpwmREG3 ptr_etpwmBASE_t
+
+gioPORT_t * ptr_gioPORT_t;
+#undef gioPORTA
+#define gioPORTA ptr_gioPORT_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:FPGA
+#include "reg_sci.h"  
+#include "reg_dma.h"  
+
+sciBASE_t * ptr_sciBASE_t;
+#undef scilinREG
+#define scilinREG ptr_sciBASE_t
+
+dmaBASE_t *ptr_dmaBASE_t;
+#undef dmaREG
+#define dmaREG ptr_dmaBASE_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:InternalADC
+#include "reg_adc.h"  
+adcBASE_t * ptr_adcBASE_t;
+#undef adcREG1
+#define adcREG1 ptr_adcBASE_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:SafetyShutdown
+#include "reg_gio.h"  
+gioPORT_t * ptr_gioPORT_t ;
+#undef gioPORTB
+#define gioPORTB ptr_gioPORT_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:Valves
+#include "reg_het.h"  
+gioPORT_t * ptr_gioPort;
+#undef hetPORT1
+#define hetPORT1 ptr_gioPort
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.END_UNIT_PREFIX_USER_CODE:
 ENVIRO.COVERAGE_TYPE: FUNCTION
 ENVIRO.WHITE_BOX: YES
 ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/include/
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SAFETYSHUTDOWN/INT_SAFETYSHUTDOWN.tst
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SAFETYSHUTDOWN/INT_SAFETYSHUTDOWN.tst	(.../INT_SAFETYSHUTDOWN.tst)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SAFETYSHUTDOWN/INT_SAFETYSHUTDOWN.tst	(.../INT_SAFETYSHUTDOWN.tst)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -2,7 +2,7 @@
 -- Test Case Script
 -- 
 -- Environment    : INT_SAFETYSHUTDOWN
--- Unit(s) Under Test: AlarmMgmt BloodFlow DialInFlow DialOutFlow FPGA InternalADC ModeInitPOST SafetyShutdown SyringePump SystemComm SystemCommMessages Timers Valves Voltages gio sys_main
+-- Unit(s) Under Test: AlarmMgmt Battery BloodFlow CPLD DialInFlow DialOutFlow FPGA InternalADC ModeInitPOST SafetyShutdown SyringePump SystemComm SystemCommMessages Timers Valves Voltages adc gio sys_main
 -- 
 -- Script Features
 TEST.SCRIPT_FEATURE:C_DIRECT_ARRAY_INDEXING
@@ -13,46 +13,6 @@
 TEST.SCRIPT_FEATURE:VCAST_MAIN_NOT_RENAMED
 --
 
--- Unit: BloodFlow
-
--- Subprogram: checkBloodPumpSpeeds
-
--- Test Case: activateSafetyShutdown
-TEST.UNIT:BloodFlow
-TEST.SUBPROGRAM:checkBloodPumpSpeeds
-TEST.NEW
-TEST.NAME:activateSafetyShutdown
-TEST.COMPOUND_ONLY
-TEST.STUB:BloodFlow.getMeasuredBloodPumpSpeed
-TEST.STUB:BloodFlow.getMeasuredBloodPumpMCSpeed
-TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.alarmIndex:ALARM_ID_HD_BLOOD_PUMP_OFF_CHECK
-TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1
-TEST.VALUE:BloodFlow.<<GLOBAL>>.targetBloodFlowRate:0
-TEST.VALUE:BloodFlow.getMeasuredBloodPumpSpeed.return:101.0
-TEST.VALUE:BloodFlow.getMeasuredBloodPumpMCSpeed.return:101.0
-TEST.EXPECTED:uut_prototype_stubs.isPersistentAlarmTriggered.alarmIndex:ALARM_ID_HD_BLOOD_PUMP_OFF_CHECK
-TEST.END
-
--- Unit: DialInFlow
-
--- Subprogram: checkDialInPumpSpeeds
-
--- Test Case: activateSafetyShutdown
-TEST.UNIT:DialInFlow
-TEST.SUBPROGRAM:checkDialInPumpSpeeds
-TEST.NEW
-TEST.NAME:activateSafetyShutdown
-TEST.COMPOUND_ONLY
-TEST.STUB:DialInFlow.getMeasuredDialInPumpSpeed
-TEST.STUB:DialInFlow.getMeasuredDialInPumpMCSpeed
-TEST.VALUE:DialInFlow.<<GLOBAL>>.targetDialInFlowRate:0
-TEST.VALUE:DialInFlow.<<GLOBAL>>.errorDialInMotorOffPersistTimerCtr:502
-TEST.VALUE:DialInFlow.getMeasuredDialInPumpSpeed.return:200.0
-TEST.VALUE:DialInFlow.getMeasuredDialInPumpMCSpeed.return:200.0
-TEST.EXPECTED:DialInFlow.<<GLOBAL>>.targetDialInFlowRate:0
-TEST.EXPECTED:DialInFlow.<<GLOBAL>>.errorDialInMotorOffPersistTimerCtr:502
-TEST.END
-
 -- Unit: DialOutFlow
 
 -- Subprogram: checkDialOutPumpSpeeds
@@ -81,7 +41,28 @@
 TEST.SUBPROGRAM:execInitAndPOSTMode
 TEST.NEW
 TEST.NAME:execSafetyShutdownTest
+TEST.VALUE:BloodFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:BloodFlow.<<GLOBAL>>.ptr_canBASE_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_mibspiBASE_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_mibspiBase_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
+TEST.VALUE:Valves.<<GLOBAL>>.ptr_gioPort:<<malloc 1>>
+TEST.VALUE:Battery.<<GLOBAL>>.ptr_i2cBASE_t:<<malloc 1>>
+TEST.VALUE:CPLD.<<GLOBAL>>.ptr_gioPORT_t1:<<malloc 1>>
+TEST.VALUE:CPLD.<<GLOBAL>>.ptr_gioPORT_t2:<<malloc 1>>
+TEST.VALUE:CPLD.<<GLOBAL>>.ptr_mibspiBASE_t:<<malloc 1>>
+TEST.VALUE:InternalADC.<<GLOBAL>>.ptr_adcBASE_t:<<malloc 1>>
+TEST.VALUE:SafetyShutdown.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
+TEST.VALUE:SafetyShutdown.<<GLOBAL>>.safetyShutdownSelfTestState:SAFETY_SHUTDOWN_SELF_TEST_STATE_START
 TEST.VALUE:ModeInitPOST.<<GLOBAL>>.postState:POST_STATE_SAFETY_SHUTDOWN
+TEST.VALUE:AlarmMgmt.<<GLOBAL>>.ptr_mibspiBASE_t:<<malloc 1>>
+TEST.VALUE:FPGA.<<GLOBAL>>.ptr_sciBASE_t:<<malloc 1>>
+TEST.VALUE:FPGA.<<GLOBAL>>.ptr_dmaBASE_t:<<malloc 1>>
+TEST.VALUE:adc.<<GLOBAL>>.ptr_adcBASE_t:<<malloc 1>>
+TEST.EXPECTED:SafetyShutdown.<<GLOBAL>>.safetyShutdownActivated:MACRO=TRUE
 TEST.END
 
 -- Subprogram: transitionToInitAndPOSTMode
@@ -94,27 +75,9 @@
 TEST.STUB:Valves.resetValvesPOSTState
 TEST.STUB:ModeInitPOST.initInitAndPOSTMode
 TEST.STUB:AlarmMgmt.setAlarmUserActionEnabled
+TEST.EXPECTED:SafetyShutdown.<<GLOBAL>>.safetyShutdownSelfTestState:SAFETY_SHUTDOWN_SELF_TEST_STATE_START
 TEST.END
 
--- Unit: SyringePump
-
--- Subprogram: handleSyringePumpOffState
-
--- Test Case: activateSafetyShutdown
-TEST.UNIT:SyringePump
-TEST.SUBPROGRAM:handleSyringePumpOffState
-TEST.NEW
-TEST.NAME:activateSafetyShutdown
-TEST.COMPOUND_ONLY
-TEST.STUB:SyringePump.getSyringePumpPosition
-TEST.STUB:AlarmMgmt.activateAlarmNoData
-TEST.VALUE:uut_prototype_stubs.incTimeWindowedCount.return:1
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpStopPositionTimerCounter:5
-TEST.VALUE:SyringePump.getSyringePumpPosition.return:10
-TEST.EXPECTED:uut_prototype_stubs.incTimeWindowedCount.cnt:TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR
-TEST.EXPECTED:AlarmMgmt.activateAlarmNoData.alarm:ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR
-TEST.END
-
 -- Unit: SystemCommMessages
 
 -- Subprogram: handleTestHDSafetyShutdownOverrideRequest
@@ -124,6 +87,7 @@
 TEST.SUBPROGRAM:handleTestHDSafetyShutdownOverrideRequest
 TEST.NEW
 TEST.NAME:handleTestHDSafetyShutdownOverrideRequest_Override
+TEST.VALUE:SafetyShutdown.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
 TEST.VALUE:SafetyShutdown.<<GLOBAL>>.safetyShutdownActivated:0
 TEST.VALUE:SafetyShutdown.<<GLOBAL>>.safetyShutdownOverrideResetState:0
 TEST.VALUE:SystemCommMessages.<<GLOBAL>>.testerLoggedIn:1
@@ -146,6 +110,7 @@
 TEST.SUBPROGRAM:handleTestHDSafetyShutdownOverrideRequest
 TEST.NEW
 TEST.NAME:handleTestHDSafetyShutdownOverrideRequest_Reset
+TEST.VALUE:SafetyShutdown.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
 TEST.VALUE:SafetyShutdown.<<GLOBAL>>.safetyShutdownActivated:1
 TEST.VALUE:SafetyShutdown.<<GLOBAL>>.safetyShutdownOverrideResetState:0
 TEST.VALUE:SystemCommMessages.<<GLOBAL>>.testerLoggedIn:1
@@ -163,36 +128,6 @@
 TEST.EXPECTED:SafetyShutdown.<<GLOBAL>>.safetyShutdownOverrideResetState:0
 TEST.END
 
--- Unit: Valves
-
--- Subprogram: getAndMonitorValvesCurrentFPGAPosition
-
--- Test Case: activateSafetyShutdown
-TEST.UNIT:Valves
-TEST.SUBPROGRAM:getAndMonitorValvesCurrentFPGAPosition
-TEST.NEW
-TEST.NAME:activateSafetyShutdown
-TEST.STUB:Valves.getValvePositionCounts
-TEST.VALUE:Valves.getValvePositionCounts.valve:VDI
-TEST.VALUE:Valves.getValvePositionCounts.return:1
-TEST.END
-
--- Subprogram: handleValveStateInTransition
-
--- Test Case: activateSafetyShutdown
-TEST.UNIT:Valves
-TEST.SUBPROGRAM:handleValveStateInTransition
-TEST.NEW
-TEST.NAME:activateSafetyShutdown
-TEST.STUB:Timers.didTimeout
-TEST.STUB:AlarmMgmt.isAlarmActive
-TEST.VALUE:Timers.didTimeout.startMSCount:0
-TEST.VALUE:Timers.didTimeout.timeoutPeriod:0
-TEST.VALUE:Timers.didTimeout.return:1
-TEST.VALUE:AlarmMgmt.isAlarmActive.alarm:ALARM_ID_NO_ALARM
-TEST.VALUE:AlarmMgmt.isAlarmActive.return:1
-TEST.END
-
 -- Unit: sys_main
 
 -- Subprogram: initSoftware
@@ -204,4 +139,25 @@
 TEST.NAME:initSafetyShutdown
 TEST.STUB:Timers.initTimers
 TEST.STUB:AlarmMgmt.initAlarmMgmt
+TEST.VALUE:BloodFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:BloodFlow.<<GLOBAL>>.ptr_canBASE_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_mibspiBASE_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_mibspiBase_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
+TEST.VALUE:Valves.<<GLOBAL>>.ptr_gioPort:<<malloc 1>>
+TEST.VALUE:Battery.<<GLOBAL>>.ptr_i2cBASE_t:<<malloc 1>>
+TEST.VALUE:CPLD.<<GLOBAL>>.ptr_gioPORT_t1:<<malloc 1>>
+TEST.VALUE:CPLD.<<GLOBAL>>.ptr_gioPORT_t2:<<malloc 1>>
+TEST.VALUE:CPLD.<<GLOBAL>>.ptr_mibspiBASE_t:<<malloc 1>>
+TEST.VALUE:InternalADC.<<GLOBAL>>.ptr_adcBASE_t:<<malloc 1>>
+TEST.VALUE:SafetyShutdown.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
+TEST.VALUE:AlarmMgmt.<<GLOBAL>>.ptr_mibspiBASE_t:<<malloc 1>>
+TEST.VALUE:FPGA.<<GLOBAL>>.ptr_sciBASE_t:<<malloc 1>>
+TEST.VALUE:FPGA.<<GLOBAL>>.ptr_dmaBASE_t:<<malloc 1>>
+TEST.VALUE:adc.<<GLOBAL>>.ptr_adcBASE_t:<<malloc 1>>
+TEST.EXPECTED:SafetyShutdown.<<GLOBAL>>.safetyShutdownSelfTestState:SAFETY_SHUTDOWN_SELF_TEST_STATE_START
+TEST.EXPECTED:SafetyShutdown.<<GLOBAL>>.safetyShutdownSelfTestStatus:SELF_TEST_STATUS_IN_PROGRESS
 TEST.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SAFETYSHUTDOWN/INT_SAFETYSHUTDOWN_cba.cvr
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SAFETYSHUTDOWN/INT_SAFETYSHUTDOWN_cba.cvr	(.../INT_SAFETYSHUTDOWN_cba.cvr)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SAFETYSHUTDOWN/INT_SAFETYSHUTDOWN_cba.cvr	(.../INT_SAFETYSHUTDOWN_cba.cvr)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -177,7 +177,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:17
-IMPORT.SOURCE.ORIG_FILENAME:InternalADC.c
+IMPORT.SOURCE.ORIG_FILENAME:Battery.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -199,7 +199,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:18
-IMPORT.SOURCE.ORIG_FILENAME:SafetyShutdown.c
+IMPORT.SOURCE.ORIG_FILENAME:CPLD.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -221,7 +221,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:19
-IMPORT.SOURCE.ORIG_FILENAME:ModeInitPOST.c
+IMPORT.SOURCE.ORIG_FILENAME:InternalADC.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -243,7 +243,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:20
-IMPORT.SOURCE.ORIG_FILENAME:AlarmMgmt.c
+IMPORT.SOURCE.ORIG_FILENAME:SafetyShutdown.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -265,7 +265,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:21
-IMPORT.SOURCE.ORIG_FILENAME:FPGA.c
+IMPORT.SOURCE.ORIG_FILENAME:ModeInitPOST.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -287,7 +287,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:22
-IMPORT.SOURCE.ORIG_FILENAME:SystemComm.c
+IMPORT.SOURCE.ORIG_FILENAME:AlarmMgmt.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -309,7 +309,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:23
-IMPORT.SOURCE.ORIG_FILENAME:SystemCommMessages.c
+IMPORT.SOURCE.ORIG_FILENAME:FPGA.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -331,7 +331,7 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:24
-IMPORT.SOURCE.ORIG_FILENAME:gio.c
+IMPORT.SOURCE.ORIG_FILENAME:SystemComm.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
 IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
@@ -353,6 +353,72 @@
 IMPORT.SOURCE.END
 IMPORT.SOURCE.BEGIN
 IMPORT.SOURCE.UNIT:25
+IMPORT.SOURCE.ORIG_FILENAME:SystemCommMessages.c
+IMPORT.SOURCE.COVERAGE_STATUS:TRUE
+IMPORT.SOURCE.COVERAGE_TYPE:Function
+IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
+IMPORT.SOURCE.HAS_EMPTY_STATEMENTS:FALSE
+IMPORT.SOURCE.COVER_CATCH_AS_BRANCH:TRUE
+IMPORT.SOURCE.HAS_CATCH_STATEMENTS:FALSE
+IMPORT.SOURCE.EDG_COVERAGE:TRUE
+IMPORT.SOURCE.COVER_FUNCTION_PARAMETERS:FALSE
+IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:FALSE
+IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.HAS_NESTED_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.COVER_STATEMENTS_BY_BLOCK:FALSE
+IMPORT.SOURCE.COVERAGE_FOR_DECLARATIONS:INSTRUMENT_VARIABLE_DECLARATIONS_INITIALIZATIONS
+IMPORT.SOURCE.HAS_CONSTANT_BRANCH:FALSE
+IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE
+IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
+IMPORT.SOURCE.END
+IMPORT.SOURCE.BEGIN
+IMPORT.SOURCE.UNIT:26
+IMPORT.SOURCE.ORIG_FILENAME:adc.c
+IMPORT.SOURCE.COVERAGE_STATUS:TRUE
+IMPORT.SOURCE.COVERAGE_TYPE:Function
+IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
+IMPORT.SOURCE.HAS_EMPTY_STATEMENTS:FALSE
+IMPORT.SOURCE.COVER_CATCH_AS_BRANCH:TRUE
+IMPORT.SOURCE.HAS_CATCH_STATEMENTS:FALSE
+IMPORT.SOURCE.EDG_COVERAGE:TRUE
+IMPORT.SOURCE.COVER_FUNCTION_PARAMETERS:FALSE
+IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:FALSE
+IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.HAS_NESTED_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.COVER_STATEMENTS_BY_BLOCK:FALSE
+IMPORT.SOURCE.COVERAGE_FOR_DECLARATIONS:INSTRUMENT_VARIABLE_DECLARATIONS_INITIALIZATIONS
+IMPORT.SOURCE.HAS_CONSTANT_BRANCH:FALSE
+IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE
+IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
+IMPORT.SOURCE.END
+IMPORT.SOURCE.BEGIN
+IMPORT.SOURCE.UNIT:27
+IMPORT.SOURCE.ORIG_FILENAME:gio.c
+IMPORT.SOURCE.COVERAGE_STATUS:TRUE
+IMPORT.SOURCE.COVERAGE_TYPE:Function
+IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE
+IMPORT.SOURCE.HAS_EMPTY_STATEMENTS:FALSE
+IMPORT.SOURCE.COVER_CATCH_AS_BRANCH:TRUE
+IMPORT.SOURCE.HAS_CATCH_STATEMENTS:FALSE
+IMPORT.SOURCE.EDG_COVERAGE:TRUE
+IMPORT.SOURCE.COVER_FUNCTION_PARAMETERS:FALSE
+IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:FALSE
+IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.HAS_NESTED_CONDITIONAL_OPERATOR:FALSE
+IMPORT.SOURCE.COVER_STATEMENTS_BY_BLOCK:FALSE
+IMPORT.SOURCE.COVERAGE_FOR_DECLARATIONS:INSTRUMENT_VARIABLE_DECLARATIONS_INITIALIZATIONS
+IMPORT.SOURCE.HAS_CONSTANT_BRANCH:FALSE
+IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE
+IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE
+IMPORT.SOURCE.END
+IMPORT.SOURCE.BEGIN
+IMPORT.SOURCE.UNIT:28
 IMPORT.SOURCE.ORIG_FILENAME:sys_main.c
 IMPORT.SOURCE.COVERAGE_STATUS:TRUE
 IMPORT.SOURCE.COVERAGE_TYPE:Function
@@ -378,7 +444,7 @@
 RESULT.CBA.NOTES
 Some functions not yet called.
 RESULT.CBA.NOTES_END
-RESULT.CBA.UNIT: /home/asif/work/update_23rd/workspace_hd/hdfirmware/firmware/App/Drivers/SafetyShutdown.c
+RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/App/Drivers/SafetyShutdown.c
 RESULT.CBA.FUNCTION: isSafetyShutdownActivated
 RESULT.CBA.LINE.BEGIN
 RESULT.CBA.LINE: 0
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SAMPLEWATER/INT_SAMPLEWATER.tst
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SAMPLEWATER/INT_SAMPLEWATER.tst	(.../INT_SAMPLEWATER.tst)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SAMPLEWATER/INT_SAMPLEWATER.tst	(.../INT_SAMPLEWATER.tst)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -22,6 +22,8 @@
 TEST.SUBPROGRAM:collectTreatmentLogData
 TEST.NEW
 TEST.NAME:getSampleWaterResult
+TEST.VALUE:SampleWater.<<GLOBAL>>.sampleWaterResult:TRUE
+TEST.EXPECTED:ModePostTreat.<<GLOBAL>>.treatmentLogData.waterSampleTestResult:TRUE
 TEST.END
 
 -- Unit: ModePreTreat
@@ -35,16 +37,20 @@
 TEST.NAME:execSampleWater
 TEST.VALUE:uut_prototype_stubs.getDGOpMode.return:DG_MODE_CHEM
 TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:10
+TEST.EXPECTED:ModePreTreat.handleWaterSampleState.return:HD_PRE_TREATMENT_WATER_SAMPLE_STATE
 TEST.END
 
 -- Test Case: getSampleWaterResult
 TEST.UNIT:ModePreTreat
 TEST.SUBPROGRAM:handleWaterSampleState
 TEST.NEW
 TEST.NAME:getSampleWaterResult
-TEST.VALUE:uut_prototype_stubs.getDGOpMode.return:100
-TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:100
+TEST.VALUE:uut_prototype_stubs.getDGOpMode.return:DG_MODE_STAN
+TEST.VALUE:uut_prototype_stubs.getDGSubMode.return:0
 TEST.VALUE:uut_prototype_stubs.cmdDGSampleWater.cmd:10
+TEST.VALUE:SampleWater.<<GLOBAL>>.currentSampleWaterState:SAMPLE_WATER_COMPLETE_STATE
+TEST.VALUE:SampleWater.<<GLOBAL>>.sampleWaterResult:TRUE
+TEST.EXPECTED:ModePreTreat.handleWaterSampleState.return:HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE
 TEST.END
 
 -- Subprogram: initPreTreatmentMode
@@ -54,6 +60,11 @@
 TEST.SUBPROGRAM:initPreTreatmentMode
 TEST.NEW
 TEST.NAME:initSampleWater
+TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterStartRequested:FALSE
+TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterStopRequested:FALSE
+TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterResultEntered:FALSE
+TEST.EXPECTED:SampleWater.<<GLOBAL>>.currentSampleWaterState:SAMPLE_WATER_SETUP_STATE
+TEST.EXPECTED:SampleWater.<<GLOBAL>>.sampleWaterResult:FALSE
 TEST.END
 
 -- Subprogram: publishPreTreatmentState
@@ -70,6 +81,15 @@
 
 -- Subprogram: transitionToPreTreatmentMode
 
+-- Test Case: transitionToPreTreatmentMode.001
+TEST.UNIT:ModePreTreat
+TEST.SUBPROGRAM:transitionToPreTreatmentMode
+TEST.NEW
+TEST.NAME:transitionToPreTreatmentMode.001
+TEST.VALUE:uut_prototype_stubs.getTestConfigStatus.return:FALSE
+TEST.EXPECTED:uut_prototype_stubs.cmdDGSampleWater.cmd:SAMPLE_WATER_CMD_FLUSH
+TEST.END
+
 -- Test Case: transitionToSampleWater
 TEST.UNIT:ModePreTreat
 TEST.SUBPROGRAM:transitionToPreTreatmentMode
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SAMPLEWATER/INT_SAMPLEWATER_cba.cvr
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SAMPLEWATER/INT_SAMPLEWATER_cba.cvr	(.../INT_SAMPLEWATER_cba.cvr)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SAMPLEWATER/INT_SAMPLEWATER_cba.cvr	(.../INT_SAMPLEWATER_cba.cvr)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -119,7 +119,7 @@
 
 2)
 RESULT.CBA.NOTES_END
-RESULT.CBA.UNIT: /home/asif/work/update_23rd/workspace_hd/hdfirmware/firmware/App/Modes/SampleWater.c
+RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/App/Modes/SampleWater.c
 RESULT.CBA.FUNCTION: handleWaterSampleState
 RESULT.CBA.LINE.BEGIN
 RESULT.CBA.LINE: 0
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SELFTESTS/INT_SELFTESTS.env
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SELFTESTS/INT_SELFTESTS.env	(.../INT_SELFTESTS.env)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SELFTESTS/INT_SELFTESTS.env	(.../INT_SELFTESTS.env)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -22,6 +22,55 @@
 ENVIRO.STUB: ALL_BY_PROTOTYPE
 ENVIRO.TYPE_HANDLED_DIRS_ALLOWED:
 ENVIRO.LIBRARY_STUBS:
+ENVIRO.UNIT_PREFIX_USER_CODE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:BloodFlow
+#include "reg_etpwm.h" 
+#include  "reg_can.h"
+
+etpwmBASE_t * ptr_etpwmBASE_t ;
+#undef etpwmREG1
+#define etpwmREG1 ptr_etpwmBASE_t
+
+canBASE_t * ptr_canBASE_t;
+#undef canREG3
+#define canREG3 ptr_canBASE_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:DialInFlow
+#include "reg_etpwm.h" 
+#include "reg_gio.h" 
+#include "reg_mibspi.h"
+
+etpwmBASE_t * ptr_etpwmBASE_t ;
+#undef etpwmREG2
+#define etpwmREG2 ptr_etpwmBASE_t
+
+gioPORT_t * ptr_gioPORT_t;
+#undef gioPORTA
+#define gioPORTA ptr_gioPORT_t
+
+mibspiBASE_t * ptr_mibspiBASE_t;
+#undef mibspiREG5
+#define mibspiREG5 ptr_mibspiBASE_t
+
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:DialOutFlow
+#include "reg_mibspi.h"  
+#include "reg_etpwm.h"
+#include "reg_gio.h"
+
+mibspiBASE_t * ptr_mibspiBase_t;
+#undef mibspiREG1
+#define mibspiREG1  ptr_mibspiBase_t
+
+etpwmBASE_t * ptr_etpwmBASE_t;
+#undef etpwmREG3
+#define etpwmREG3 ptr_etpwmBASE_t
+
+gioPORT_t * ptr_gioPORT_t;
+#undef gioPORTA
+#define gioPORTA ptr_gioPORT_t
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.END_UNIT_PREFIX_USER_CODE:
 ENVIRO.COVERAGE_TYPE: FUNCTION
 ENVIRO.WHITE_BOX: YES
 ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/include/
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SELFTESTS/INT_SELFTESTS.tst
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SELFTESTS/INT_SELFTESTS.tst	(.../INT_SELFTESTS.tst)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SELFTESTS/INT_SELFTESTS.tst	(.../INT_SELFTESTS.tst)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -22,8 +22,17 @@
 TEST.SUBPROGRAM:handleInstallState
 TEST.NEW
 TEST.NAME:transitionToDrySelfTests
+TEST.VALUE:BloodFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:BloodFlow.<<GLOBAL>>.ptr_canBASE_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_mibspiBASE_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_mibspiBase_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
 TEST.VALUE:ModePreTreat.<<GLOBAL>>.confirmInstallRequested:1
-TEST.EXPECTED:ModePreTreat.<<GLOBAL>>.confirmInstallRequested:1
+TEST.EXPECTED:ModePreTreat.<<GLOBAL>>.confirmInstallRequested:0
+TEST.EXPECTED:ModePreTreat.handleInstallState.return:HD_PRE_TREATMENT_SELF_TEST_DRY_STATE
 TEST.END
 
 -- Subprogram: handleSelfTestConsumableState
@@ -33,8 +42,17 @@
 TEST.SUBPROGRAM:handleSelfTestConsumableState
 TEST.NEW
 TEST.NAME:transitionToNoCartSelfTests
-TEST.VALUE:uut_prototype_stubs.getConsumableSelfTestState.return:CONSUMABLE_SELF_TESTS_COMPLETE_STATE
-TEST.VALUE:ModePreTreat.<<GLOBAL>>.submodeCompleteTransitionTimeCounter:SUBMODE_COMPLETE_UI_TRANSITION_TIME_COUNT
+TEST.VALUE:uut_prototype_stubs.getConsumableSelfTestState.return:MACRO=CONSUMABLE_SELF_TESTS_COMPLETE_STATE
+TEST.VALUE:BloodFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:BloodFlow.<<GLOBAL>>.ptr_canBASE_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_mibspiBASE_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_mibspiBase_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
+TEST.VALUE:ModePreTreat.<<GLOBAL>>.submodeCompleteTransitionTimeCounter:MACRO=SUBMODE_COMPLETE_UI_TRANSITION_TIME_COUNT
+TEST.EXPECTED:ModePreTreat.handleSelfTestConsumableState.return:HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE
 TEST.END
 
 -- Subprogram: handleSelfTestDryState
@@ -44,6 +62,8 @@
 TEST.SUBPROGRAM:handleSelfTestDryState
 TEST.NEW
 TEST.NAME:execDrySelfTests
+TEST.VALUE:ModePreTreat.<<GLOBAL>>.alarmActionResumeReceived:TRUE
+TEST.EXPECTED:ModePreTreat.<<GLOBAL>>.alarmActionResumeReceived:FALSE
 TEST.END
 
 -- Test Case: signalResumeSelfTests
@@ -72,6 +92,7 @@
 TEST.NEW
 TEST.NAME:signalResumeSelfTests
 TEST.VALUE:ModePreTreat.<<GLOBAL>>.alarmActionResumeReceived:1
+TEST.VALUE:SelfTests.<<GLOBAL>>.currentNoCartSelfTestsState:NO_CART_SELF_TESTS_HOME_IDLE_STATE
 TEST.EXPECTED:ModePreTreat.<<GLOBAL>>.alarmActionResumeReceived:0
 TEST.END
 
@@ -83,6 +104,7 @@
 TEST.NEW
 TEST.NAME:initSelfTests
 TEST.STUB:Prime.initPrime
+TEST.EXPECTED:SelfTests.<<GLOBAL>>.doorStateAfterCartridgeInstall:MACRO=TRUE
 TEST.END
 
 -- Subprogram: publishPreTreatmentState
@@ -92,10 +114,11 @@
 TEST.SUBPROGRAM:publishPreTreatmentState
 TEST.NEW
 TEST.NAME:getDrySelfTestsState
-TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:10
+TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:5
 TEST.VALUE:uut_prototype_stubs.getConsumableSelfTestState.return:0
 TEST.VALUE:uut_prototype_stubs.getSampleWaterState.return:0
 TEST.VALUE:ModePreTreat.<<GLOBAL>>.preTreatmentPublishTimerCounter:10
+TEST.EXPECTED:uut_prototype_stubs.broadcastData.msgID:MSG_ID_PRE_TREATMENT_STATE_DATA
 TEST.END
 
 -- Test Case: getNoCartSelfTestsState
@@ -107,6 +130,7 @@
 TEST.VALUE:uut_prototype_stubs.getConsumableSelfTestState.return:0
 TEST.VALUE:uut_prototype_stubs.getSampleWaterState.return:0
 TEST.VALUE:ModePreTreat.<<GLOBAL>>.preTreatmentPublishTimerCounter:10
+TEST.EXPECTED:uut_prototype_stubs.broadcastData.msgID:MSG_ID_PRE_TREATMENT_STATE_DATA
 TEST.END
 
 -- Test Case: getWetSelfTestState
@@ -120,6 +144,7 @@
 TEST.VALUE:uut_prototype_stubs.getPreTreatmentRecircState.return:0
 TEST.VALUE:uut_prototype_stubs.getSampleWaterState.return:0
 TEST.VALUE:ModePreTreat.<<GLOBAL>>.preTreatmentPublishTimerCounter:10
+TEST.EXPECTED:uut_prototype_stubs.broadcastData.msgID:MSG_ID_PRE_TREATMENT_STATE_DATA
 TEST.END
 
 -- Unit: PresOccl
@@ -138,8 +163,11 @@
 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_PRET
 TEST.VALUE:uut_prototype_stubs.getCurrentSubMode.return:0
 TEST.VALUE:BloodFlow.isBloodPumpRunning.return:1
+TEST.VALUE:PresOccl.<<GLOBAL>>.bloodPumpOcclusionAfterCartridgeInstall:100
 TEST.VALUE:PresOccl.getMeasuredVenousPressure.return:0.0
+TEST.VALUE:PresOccl.getMeasuredBloodPumpOcclusion.return:6000
 TEST.VALUE:ModePreTreat.getPreTreatmentSubState.return:HD_PRE_TREATMENT_SELF_TEST_DRY_STATE
+TEST.EXPECTED:BloodFlow.<<GLOBAL>>.bloodPumpState:BLOOD_PUMP_OFF_STATE
 TEST.END
 
 -- Unit: Prime
@@ -154,8 +182,16 @@
 TEST.STUB:Timers.didTimeout
 TEST.STUB:DGInterface.getLoadCellWeight
 TEST.VALUE:Timers.didTimeout.return:1
+TEST.VALUE:BloodFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:BloodFlow.<<GLOBAL>>.ptr_canBASE_t:<<malloc 1>>
 TEST.VALUE:DGInterface.getLoadCellWeight.loadCellID:LOAD_CELL_RESERVOIR_2_PRIMARY
 TEST.VALUE:DGInterface.getLoadCellWeight.return:<<MAX>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
+TEST.VALUE:DialInFlow.<<GLOBAL>>.ptr_mibspiBASE_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_mibspiBase_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_etpwmBASE_t:<<malloc 1>>
+TEST.VALUE:DialOutFlow.<<GLOBAL>>.ptr_gioPORT_t:<<malloc 1>>
 TEST.VALUE:Prime.<<GLOBAL>>.minimumReservoirVolume:5.0
 TEST.VALUE:Prime.<<GLOBAL>>.steadyVolumeCount:10
 TEST.EXPECTED:DGInterface.getLoadCellWeight.loadCellID:LOAD_CELL_RESERVOIR_2_PRIMARY
@@ -169,11 +205,14 @@
 TEST.NEW
 TEST.NAME:execWetSelfTests
 TEST.VALUE:Prime.<<GLOBAL>>.primeResumeRequested:0
+TEST.EXPECTED:SelfTests.<<GLOBAL>>.selfTestsResumeRequested:FALSE
 TEST.END
 
 -- Test Case: isWetSelfTestsPassed
 TEST.UNIT:Prime
 TEST.SUBPROGRAM:handlePrimeWetSelfTestsState
 TEST.NEW
 TEST.NAME:isWetSelfTestsPassed
+TEST.VALUE:SelfTests.<<GLOBAL>>.wetSelfTestsResult:TRUE
+TEST.EXPECTED:Prime.handlePrimeWetSelfTestsState.return:HD_PRIME_COMPLETE
 TEST.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SELFTESTS/INT_SELFTESTS_cba.cvr
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SELFTESTS/INT_SELFTESTS_cba.cvr	(.../INT_SELFTESTS_cba.cvr)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SELFTESTS/INT_SELFTESTS_cba.cvr	(.../INT_SELFTESTS_cba.cvr)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -525,8 +525,11 @@
 
 34)static void setAlarmResumePerDoorAndLatch( void )
 Line# 272
+
+35) static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestsWaitForClosedDoor( void )
+Line #756
 RESULT.CBA.NOTES_END
-RESULT.CBA.UNIT: /home/asif/work/update_23rd/workspace_hd/hdfirmware/firmware/App/Modes/SelfTests.c
+RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/App/Modes/SelfTests.c
 RESULT.CBA.FUNCTION: handleDrySelfTestCartridgeLoadedCheckState
 RESULT.CBA.LINE.BEGIN
 RESULT.CBA.LINE: 0
@@ -747,6 +750,17 @@
 RESULT.CBA.CONTEXT_AFTER_END
 RESULT.CBA.MATCHING_LINE_INDEX: 1
 RESULT.CBA.LINE.END
+RESULT.CBA.FUNCTION: handleNoCartSelfTestsWaitForClosedDoor
+RESULT.CBA.LINE.BEGIN
+RESULT.CBA.LINE: 0
+RESULT.CBA.COVERAGE: FN
+RESULT.CBA.CONTEXT: {
+RESULT.CBA.CONTEXT_AFTER:
+NO_CART_SELF_TESTS_STATE_T state = NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+OPN_CLS_STATE_T frontDoor = getSwitchStatus( FRONT_DOOR );
+RESULT.CBA.CONTEXT_AFTER_END
+RESULT.CBA.MATCHING_LINE_INDEX: 1
+RESULT.CBA.LINE.END
 RESULT.CBA.FUNCTION: handleWetSelfTestBloodLeakDetectorDebubbleState
 RESULT.CBA.LINE.BEGIN
 RESULT.CBA.LINE: 0
@@ -875,7 +889,7 @@
 RESULT.CBA.CONTEXT: {
 RESULT.CBA.CONTEXT_AFTER:
 WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_STOPPED_STATE;
-setAlarmResumePerDoorAndLatch();
+F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
 RESULT.CBA.CONTEXT_AFTER_END
 RESULT.CBA.MATCHING_LINE_INDEX: 1
 RESULT.CBA.LINE.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SWITCHES/INT_SWITCHES.tst
===================================================================
diff -u -rbee4a17cf2dedb3a18483e2c05846785ed1b3da7 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SWITCHES/INT_SWITCHES.tst	(.../INT_SWITCHES.tst)	(revision bee4a17cf2dedb3a18483e2c05846785ed1b3da7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SWITCHES/INT_SWITCHES.tst	(.../INT_SWITCHES.tst)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -22,6 +22,8 @@
 TEST.SUBPROGRAM:transitionToBloodPrime
 TEST.NEW
 TEST.NAME:doorClosedRequired
+TEST.EXPECTED:Switches.<<GLOBAL>>.requireDoorClosed:1
+TEST.EXPECTED:Switches.<<GLOBAL>>.requirePumpTrackLocked:1
 TEST.END
 
 -- Unit: Dialysis
@@ -33,19 +35,10 @@
 TEST.SUBPROGRAM:transitionToDialysis
 TEST.NEW
 TEST.NAME:doorClosedRequired
+TEST.EXPECTED:Switches.<<GLOBAL>>.requireDoorClosed:1
+TEST.EXPECTED:Switches.<<GLOBAL>>.requirePumpTrackLocked:1
 TEST.END
 
--- Unit: ModeFault
-
--- Subprogram: transitionToFaultMode
-
--- Test Case: doorClosedRequired
-TEST.UNIT:ModeFault
-TEST.SUBPROGRAM:transitionToFaultMode
-TEST.NEW
-TEST.NAME:doorClosedRequired
-TEST.END
-
 -- Unit: SystemCommMessages
 
 -- Subprogram: handleSetSwitchesStatusOverrideRequest
@@ -130,4 +123,7 @@
 TEST.STUB:BloodLeak.initBloodLeak
 TEST.STUB:Bubble.initBubbles
 TEST.STUB:FPGA.initFPGA
+TEST.EXPECTED:Switches.<<GLOBAL>>.switchesDataPublicationCounter:90
+TEST.EXPECTED:Switches.<<GLOBAL>>.requireDoorClosed:FALSE
+TEST.EXPECTED:Switches.<<GLOBAL>>.requirePumpTrackLocked:FALSE
 TEST.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SYRINGEPUMP/INT_SYRINGEPUMP.tst
===================================================================
diff -u -r3ec9e333f6fe3455bcc36ab7097d4d2257c7b273 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SYRINGEPUMP/INT_SYRINGEPUMP.tst	(.../INT_SYRINGEPUMP.tst)	(revision 3ec9e333f6fe3455bcc36ab7097d4d2257c7b273)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SYRINGEPUMP/INT_SYRINGEPUMP.tst	(.../INT_SYRINGEPUMP.tst)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -89,8 +89,8 @@
 TEST.STUB:OperationModes.getPreviousOperationMode
 TEST.VALUE:uut_prototype_stubs.getDGOpMode.return:DG_MODE_FAUL
 TEST.VALUE:uut_prototype_stubs.requestAlarmLampPattern.lampPattern:LAMP_PATTERN_OFF
-TEST.VALUE:SyringePump.<<GLOBAL>>.requireSyringeDetection:TRUE
-TEST.EXPECTED:SyringePump.<<GLOBAL>>.requireSyringeDetection:FALSE
+TEST.VALUE:SyringePump.<<GLOBAL>>.requireSyringeDetection:MACRO=TRUE
+TEST.EXPECTED:SyringePump.<<GLOBAL>>.requireSyringeDetection:MACRO=FALSE
 TEST.END
 
 -- Unit: ModeInitPOST
@@ -168,7 +168,7 @@
 TEST.VALUE:uut_prototype_stubs.getSwitchStatus.return:STATE_CLOSED
 TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpState:SYRINGE_PUMP_INIT_STATE
 TEST.VALUE:ModeStandby.<<GLOBAL>>.homingInitiated:0
-TEST.EXPECTED:ModeStandby.<<GLOBAL>>.homingInitiated:TRUE
+TEST.EXPECTED:ModeStandby.<<GLOBAL>>.homingInitiated:MACRO=TRUE
 TEST.END
 
 -- Subprogram: transitionToStandbyMode
@@ -179,7 +179,7 @@
 TEST.NEW
 TEST.NAME:resetPreLoadStatus
 TEST.STUB:ModeStandby.initStandbyMode
-TEST.EXPECTED:SyringePump.<<GLOBAL>>.syringePumpPreLoadCompleted:FALSE
+TEST.EXPECTED:SyringePump.<<GLOBAL>>.syringePumpPreLoadCompleted:MACRO=FALSE
 TEST.END
 
 -- Unit: ModeTreatmentParams
@@ -273,8 +273,8 @@
 TEST.NEW
 TEST.NAME:handleDrySelfTestSyringePumpPrimeState.001
 TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpState:SYRINGE_PUMP_OFF_STATE
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPlungerFound:TRUE
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPrimeCompleted:TRUE
+TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPlungerFound:MACRO=TRUE
+TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPrimeCompleted:MACRO=TRUE
 TEST.VALUE:SelfTests.<<GLOBAL>>.useHeparin:1
 TEST.EXPECTED:SelfTests.handleDrySelfTestSyringePumpPrimeState.return:DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE
 TEST.END
@@ -285,10 +285,10 @@
 TEST.NEW
 TEST.NAME:handleDrySelfTestSyringePumpPrimeState.002
 TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpState:SYRINGE_PUMP_OFF_STATE
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPlungerFound:TRUE
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPrimeCompleted:FALSE
+TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPlungerFound:MACRO=TRUE
+TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPrimeCompleted:MACRO=FALSE
 TEST.VALUE:SelfTests.<<GLOBAL>>.useHeparin:1
-TEST.EXPECTED:SyringePump.<<GLOBAL>>.syringePumpPrimeRequested:FALSE
+TEST.EXPECTED:SyringePump.<<GLOBAL>>.syringePumpPrimeRequested:MACRO=FALSE
 TEST.END
 
 -- Test Case: handleDrySelfTestSyringePumpPrimeState.003
@@ -297,11 +297,11 @@
 TEST.NEW
 TEST.NAME:handleDrySelfTestSyringePumpPrimeState.003
 TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpState:SYRINGE_PUMP_OFF_STATE
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPlungerFound:FALSE
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPrimeCompleted:FALSE
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPreLoadCompleted:TRUE
+TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPlungerFound:MACRO=FALSE
+TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPrimeCompleted:MACRO=FALSE
+TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPreLoadCompleted:MACRO=TRUE
 TEST.VALUE:SelfTests.<<GLOBAL>>.useHeparin:1
-TEST.EXPECTED:SyringePump.<<GLOBAL>>.syringePumpSeekRequested:FALSE
+TEST.EXPECTED:SyringePump.<<GLOBAL>>.syringePumpSeekRequested:MACRO=FALSE
 TEST.END
 
 -- Test Case: handleDrySelfTestSyringePumpPrimeState.004
@@ -310,11 +310,11 @@
 TEST.NEW
 TEST.NAME:handleDrySelfTestSyringePumpPrimeState.004
 TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpState:SYRINGE_PUMP_OFF_STATE
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPlungerFound:FALSE
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPrimeCompleted:FALSE
-TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPreLoadCompleted:FALSE
+TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPlungerFound:MACRO=FALSE
+TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPrimeCompleted:MACRO=FALSE
+TEST.VALUE:SyringePump.<<GLOBAL>>.syringePumpPreLoadCompleted:MACRO=FALSE
 TEST.VALUE:SelfTests.<<GLOBAL>>.useHeparin:1
-TEST.EXPECTED:SyringePump.<<GLOBAL>>.syringePumpPreloadRequested:FALSE
+TEST.EXPECTED:SyringePump.<<GLOBAL>>.syringePumpPreloadRequested:MACRO=FALSE
 TEST.END
 
 -- Subprogram: handleWetSelfTestStartState
@@ -327,7 +327,7 @@
 TEST.STUB:ModeTreatmentParams.getTreatmentParameterF32
 TEST.VALUE:ModeTreatmentParams.getTreatmentParameterF32.param:TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME
 TEST.VALUE:ModeTreatmentParams.getTreatmentParameterF32.return:1.0
-TEST.EXPECTED:SyringePump.<<GLOBAL>>.syringePumpBolusRequested:FALSE
+TEST.EXPECTED:SyringePump.<<GLOBAL>>.syringePumpBolusRequested:MACRO=FALSE
 TEST.END
 
 -- Unit: SystemCommMessages
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_SYSTEMCOMMMESSAGES/INT_SYSTEMCOMMMESSAGES.tst
===================================================================
diff -u -r2bfc2546c1c2236b1211b49ea90832b3cc42f568 -r120a51317edc52c160b7917327674af2e403ee5e
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_SYSTEMCOMMMESSAGES/INT_SYSTEMCOMMMESSAGES.tst	(.../INT_SYSTEMCOMMMESSAGES.tst)	(revision 2bfc2546c1c2236b1211b49ea90832b3cc42f568)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_SYSTEMCOMMMESSAGES/INT_SYSTEMCOMMMESSAGES.tst	(.../INT_SYSTEMCOMMMESSAGES.tst)	(revision 120a51317edc52c160b7917327674af2e403ee5e)
@@ -81,11 +81,15 @@
 TEST.NEW
 TEST.NAME:sendOffButtonMsgToUI
 TEST.IMPORT_FAILURES:
-(I) @LINE: 195
+(I) @LINE: 199
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 198
+(I) @LINE: 202
     >>> 'FALSE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 195
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 198
+    >>>     >>> 'FALSE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 191
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 194
@@ -390,9 +394,11 @@
 TEST.NEW
 TEST.NAME:sendDGFillCommand
 TEST.IMPORT_FAILURES:
-(I) @LINE: 434
+(I) @LINE: 440
     >>> 'FALSE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 434
+    >>>     >>> 'FALSE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 428
     >>>     >>> 'FALSE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 422
@@ -1142,12 +1148,14 @@
 TEST.SUBPROGRAM:execSystemCommRx
 TEST.NEW
 TEST.NAME:setTesterStatusToLoggedOut
+TEST.STUB:TestSupport.hasDialinCheckInExpired
 TEST.STUB:SystemComm.processIncomingData
 TEST.STUB:SystemComm.processReceivedMessages
 TEST.STUB:SystemComm.checkForCommTimeouts
 TEST.STUB:SystemComm.checkPendingACKList
+TEST.VALUE:TestSupport.hasDialinCheckInExpired.return:TRUE
 TEST.VALUE:SystemCommMessages.<<GLOBAL>>.testerLoggedIn:MACRO=TRUE
-TEST.EXPECTED:SystemCommMessages.<<GLOBAL>>.testerLoggedIn:MACRO=TRUE
+TEST.EXPECTED:SystemCommMessages.<<GLOBAL>>.testerLoggedIn:FALSE
 TEST.END
 
 -- Subprogram: processReceivedMessage
@@ -1390,11 +1398,15 @@
 TEST.NEW
 TEST.NAME:001C
 TEST.IMPORT_FAILURES:
-(I) @LINE: 1379
+(I) @LINE: 1420
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 1380
+(I) @LINE: 1421
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 1379
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 1380
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 1355
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 1356
@@ -2614,9 +2626,11 @@
 TEST.NEW
 TEST.NAME:handleAirPumpIntervalOverrideRequest
 TEST.IMPORT_FAILURES:
-(I) @LINE: 2638
+(I) @LINE: 2682
     >>> 'MSG_ID_HD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 2638
+    >>>     >>> 'MSG_ID_HD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 2612
     >>>     >>> 'MSG_ID_HD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 2527
@@ -4218,9 +4232,11 @@
 TEST.NEW
 TEST.NAME:handleTestDialInPumpHomeRequest
 TEST.IMPORT_FAILURES:
-(I) @LINE: 4218
+(I) @LINE: 4264
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 4218
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 4190
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 4103
@@ -4557,9 +4573,11 @@
 TEST.NEW
 TEST.NAME:handleTestDialOutPumpHomeRequest
 TEST.IMPORT_FAILURES:
-(I) @LINE: 4555
+(I) @LINE: 4603
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 4555
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 4525
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 4436
@@ -5870,11 +5888,15 @@
 TEST.NEW
 TEST.NAME:processReceivedMessage.011
 TEST.IMPORT_FAILURES:
-(I) @LINE: 5858
+(I) @LINE: 5910
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 5859
+(I) @LINE: 5911
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 5858
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 5859
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 5824
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 5825
@@ -5917,11 +5939,15 @@
 TEST.NEW
 TEST.NAME:processReceivedMessage.012
 TEST.IMPORT_FAILURES:
-(I) @LINE: 5901
+(I) @LINE: 5957
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 5902
+(I) @LINE: 5958
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 5901
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 5902
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 5863
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 5864
@@ -5964,11 +5990,15 @@
 TEST.NEW
 TEST.NAME:processReceivedMessage.013
 TEST.IMPORT_FAILURES:
-(I) @LINE: 5944
+(I) @LINE: 6004
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 5945
+(I) @LINE: 6005
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 5944
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 5945
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 5902
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 5903
@@ -6011,11 +6041,15 @@
 TEST.NEW
 TEST.NAME:processReceivedMessage.014
 TEST.IMPORT_FAILURES:
-(I) @LINE: 5987
+(I) @LINE: 6051
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 5988
+(I) @LINE: 6052
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 5987
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 5988
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 5941
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 5942
@@ -6502,11 +6536,15 @@
 TEST.NEW
 TEST.NAME:processReceivedMessage.030
 TEST.IMPORT_FAILURES:
-(I) @LINE: 6480
+(I) @LINE: 6546
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 6481
+(I) @LINE: 6547
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 6480
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 6481
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 6430
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 6431
@@ -6553,11 +6591,15 @@
 TEST.NEW
 TEST.NAME:processReceivedMessage.031
 TEST.IMPORT_FAILURES:
-(I) @LINE: 6527
+(I) @LINE: 6597
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 6528
+(I) @LINE: 6598
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 6527
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 6528
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 6473
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 6474
@@ -6604,11 +6646,15 @@
 TEST.NEW
 TEST.NAME:processReceivedMessage.032
 TEST.IMPORT_FAILURES:
-(I) @LINE: 6574
+(I) @LINE: 6648
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 6575
+(I) @LINE: 6649
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 6574
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 6575
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 6516
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 6517
@@ -6655,11 +6701,15 @@
 TEST.NEW
 TEST.NAME:processReceivedMessage.033
 TEST.IMPORT_FAILURES:
-(I) @LINE: 6621
+(I) @LINE: 6699
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 6622
+(I) @LINE: 6700
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 6621
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 6622
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 6559
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 6560
@@ -7325,11 +7375,15 @@
 TEST.NEW
 TEST.NAME:processReceivedMessage.052
 TEST.IMPORT_FAILURES:
-(I) @LINE: 7294
+(I) @LINE: 7376
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
-(I) @LINE: 7295
+(I) @LINE: 7377
     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
 (E) Errors from previous script import(s)
+    >>> (I) @LINE: 7294
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
+    >>> (I) @LINE: 7295
+    >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 7228
     >>>     >>> 'TRUE' was specified as a macro, but it is in the symbol dictionary.
     >>> (I) @LINE: 7229
@@ -8656,10 +8710,13 @@
 TEST.NEW
 TEST.NAME:sendACKMsg
 TEST.IMPORT_FAILURES:
-(E) @LINE: 8723 TEST.ATTRIBUTES:SystemComm.processReceivedMessage.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 8802 TEST.ATTRIBUTES:SystemComm.processReceivedMessage.message[0].hdr.msgID::INPUT_BASE=16
     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>> Read:     msgID::INPUT_BASE=16
 (E) Errors from previous script import(s)
+    >>> (E) @LINE: 8723 TEST.ATTRIBUTES:SystemComm.processReceivedMessage.message[0].hdr.msgID::INPUT_BASE=16
+    >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
+    >>>     >>> Read:     msgID::INPUT_BASE=16
     >>> (E) @LINE: 8654 TEST.ATTRIBUTES:SystemComm.processReceivedMessage.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16