Index: vectorcast/Hercules_RM46_HD_Project.vcm
===================================================================
diff -u -r1c80d60fe6a95297a8a8033a3c7eade53e72779a -r60a95cb6e1325abd179b4a01d83b8aabe20ccda5
--- vectorcast/Hercules_RM46_HD_Project.vcm	(.../Hercules_RM46_HD_Project.vcm)	(revision 1c80d60fe6a95297a8a8033a3c7eade53e72779a)
+++ vectorcast/Hercules_RM46_HD_Project.vcm	(.../Hercules_RM46_HD_Project.vcm)	(revision 60a95cb6e1325abd179b4a01d83b8aabe20ccda5)
@@ -140,11 +140,10 @@
     </config>
   </environment>
   <environment name="INT_RTC" type="UNIT">
-    <language>2</language>
-    <imported-from-env-script>Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.env</imported-from-env-script>
-    <is-monitored>1</is-monitored>
+    <language>1</language>
+    <is-monitored>0</is-monitored>
     <config>
-      <original-environment-directory>Hercules_RM46_HD_Project/environment/INT_RTC</original-environment-directory>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/2486627120</original-environment-directory>
     </config>
   </environment>
   <environment name="INT_SAFETYSHUTDOWN" type="UNIT">
@@ -211,11 +210,10 @@
     </config>
   </environment>
   <environment name="RTC" type="UNIT">
-    <language>2</language>
-    <imported-from-env-script>Hercules_RM46_HD_Project/environment/RTC/RTC.env</imported-from-env-script>
-    <is-monitored>1</is-monitored>
+    <language>1</language>
+    <is-monitored>0</is-monitored>
     <config>
-      <original-environment-directory>Hercules_RM46_HD_Project/environment/RTC</original-environment-directory>
+      <original-environment-directory>Hercules_RM46_HD_Project/build/428499850</original-environment-directory>
     </config>
   </environment>
   <environment name="SAFETYSHUTDOWN" type="UNIT">
@@ -444,6 +442,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>
       </config>
     </compiler>
     <testsuite name="LinuxTestSuite">