Index: vectorcast/Hercules_RM46_HD_Project/environment/SYSTEMCOMMMESSAGES/SYSTEMCOMMMESSAGES.tst
===================================================================
diff -u -r24af8f092b38b9f987515d31b053fd939d0a95eb -r2e3cfa3d479e83e6cafe2c028e6a45e9c7642256
--- vectorcast/Hercules_RM46_HD_Project/environment/SYSTEMCOMMMESSAGES/SYSTEMCOMMMESSAGES.tst	(.../SYSTEMCOMMMESSAGES.tst)	(revision 24af8f092b38b9f987515d31b053fd939d0a95eb)
+++ vectorcast/Hercules_RM46_HD_Project/environment/SYSTEMCOMMMESSAGES/SYSTEMCOMMMESSAGES.tst	(.../SYSTEMCOMMMESSAGES.tst)	(revision 2e3cfa3d479e83e6cafe2c028e6a45e9c7642256)
@@ -80,10 +80,13 @@
 TEST.NEW
 TEST.NAME:broadcastAlarmStatus_ComplimentaryFlags
 TEST.IMPORT_FAILURES:
-(E) @LINE: 186 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpOcclusionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 189 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpOcclusionOverrideRequest.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: 186 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpOcclusionOverrideRequest.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: 183 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpOcclusionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -1701,10 +1704,13 @@
 TEST.NEW
 TEST.NAME:handleDGOpMode_InvalidPayloadLength
 TEST.IMPORT_FAILURES:
-(E) @LINE: 1769 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpOcclusionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 1775 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpOcclusionOverrideRequest.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: 1769 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpOcclusionOverrideRequest.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: 1763 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodPumpOcclusionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -3392,10 +3398,13 @@
 TEST.NEW
 TEST.NAME:handleHomeHDValve_Home_VBA
 TEST.IMPORT_FAILURES:
-(E) @LINE: 3447 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 3493 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 3447 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 3438 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -3499,10 +3508,13 @@
 TEST.NEW
 TEST.NAME:handleHomeHDValve_Invalid_Payload_Len
 TEST.IMPORT_FAILURES:
-(E) @LINE: 3559 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 3608 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 3559 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 3547 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -4493,10 +4505,13 @@
 TEST.NEW
 TEST.NAME:handleSetAirTrapValve_Invalid_Payload_Len
 TEST.IMPORT_FAILURES:
-(E) @LINE: 4549 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 4601 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 4549 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 4534 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -4607,10 +4622,13 @@
 TEST.NEW
 TEST.NAME:handleSetAirTrapValve_Set_Valve
 TEST.IMPORT_FAILURES:
-(E) @LINE: 4666 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 4721 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 4666 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 4648 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -7477,10 +7495,13 @@
 TEST.NEW
 TEST.NAME:handleTestArterialPressureOverrideRequest_InvalidPayloadLen
 TEST.IMPORT_FAILURES:
-(E) @LINE: 7469 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 7564 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.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: 7469 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.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: 6667 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -7574,10 +7595,13 @@
 TEST.NEW
 TEST.NAME:handleTestArterialPressureOverrideRequest_Override
 TEST.IMPORT_FAILURES:
-(E) @LINE: 7578 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 7676 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.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: 7578 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.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: 6773 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -7686,10 +7710,13 @@
 TEST.NEW
 TEST.NAME:handleTestArterialPressureOverrideRequest_Reset
 TEST.IMPORT_FAILURES:
-(E) @LINE: 7623 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 7724 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.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: 7623 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.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: 6815 TEST.ATTRIBUTES:SystemCommMessages.handleTestAlarmTimeOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -8340,10 +8367,13 @@
 TEST.NEW
 TEST.NAME:handleTestBloodPumpMeasuredSpeedOverrideRequest_Override
 TEST.IMPORT_FAILURES:
-(E) @LINE: 8341 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 8445 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.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: 8341 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.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: 7530 TEST.ATTRIBUTES:SystemCommMessages.handleTestBloodFlowMeasuredOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -11314,10 +11344,13 @@
 TEST.NEW
 TEST.NAME:handleTestHDValvesBroadcastIntervalOverrideRequest_Invalid_Payload_Len
 TEST.IMPORT_FAILURES:
-(E) @LINE: 11315 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 11422 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 11315 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 10501 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -11428,10 +11461,13 @@
 TEST.NEW
 TEST.NAME:handleTestHDValvesBroadcastIntervalOverrideRequest_Override
 TEST.IMPORT_FAILURES:
-(E) @LINE: 11438 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 11548 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 11438 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 10621 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -11554,10 +11590,13 @@
 TEST.NEW
 TEST.NAME:handleTestHDValvesBroadcastIntervalOverrideRequest_Reset
 TEST.IMPORT_FAILURES:
-(E) @LINE: 11559 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 11672 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 11559 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.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: 10739 TEST.ATTRIBUTES:SystemCommMessages.handleSetHDValvePositionOverrideRequest.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16
@@ -16654,15 +16693,26 @@
 
 -- Subprogram: sendInstitutionalRecordToUI
 
--- Test Case: sendInstitutionalRecordToUI.001
+-- Test Case: sendInstitutionalRecordToUI_payload_0
 TEST.UNIT:SystemCommMessages
 TEST.SUBPROGRAM:sendInstitutionalRecordToUI
 TEST.NEW
-TEST.NAME:sendInstitutionalRecordToUI.001
+TEST.NAME:sendInstitutionalRecordToUI_payload_0
 TEST.VALUE:SystemCommMessages.sendInstitutionalRecordToUI.message:<<malloc 1>>
+TEST.VALUE:SystemCommMessages.sendInstitutionalRecordToUI.message[0].hdr.payloadLen:0
 TEST.EXPECTED:uut_prototype_stubs.getNVRecord2Driver.nvData:GET_INSTITUTIONAL_RECORD
 TEST.END
 
+-- Test Case: sendInstitutionalRecordToUI_payload_not_0
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:sendInstitutionalRecordToUI
+TEST.NEW
+TEST.NAME:sendInstitutionalRecordToUI_payload_not_0
+TEST.VALUE:SystemCommMessages.sendInstitutionalRecordToUI.message:<<malloc 1>>
+TEST.VALUE:SystemCommMessages.sendInstitutionalRecordToUI.message[0].hdr.payloadLen:5
+TEST.EXPECTED:SystemCommMessages.sendInstitutionalRecordToUI.message[0].hdr.payloadLen:5
+TEST.END
+
 -- Subprogram: sendOffButtonMsgToUI
 
 -- Test Case: sendOffButtonMsgToUI_NominalPath
@@ -17293,10 +17343,13 @@
 TEST.NEW
 TEST.NAME:sendUIRequestPOSTFinalResult.001
 TEST.IMPORT_FAILURES:
-(E) @LINE: 17211 TEST.ATTRIBUTES:SystemCommMessages.handleDGReservoirData.message[0].hdr.msgID::INPUT_BASE=16
+(E) @LINE: 17351 TEST.ATTRIBUTES:SystemCommMessages.handleDGReservoirData.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: 17211 TEST.ATTRIBUTES:SystemCommMessages.handleDGReservoirData.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: 16388 TEST.ATTRIBUTES:SystemCommMessages.handleDGReservoirData.message[0].hdr.msgID::INPUT_BASE=16
     >>>     >>> Expected a field name from the record type MESSAGE_HEADER_T
     >>>     >>> Read:     msgID::INPUT_BASE=16