Index: firmware/App/Services/NVMsgQ.h
===================================================================
diff -u -rf525d2be1e7038cacbe2bb34b8db3505cf26a350 -r0face6417892ea9de28d146bf88d44a9f30cf2a4
--- firmware/App/Services/NVMsgQ.h	(.../NVMsgQ.h)	(revision f525d2be1e7038cacbe2bb34b8db3505cf26a350)
+++ firmware/App/Services/NVMsgQ.h	(.../NVMsgQ.h)	(revision 0face6417892ea9de28d146bf88d44a9f30cf2a4)
@@ -43,8 +43,10 @@
 #define INSTIT_RECORD_NV_MEM_START_ADDRESS       ( BANK7_SECTOR2_START_ADDRESS + INSTIT_RECORD_OFFSET )
 #define USAGE_INFO_START_ADDRESS                 ( BANK7_SECTOR3_START_ADDRESS + USAGE_RECORD_OFFSET )          ///< DD usage info start address in RTC RAM (48).
 
-#define MIN_JOBS_NEEDED_FOR_A_RECORD             4                                                              ///< Min queue count needed to erase and write a sector
-#define MIN_JOBS_NEEDED_FOR_ALL_RECORDS          ( NUM_OF_NVDATMGMT_RECORDS_JOBS * 2 )                          ///< Min queue count needed to erase and write all records
+#define MAX_NUM_OF_RECORD_IN_A_SECTOR             2
+#define MIN_JOBS_NEEDED_TO_WRITE_A_RECORD        ( MAX_NUM_OF_RECORD_IN_A_SECTOR * 2 )                                                             ///< Min queue count needed to erase and write a sector
+#define MIN_JOBS_NEEDED_TO_WRITE_ALL_RECORDS     ( NUM_OF_NVDATMGMT_RECORDS_JOBS * 2 )                          ///< Min queue count needed to erase and write all records
+#define MIN_JOBS_NEEDED_TO_READ_ALL_RECORDS      ( NUM_OF_NVDATMGMT_RECORDS_JOBS )                              ///< Min queue count needed to erase and write all records
 
 /// NVDataMgmt records read status
 typedef enum NVDataMgmt_NV_Records_Read_Status
@@ -69,9 +71,15 @@
 U32  getAvailableRecordQueueCount( void );
 
 BOOL enqueueEraseAndWriteSector( RECORD_JOBS_STATE_T job );
-void enqueuePOSTReadRecords( void );
+BOOL enqueuewriteAllRecords( void );
+BOOL enqueueReadAllRecords( void );
 
 BOOL testDDGetNVRecord( MESSAGE_T *message );
+BOOL testDDSetNVSystemRecord( MESSAGE_T *message );
+BOOL testDDSetNVServiceRecord( MESSAGE_T *message );
+BOOL testDDSetNVCalibrationRecord( MESSAGE_T *message );
+BOOL testDDSetNVInstitutionalRecord( MESSAGE_T *message );
+BOOL testDDSetNVUsageInfoRecord( MESSAGE_T *message );
 BOOL isNewCalibrationRecordAvailable( void );
 
 void updateNewNVRecordAvailableFlag( BOOL value );