Index: vectorcast/Hercules_RM46_HD_Project.vcm
===================================================================
diff -u -r093d127f4e5acc9861a574c4f85addd4922a5f3d -rd40825a3f9a6e9a246f79233c6734d935711fcbf
--- vectorcast/Hercules_RM46_HD_Project.vcm	(.../Hercules_RM46_HD_Project.vcm)	(revision 093d127f4e5acc9861a574c4f85addd4922a5f3d)
+++ vectorcast/Hercules_RM46_HD_Project.vcm	(.../Hercules_RM46_HD_Project.vcm)	(revision d40825a3f9a6e9a246f79233c6734d935711fcbf)
@@ -181,27 +181,69 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/3157600406</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_BATTERY.C" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3554340465</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_BLOOD_LEAK" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2200246325</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_BLOOD_PRIME" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2987612210</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_BLOODFLOW" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
       <original-environment-directory>Hercules_RM46_HD_Project/build/397690850</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_BUBBLE" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3684475969</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_BUTTONS" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
       <original-environment-directory>Hercules_RM46_HD_Project/build/3621120736</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_COMM" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3021989839</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_COMMBUFFERS" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
       <original-environment-directory>Hercules_RM46_HD_Project/build/925127052</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_CONSUMABLESELFTEST" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1182616356</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_CPLD" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -237,13 +279,90 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/881240764</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_FANS" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1484608599</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_FLUIDLEAK" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2015894543</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_FPGA" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
       <original-environment-directory>Hercules_RM46_HD_Project/build/1233794524</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_INTERNALADC" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1038247615</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_INTERRUPTS" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/4004027276</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_MESSAGESUPPORT" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/629047261</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_MODEFAULT" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1857259845</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_MODEINITPOST" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/870444373</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_MODEPOSTTREAT" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3535542678</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_MODEPRETREAT" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1489226778</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_MODESERVICE" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2992439270</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_MODESTANDBY" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3455664807</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_MODETREATMENT" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -269,7 +388,7 @@
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
-      <original-environment-directory>Hercules_RM46_HD_Project/build/1776554132</original-environment-directory>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3944844757</original-environment-directory>
     </config>
   </environment>
   <environment name="INT_OPERATIONMODES" type="UNIT">
@@ -279,18 +398,53 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/553544110</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_PERSISTENTALARM" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/729594216</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_PICONTROLLERS" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1708890676</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_PRESOCCL" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
       <original-environment-directory>Hercules_RM46_HD_Project/build/3460059472</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_PRETREATMENTRECIRC" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3595911410</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_PRIME" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1575047320</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_RINSEBACK" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/4008737794</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_RTC" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
-      <original-environment-directory>Hercules_RM46_HD_Project/build/2486627120</original-environment-directory>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1213835085</original-environment-directory>
     </config>
   </environment>
   <environment name="INT_SAFETYSHUTDOWN" type="UNIT">
@@ -300,6 +454,34 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/690517471</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_SAMPLEWATER" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2636298143</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_SELFTESTS" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2746880602</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_SWITCHES" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/4097727136</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_SYRINGEPUMP" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3054572554</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_SYSTEMCOMM" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -314,13 +496,69 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/2381647150</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_TASKBG" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/210383698</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_TASKGENERAL" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2343674889</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_TASKPRIORITY" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3059250263</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_TASKTIMERS" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2714292386</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_TEMPERATURES" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3773026229</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_TIMERS" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
       <original-environment-directory>Hercules_RM46_HD_Project/build/189936646</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_TREATMENTEND" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2666960384</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_TREATMENTRECIRC" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1615003905</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="INT_TREATMENTSTOP" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1052819393</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_UTILITIES" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -335,6 +573,13 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/3585417238</original-environment-directory>
     </config>
   </environment>
+  <environment name="INT_VOLTAGES" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/427268200</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INT_WATCHDOGMGMT" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -635,28 +880,63 @@
     <environment name="INT_AIRTRAP"/>
     <environment name="INT_ALARMLAMP"/>
     <environment name="INT_ALARMMGMT"/>
+    <environment name="INT_BATTERY.C"/>
+    <environment name="INT_BLOOD_LEAK"/>
+    <environment name="INT_BLOOD_PRIME"/>
     <environment name="INT_BLOODFLOW"/>
+    <environment name="INT_BUBBLE"/>
     <environment name="INT_BUTTONS"/>
+    <environment name="INT_COMM"/>
     <environment name="INT_COMMBUFFERS"/>
+    <environment name="INT_CONSUMABLESELFTEST"/>
     <environment name="INT_CPLD"/>
     <environment name="INT_DGINTERFACE"/>
     <environment name="INT_DIALINFLOW"/>
     <environment name="INT_DIALOUTFLOW"/>
     <environment name="INT_DIALYSIS"/>
+    <environment name="INT_FANS"/>
+    <environment name="INT_FLUIDLEAK"/>
     <environment name="INT_FPGA"/>
+    <environment name="INT_INTERNALADC"/>
+    <environment name="INT_INTERRUPTS"/>
+    <environment name="INT_MESSAGESUPPORT"/>
+    <environment name="INT_MODEFAULT"/>
+    <environment name="INT_MODEINITPOST"/>
+    <environment name="INT_MODEPOSTTREAT"/>
+    <environment name="INT_MODEPRETREAT"/>
+    <environment name="INT_MODESERVICE"/>
+    <environment name="INT_MODESTANDBY"/>
     <environment name="INT_MODETREATMENT"/>
     <environment name="INT_MODETREATMENTPARAMS"/>
     <environment name="INT_MSGQUEUES"/>
     <environment name="INT_NVDATAMGMT"/>
     <environment name="INT_OPERATIONMODES"/>
+    <environment name="INT_PERSISTENTALARM"/>
+    <environment name="INT_PICONTROLLERS"/>
     <environment name="INT_PRESOCCL"/>
+    <environment name="INT_PRETREATMENTRECIRC"/>
+    <environment name="INT_PRIME"/>
+    <environment name="INT_RINSEBACK"/>
     <environment name="INT_RTC"/>
     <environment name="INT_SAFETYSHUTDOWN"/>
+    <environment name="INT_SAMPLEWATER"/>
+    <environment name="INT_SELFTESTS"/>
+    <environment name="INT_SWITCHES"/>
+    <environment name="INT_SYRINGEPUMP"/>
     <environment name="INT_SYSTEMCOMM"/>
     <environment name="INT_SYSTEMCOMMMESSAGES"/>
+    <environment name="INT_TASKBG"/>
+    <environment name="INT_TASKGENERAL"/>
+    <environment name="INT_TASKPRIORITY"/>
+    <environment name="INT_TASKTIMERS"/>
+    <environment name="INT_TEMPERATURES"/>
     <environment name="INT_TIMERS"/>
+    <environment name="INT_TREATMENTEND"/>
+    <environment name="INT_TREATMENTRECIRC"/>
+    <environment name="INT_TREATMENTSTOP"/>
     <environment name="INT_UTILITIES"/>
     <environment name="INT_VALVES"/>
+    <environment name="INT_VOLTAGES"/>
     <environment name="INT_WATCHDOGMGMT"/>
   </group>
   <group name="Linux_unit_testing_environments">