Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.env
===================================================================
diff -u -r60a95cb6e1325abd179b4a01d83b8aabe20ccda5 -re9c54d93900144b1234c344beaf609b5fb9de3bd
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.env	(.../INT_RTC.env)	(revision 60a95cb6e1325abd179b4a01d83b8aabe20ccda5)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.env	(.../INT_RTC.env)	(revision e9c54d93900144b1234c344beaf609b5fb9de3bd)
@@ -1,12 +1,37 @@
 ENVIRO.NEW
 ENVIRO.NAME:INT_RTC
 ENVIRO.STUB_BY_FUNCTION:ModeInitPOST
+ENVIRO.STUB_BY_FUNCTION:NVDataMgmt
 ENVIRO.STUB_BY_FUNCTION:RTC
+ENVIRO.STUB_BY_FUNCTION:SystemComm
 ENVIRO.STUB_BY_FUNCTION:SystemCommMessages
 ENVIRO.STUB_BY_FUNCTION:TaskGeneral
 ENVIRO.STUB_BY_FUNCTION:sys_main
 ENVIRO.MAX_VARY_RANGE: 20
 ENVIRO.STUB: ALL_BY_PROTOTYPE
 ENVIRO.TYPE_HANDLED_DIRS_ALLOWED:
 ENVIRO.LIBRARY_STUBS:
+ENVIRO.UNIT_PREFIX_USER_CODE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:RTC
+#include "reg_mibspi.h"
+mibspiBASE_t* ptr_mibspiREG3;
+mibspiRAM_t* ptr_mibspiRAM3;
+#undef mibspiREG3
+#define mibspiREG3 ptr_mibspiREG3
+#undef mibspiRAM3
+#define mibspiRAM3 ptr_mibspiRAM3
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.END_UNIT_PREFIX_USER_CODE:
+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_RTC/INT_RTC.mfg
===================================================================
diff -u -r609937ae79b4b77a0bd9ac180d38425b0b6922fb -re9c54d93900144b1234c344beaf609b5fb9de3bd
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.mfg	(.../INT_RTC.mfg)	(revision 609937ae79b4b77a0bd9ac180d38425b0b6922fb)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.mfg	(.../INT_RTC.mfg)	(revision e9c54d93900144b1234c344beaf609b5fb9de3bd)
@@ -4,4 +4,5 @@
     <key>COVERAGE_TYPE</key>
     <value>FUNCTION</value>
   </config>
+  <search-directory type="TESTABLE_SOURCE_DIR">$(VCAST_SRC_DIR)/FWCommon/FlashDrvr/</search-directory>
 </manage-config-options>
Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.tst
===================================================================
diff -u -rf8dd49fed5ee3bf0f1704fa614da8b81d952f877 -re9c54d93900144b1234c344beaf609b5fb9de3bd
--- vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.tst	(.../INT_RTC.tst)	(revision f8dd49fed5ee3bf0f1704fa614da8b81d952f877)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INT_RTC/INT_RTC.tst	(.../INT_RTC.tst)	(revision e9c54d93900144b1234c344beaf609b5fb9de3bd)
@@ -2,7 +2,7 @@
 -- Test Case Script
 -- 
 -- Environment    : INT_RTC
--- Unit(s) Under Test: ModeInitPOST RTC SystemCommMessages TaskGeneral sys_main
+-- Unit(s) Under Test: ModeInitPOST NVDataMgmt RTC SystemComm SystemCommMessages TaskGeneral sys_main
 -- 
 -- Script Features
 TEST.SCRIPT_FEATURE:C_DIRECT_ARRAY_INDEXING
@@ -17,13 +17,14 @@
 
 -- Subprogram: execInitAndPOSTMode
 
--- Test Case: execRTCTest
+-- Test Case: execRTCSelfTest
 TEST.UNIT:ModeInitPOST
 TEST.SUBPROGRAM:execInitAndPOSTMode
 TEST.NEW
-TEST.NAME:execRTCTest
+TEST.NAME:execRTCSelfTest
+TEST.VALUE:ModeInitPOST.<<GLOBAL>>.postState:POST_STATE_RTC
 TEST.VALUE:RTC.<<GLOBAL>>.RTCSelfTestState:RTC_SELF_TEST_STATE_START
-TEST.EXPECTED:RTC.<<GLOBAL>>.RTCSelfTestState:RTC_SELF_TEST_STATE_START
+TEST.EXPECTED:RTC.<<GLOBAL>>.RTCSelfTestState:RTC_SELF_TEST_STATE_CHECK_CTRL_REGS
 TEST.EXPECTED:RTC.<<GLOBAL>>.RTCSelfTestResult:SELF_TEST_STATUS_IN_PROGRESS
 TEST.END
 
@@ -36,6 +37,7 @@
 TEST.SUBPROGRAM:taskGeneral
 TEST.NEW
 TEST.NAME:execRTC
+TEST.VALUE:SystemComm.<<GLOBAL>>.uiDidCommunicate:1
 TEST.VALUE:RTC.<<GLOBAL>>.RTCExecState:RTC_EXEC_STATE_IDLE
 TEST.EXPECTED:RTC.<<GLOBAL>>.RTCExecState:RTC_EXEC_STATE_IDLE
 TEST.END
Index: vectorcast/Hercules_RM46_HD_Project/project.db
===================================================================
diff -u -rf30d00352903245cbbc5fb4926a392e51e2c6c22 -re9c54d93900144b1234c344beaf609b5fb9de3bd
Binary files differ