Index: vectorcast/Hercules_RM46_HD_Project.vcm
===================================================================
diff -u -r7478d513d7493d08484a880f5cd6c296c9616e70 -r03470d87fbf22b8c94ce6018533d6ed2b03f0500
--- vectorcast/Hercules_RM46_HD_Project.vcm	(.../Hercules_RM46_HD_Project.vcm)	(revision 7478d513d7493d08484a880f5cd6c296c9616e70)
+++ vectorcast/Hercules_RM46_HD_Project.vcm	(.../Hercules_RM46_HD_Project.vcm)	(revision 03470d87fbf22b8c94ce6018533d6ed2b03f0500)
@@ -153,6 +153,13 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/1233794524</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_MODETREATMENT" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/4003473575</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_MSGQUEUES" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -318,6 +325,7 @@
     <environment name="INT_DIALOUTFLOW"/>
     <environment name="INT_DIALYSIS"/>
     <environment name="INT_FPGA"/>
+    <environment name="INT_MODETREATMENT"/>
     <environment name="INT_MSGQUEUES"/>
     <environment name="INT_NVDATAMGMT"/>
     <environment name="INT_OPERATIONMODES"/>
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALYSIS/INT_DIALYSIS.tst
===================================================================
diff -u -rfb4b4a4f9d16742bfb76f62970a43c97e1ac14f0 -r03470d87fbf22b8c94ce6018533d6ed2b03f0500
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALYSIS/INT_DIALYSIS.tst	(.../INT_DIALYSIS.tst)	(revision fb4b4a4f9d16742bfb76f62970a43c97e1ac14f0)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_DIALYSIS/INT_DIALYSIS.tst	(.../INT_DIALYSIS.tst)	(revision 03470d87fbf22b8c94ce6018533d6ed2b03f0500)
@@ -156,15 +156,16 @@
 TEST.NEW
 TEST.NAME:resumeUF
 TEST.IMPORT_FAILURES:
-(E) @LINE: 166 TEST.VALUE:ModeTreatment.verifyUFSettingsConfirmation.confirmed:1
-    >>> Unknown parameter/object name confirmed
-    >>> Value Line Error - Command Ignored
-(E) @LINE: 168 TEST.VALUE:ModeTreatment.verifyUFSettingsConfirmation.treatmentTime:300
-    >>> Unknown parameter/object name treatmentTime
-    >>> Value Line Error - Command Ignored
-(E) @LINE: 169 TEST.VALUE:ModeTreatment.verifyUFSettingsConfirmation.uFRate:10.0
-    >>> Unknown parameter/object name uFRate
-    >>> Value Line Error - Command Ignored
+(E) Errors from previous script import(s)
+    >>> (E) @LINE: 166 TEST.VALUE:ModeTreatment.verifyUFSettingsConfirmation.confirmed:1
+    >>>     >>> Unknown parameter/object name confirmed
+    >>>     >>> Value Line Error - Command Ignored
+    >>> (E) @LINE: 168 TEST.VALUE:ModeTreatment.verifyUFSettingsConfirmation.treatmentTime:300
+    >>>     >>> Unknown parameter/object name treatmentTime
+    >>>     >>> Value Line Error - Command Ignored
+    >>> (E) @LINE: 169 TEST.VALUE:ModeTreatment.verifyUFSettingsConfirmation.uFRate:10.0
+    >>>     >>> Unknown parameter/object name uFRate
+    >>>     >>> Value Line Error - Command Ignored
 TEST.END_IMPORT_FAILURES:
 TEST.VALUE:Dialysis.<<GLOBAL>>.currentDialysisState:DIALYSIS_UF_STATE
 TEST.VALUE:Dialysis.<<GLOBAL>>.currentUFState:UF_PAUSED_STATE
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.cfg
===================================================================
diff -u
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.cfg	(revision 0)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.cfg	(revision 03470d87fbf22b8c94ce6018533d6ed2b03f0500)
@@ -0,0 +1 @@

\ No newline at end of file
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.env
===================================================================
diff -u
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.env	(revision 0)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.env	(revision 03470d87fbf22b8c94ce6018533d6ed2b03f0500)
@@ -0,0 +1,23 @@
+ENVIRO.NEW
+ENVIRO.NAME:INT_MODETREATMENT
+ENVIRO.STUB_BY_FUNCTION:Dialysis
+ENVIRO.STUB_BY_FUNCTION:ModeTreatment
+ENVIRO.STUB_BY_FUNCTION:OperationModes
+ENVIRO.STUB_BY_FUNCTION:SystemCommMessages
+ENVIRO.MAX_VARY_RANGE: 20
+ENVIRO.STUB: ALL_BY_PROTOTYPE
+ENVIRO.TYPE_HANDLED_DIRS_ALLOWED:
+ENVIRO.LIBRARY_STUBS:
+ENVIRO.COVERAGE_TYPE: FUNCTION
+ENVIRO.WHITE_BOX: YES
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/include/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/source/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Controllers/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Drivers/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Modes/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Services/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Tasks/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/FWCommon/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/Common/
+ENVIRO.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.mfg
===================================================================
diff -u
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.mfg	(revision 0)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.mfg	(revision 03470d87fbf22b8c94ce6018533d6ed2b03f0500)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manage-config-options version="7">
+  <config>
+    <key>COVERAGE_TYPE</key>
+    <value>FUNCTION</value>
+  </config>
+</manage-config-options>
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.tst
===================================================================
diff -u
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.tst	(revision 0)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENT/INT_MODETREATMENT.tst	(revision 03470d87fbf22b8c94ce6018533d6ed2b03f0500)
@@ -0,0 +1,165 @@
+-- VectorCAST 19.sp3 (11/13/19)
+-- Test Case Script
+-- 
+-- Environment    : INT_MODETREATMENT
+-- Unit(s) Under Test: Dialysis ModeTreatment OperationModes SystemCommMessages
+-- 
+-- Script Features
+TEST.SCRIPT_FEATURE:C_DIRECT_ARRAY_INDEXING
+TEST.SCRIPT_FEATURE:CPP_CLASS_OBJECT_REVISION
+TEST.SCRIPT_FEATURE:MULTIPLE_UUT_SUPPORT
+TEST.SCRIPT_FEATURE:MIXED_CASE_NAMES
+TEST.SCRIPT_FEATURE:STATIC_HEADER_FUNCS_IN_UUTS
+TEST.SCRIPT_FEATURE:VCAST_MAIN_NOT_RENAMED
+--
+
+-- Unit: Dialysis
+
+-- Subprogram: pauseUF
+
+-- Test Case: getTreatmentState
+TEST.UNIT:Dialysis
+TEST.SUBPROGRAM:pauseUF
+TEST.NEW
+TEST.NAME:getTreatmentState
+TEST.VALUE:Dialysis.<<GLOBAL>>.currentDialysisState:DIALYSIS_UF_STATE
+TEST.VALUE:Dialysis.<<GLOBAL>>.currentUFState:UF_RUNNING_STATE
+TEST.VALUE:uut_prototype_stubs.setDialOutPumpTargetRate.return:1
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.currentTreatmentState:TREATMENT_DIALYSIS_STATE
+TEST.VALUE:OperationModes.<<GLOBAL>>.currentMode:MODE_TREA
+TEST.EXPECTED:Dialysis.<<GLOBAL>>.currentUFState:UF_PAUSED_STATE
+TEST.EXPECTED:Dialysis.pauseUF.return:1
+TEST.END
+
+-- Unit: OperationModes
+
+-- Subprogram: execOperationModes
+
+-- Test Case: transitionToTreatmentModeAndexecTreatmentMode
+TEST.UNIT:OperationModes
+TEST.SUBPROGRAM:execOperationModes
+TEST.NEW
+TEST.NAME:transitionToTreatmentModeAndexecTreatmentMode
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.currentTreatmentState:TREATMENT_RECIRC_SETUP_STATE
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.treatmentParamsRangesBroadcastTimerCtr:9
+TEST.VALUE:OperationModes.<<GLOBAL>>.modeRequest[7]:1
+TEST.VALUE:OperationModes.<<GLOBAL>>.currentMode:MODE_PRET
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.currentTreatmentState:TREATMENT_DIALYSIS_STATE
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.treatmentParamsRangesBroadcastTimerCtr:0
+TEST.EXPECTED:OperationModes.<<GLOBAL>>.modeRequest[7]:0
+TEST.EXPECTED:OperationModes.<<GLOBAL>>.currentMode:MODE_TREA
+TEST.END
+
+-- Subprogram: initOperationModes
+
+-- Test Case: initTreatmentMode
+TEST.UNIT:OperationModes
+TEST.SUBPROGRAM:initOperationModes
+TEST.NEW
+TEST.NAME:initTreatmentMode
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.currentTreatmentState:TREATMENT_RECIRC_SETUP_STATE
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.presTreatmentTimeSecs:9
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.presBloodFlowRate:9
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.presDialysateFlowRate:9
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.presMaxUFVolumeML:9.0
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.presUFRate:9.0
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.treatmentTimeMS:9
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.lastTreatmentTimeStamp:9
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.treatmentTimeBroadcastTimerCtr:9
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.treatmentParamsRangesBroadcastTimerCtr:9
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.currentTreatmentState:TREATMENT_START_STATE
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.presTreatmentTimeSecs:0
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.presBloodFlowRate:0
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.presDialysateFlowRate:0
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.presMaxUFVolumeML:0.0
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.presUFRate:0.0
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.treatmentTimeMS:0
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.lastTreatmentTimeStamp:0
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.treatmentTimeBroadcastTimerCtr:0
+TEST.EXPECTED:ModeTreatment.<<GLOBAL>>.treatmentParamsRangesBroadcastTimerCtr:1200
+TEST.END
+
+-- Unit: SystemCommMessages
+
+-- Subprogram: handleChangeBloodDialysateRateChangeRequest
+
+-- Test Case: verifyBloodAndDialysateRateSettingsChange
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleChangeBloodDialysateRateChangeRequest
+TEST.NEW
+TEST.NAME:verifyBloodAndDialysateRateSettingsChange
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.currentTreatmentState:TREATMENT_START_STATE
+TEST.VALUE:SystemCommMessages.<<GLOBAL>>.nextSeqNo:1
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message:<<malloc 1>>
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message[0].hdr.msgID:0x17
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message[0].payload[0]:200
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message[0].payload[4]:250
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleChangeBloodDialysateRateChangeRequest.message[0].payload[7]:0
+TEST.EXPECTED:SystemCommMessages.<<GLOBAL>>.nextSeqNo:2
+TEST.END
+
+-- Subprogram: handleChangeTreatmentDurationRequest
+
+-- Test Case: verifyTreatmentDurationSettingChange
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleChangeTreatmentDurationRequest
+TEST.NEW
+TEST.NAME:verifyTreatmentDurationSettingChange
+TEST.VALUE:ModeTreatment.<<GLOBAL>>.currentTreatmentState:TREATMENT_START_STATE
+TEST.VALUE:SystemCommMessages.<<GLOBAL>>.nextSeqNo:1
+TEST.VALUE:SystemCommMessages.handleChangeTreatmentDurationRequest.message:<<malloc 1>>
+TEST.VALUE:SystemCommMessages.handleChangeTreatmentDurationRequest.message[0].hdr.msgID:0x16
+TEST.VALUE:SystemCommMessages.handleChangeTreatmentDurationRequest.message[0].hdr.payloadLen:4
+TEST.VALUE:SystemCommMessages.handleChangeTreatmentDurationRequest.message[0].payload[0]:240
+TEST.VALUE:SystemCommMessages.handleChangeTreatmentDurationRequest.message[0].payload[1]:0
+TEST.VALUE:SystemCommMessages.handleChangeTreatmentDurationRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleChangeTreatmentDurationRequest.message[0].payload[3]:0
+TEST.EXPECTED:SystemCommMessages.<<GLOBAL>>.nextSeqNo:2
+TEST.END
+
+-- Subprogram: handleChangeUFSettingsConfirmation
+
+-- Test Case: verifyUFSettingsConfirmation
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleChangeUFSettingsConfirmation
+TEST.NEW
+TEST.NAME:verifyUFSettingsConfirmation
+TEST.VALUE:SystemCommMessages.<<GLOBAL>>.nextSeqNo:1
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message:<<malloc 1>>
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message[0].hdr.msgID:0x15
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message[0].hdr.payloadLen:8
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message[0].payload[1]:4
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message[0].payload[3]:0
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message[0].payload[4]:0
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message[0].payload[5]:0
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message[0].payload[6]:0
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsConfirmation.message[0].payload[7]:0
+TEST.EXPECTED:SystemCommMessages.<<GLOBAL>>.nextSeqNo:2
+TEST.ATTRIBUTES:SystemCommMessages.handleChangeUFSettingsRequest.message[0].hdr.msgID:INPUT_BASE=16
+TEST.END
+
+-- Subprogram: handleChangeUFSettingsRequest
+
+-- Test Case: verifyUFSettingsChange
+TEST.UNIT:SystemCommMessages
+TEST.SUBPROGRAM:handleChangeUFSettingsRequest
+TEST.NEW
+TEST.NAME:verifyUFSettingsChange
+TEST.VALUE:SystemCommMessages.<<GLOBAL>>.nextSeqNo:1
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsRequest.message:<<malloc 1>>
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsRequest.message[0].hdr.msgID:0x11
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsRequest.message[0].hdr.payloadLen:4
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsRequest.message[0].payload[0]:0
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsRequest.message[0].payload[1]:4
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsRequest.message[0].payload[2]:0
+TEST.VALUE:SystemCommMessages.handleChangeUFSettingsRequest.message[0].payload[3]:0
+TEST.EXPECTED:SystemCommMessages.<<GLOBAL>>.nextSeqNo:2
+TEST.END
Index: vectorcast/Hercules_RM46_HD_Project/project.db
===================================================================
diff -u -rfb4b4a4f9d16742bfb76f62970a43c97e1ac14f0 -r03470d87fbf22b8c94ce6018533d6ed2b03f0500
Binary files differ