Index: vectorcast/CCAST_.CFG
===================================================================
diff -u -r52ff06dd2dbffc091d5b62cfa52546b52b2a5815 -ra2eebec109bd5c10c0741d7db8e4f16da321c50e
--- vectorcast/CCAST_.CFG	(.../CCAST_.CFG)	(revision 52ff06dd2dbffc091d5b62cfa52546b52b2a5815)
+++ vectorcast/CCAST_.CFG	(.../CCAST_.CFG)	(revision a2eebec109bd5c10c0741d7db8e4f16da321c50e)
@@ -111,3 +111,5 @@
 TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/App/Modes/
 TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/App/Services/
 TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/App/Tasks/
+TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/FWCommon/
+TESTABLE_SOURCE_DIR: $(VCAST_SRC_DIR)/Common/
Index: vectorcast/Hercules_RM46_HD_Project.vcm
===================================================================
diff -u -r1c80d60fe6a95297a8a8033a3c7eade53e72779a -ra2eebec109bd5c10c0741d7db8e4f16da321c50e
--- 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 a2eebec109bd5c10c0741d7db8e4f16da321c50e)
@@ -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">
Index: vectorcast/Hercules_RM46_HD_Project/project.db
===================================================================
diff -u -r1c80d60fe6a95297a8a8033a3c7eade53e72779a -ra2eebec109bd5c10c0741d7db8e4f16da321c50e
Binary files differ