Index: vectorcast/Hercules_RM46_HD_Project.vcm
===================================================================
diff -u -r8910c1a21976afcc84fe1d9504916efbc192325d -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359
--- vectorcast/Hercules_RM46_HD_Project.vcm	(.../Hercules_RM46_HD_Project.vcm)	(revision 8910c1a21976afcc84fe1d9504916efbc192325d)
+++ vectorcast/Hercules_RM46_HD_Project.vcm	(.../Hercules_RM46_HD_Project.vcm)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
@@ -34,13 +34,41 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/951818791</original-environment-directory>
     </config>
   </environment>
+  <environment name="BATTERY" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3730320746</original-environment-directory>
+    </config>
+  </environment>
   <environment name="BLOODFLOW" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
       <original-environment-directory>Hercules_RM46_HD_Project/build/2470114643</original-environment-directory>
     </config>
   </environment>
+  <environment name="BLOODLEAK" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2620360982</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="BLOODPRIME" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/275456977</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="BUBBLE" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1181812703</original-environment-directory>
+    </config>
+  </environment>
   <environment name="BUTTONS" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -62,6 +90,13 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/4019558491</original-environment-directory>
     </config>
   </environment>
+  <environment name="CONSUMABLESELFTEST" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1389028807</original-environment-directory>
+    </config>
+  </environment>
   <environment name="CPLD" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -97,6 +132,20 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/74827183</original-environment-directory>
     </config>
   </environment>
+  <environment name="FANS" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/961154289</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="FLUIDLEAK" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3560241287</original-environment-directory>
+    </config>
+  </environment>
   <environment name="FPGA" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -293,13 +342,69 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/1429379182</original-environment-directory>
     </config>
   </environment>
+  <environment name="INTERNALADC" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1776287361</original-environment-directory>
+    </config>
+  </environment>
   <environment name="INTERRUPTS" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
       <original-environment-directory>Hercules_RM46_HD_Project/build/3499035493</original-environment-directory>
     </config>
   </environment>
+  <environment name="MESSAGESUPPORT" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3933993744</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="MODEFAULT" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3266276813</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="MODEINITPOST" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/4074032486</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="MODEPOSTTREAT" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1840074144</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="MODEPRETREAT" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2583096361</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="MODESERVICE" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3865143256</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="MODESTANDBY" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2579815065</original-environment-directory>
+    </config>
+  </environment>
   <environment name="MODETREATMENT" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -335,6 +440,13 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/241608158</original-environment-directory>
     </config>
   </environment>
+  <environment name="PERSISTENTALARM" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3462791905</original-environment-directory>
+    </config>
+  </environment>
   <environment name="PICONTROLLERS" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -349,6 +461,27 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/4274994755</original-environment-directory>
     </config>
   </environment>
+  <environment name="PRETREATMENTRECIRC" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3269651985</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="PRIME" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1647665437</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="RINSEBACK" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1122801802</original-environment-directory>
+    </config>
+  </environment>
   <environment name="RTC" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -363,6 +496,34 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/129022383</original-environment-directory>
     </config>
   </environment>
+  <environment name="SAMPLEWATER" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3374264225</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="SELFTESTS" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/262600402</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="SWITCHES" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1411617419</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="SYRINGEPUMP" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3794570292</original-environment-directory>
+    </config>
+  </environment>
   <environment name="SYSTEMCOMM" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -377,13 +538,69 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/456249163</original-environment-directory>
     </config>
   </environment>
+  <environment name="TASKBG" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2439483596</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="TASKGENERAL" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3750509623</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="TASKPRIORITY" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2003653732</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="TASKTIMER" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3124054108</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="TEMPERATURES" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/567734150</original-environment-directory>
+    </config>
+  </environment>
   <environment name="TIMERS" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
     <config>
       <original-environment-directory>Hercules_RM46_HD_Project/build/4061569705</original-environment-directory>
     </config>
   </environment>
+  <environment name="TREATMENTEND" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/1606661683</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="TREATMENTRECIRC" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2237250184</original-environment-directory>
+    </config>
+  </environment>
+  <environment name="TREATMENTSTOP" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2178018295</original-environment-directory>
+    </config>
+  </environment>
   <environment name="UTILITIES" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -398,6 +615,13 @@
       <original-environment-directory>Hercules_RM46_HD_Project/build/754038457</original-environment-directory>
     </config>
   </environment>
+  <environment name="VOLTAGES" type="UNIT">
+    <language>1</language>
+    <is-monitored>0</is-monitored>
+    <config>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/3110752323</original-environment-directory>
+    </config>
+  </environment>
   <environment name="WATCHDOGMGMT" type="UNIT">
     <language>1</language>
     <is-monitored>0</is-monitored>
@@ -440,31 +664,63 @@
     <environment name="AIRTRAP"/>
     <environment name="ALARMLAMP"/>
     <environment name="ALARMMGMT"/>
+    <environment name="BATTERY"/>
     <environment name="BLOODFLOW"/>
+    <environment name="BLOODLEAK"/>
+    <environment name="BLOODPRIME"/>
+    <environment name="BUBBLE"/>
     <environment name="BUTTONS"/>
     <environment name="COMM"/>
     <environment name="COMMBUFFERS"/>
+    <environment name="CONSUMABLESELFTEST"/>
     <environment name="CPLD"/>
     <environment name="DGINTERFACE"/>
     <environment name="DIALINFLOW"/>
     <environment name="DIALOUTFLOW"/>
     <environment name="DIALYSIS"/>
+    <environment name="FANS"/>
+    <environment name="FLUIDLEAK"/>
     <environment name="FPGA"/>
+    <environment name="INTERNALADC"/>
     <environment name="INTERRUPTS"/>
+    <environment name="MESSAGESUPPORT"/>
+    <environment name="MODEFAULT"/>
+    <environment name="MODEINITPOST"/>
+    <environment name="MODEPOSTTREAT"/>
+    <environment name="MODEPRETREAT"/>
+    <environment name="MODESERVICE"/>
+    <environment name="MODESTANDBY"/>
     <environment name="MODETREATMENT"/>
     <environment name="MODETREATMENTPARAMS"/>
     <environment name="MSGQUEUES"/>
     <environment name="NVDATAMGMT"/>
     <environment name="OPERATIONMODES"/>
+    <environment name="PERSISTENTALARM"/>
     <environment name="PICONTROLLERS"/>
     <environment name="PRESOCCL"/>
+    <environment name="PRETREATMENTRECIRC"/>
+    <environment name="PRIME"/>
+    <environment name="RINSEBACK"/>
     <environment name="RTC"/>
     <environment name="SAFETYSHUTDOWN"/>
+    <environment name="SAMPLEWATER"/>
+    <environment name="SELFTESTS"/>
+    <environment name="SWITCHES"/>
+    <environment name="SYRINGEPUMP"/>
     <environment name="SYSTEMCOMM"/>
     <environment name="SYSTEMCOMMMESSAGES"/>
+    <environment name="TASKBG"/>
+    <environment name="TASKGENERAL"/>
+    <environment name="TASKPRIORITY"/>
+    <environment name="TASKTIMER"/>
+    <environment name="TEMPERATURES"/>
     <environment name="TIMERS"/>
+    <environment name="TREATMENTEND"/>
+    <environment name="TREATMENTRECIRC"/>
+    <environment name="TREATMENTSTOP"/>
     <environment name="UTILITIES"/>
     <environment name="VALVES"/>
+    <environment name="VOLTAGES"/>
     <environment name="WATCHDOGMGMT"/>
   </group>
   <group name="MinGW_unit_testing_environments"/>
@@ -531,8 +787,8 @@
         <search-directory type="TESTABLE_SOURCE_DIR">$(VCAST_SRC_DIR)/App/Modes/</search-directory>
         <search-directory type="TESTABLE_SOURCE_DIR">$(VCAST_SRC_DIR)/App/Services/</search-directory>
         <search-directory type="TESTABLE_SOURCE_DIR">$(VCAST_SRC_DIR)/App/Tasks/</search-directory>
-        <search-directory type="TESTABLE_SOURCE_DIR">$(VCAST_SRC_DIR)/FWCommon/</search-directory>
-        <search-directory type="TESTABLE_SOURCE_DIR">$(VCAST_SRC_DIR)/Common/</search-directory>
+        <search-directory type="TESTABLE_SOURCE_DIR">$(VCAST_SRC_DIR)/../../fwcommon/</search-directory>
+        <search-directory type="TESTABLE_SOURCE_DIR">$(VCAST_SRC_DIR)/../../common/</search-directory>
       </config>
     </compiler>
     <testsuite name="LinuxTestSuite">