Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r48558494898419baa0697009318fb543fe0b8a46 -r0face6417892ea9de28d146bf88d44a9f30cf2a4
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 48558494898419baa0697009318fb543fe0b8a46)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0face6417892ea9de28d146bf88d44a9f30cf2a4)
@@ -46,6 +46,7 @@
 #include "ModePreGenPermeateDefeatured.h"
 #include "ModePostGenDialysate.h"
 #include "ModeStandby.h"
+#include "NVMsgQ.h"
 #include "OperationModes.h"
 #include "PAL.h"
 #include "PermeateTank.h"
@@ -266,6 +267,12 @@
     { MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST,                       &testBiCarbChamberFillRequestOverride },
     { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
     { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },
+    { MSG_ID_DD_NVM_GET_RECORD,                                                     &testDDGetNVRecord },
+    { MSG_ID_DD_NVM_SET_SYSTEM_RECORD,                                              &testDDSetNVSystemRecord },
+    { MSG_ID_DD_NVM_SET_SERVICE_RECORD,                                             &testDDSetNVServiceRecord },
+    { MSG_ID_DD_NVM_SET_CALIBRATION_RECORD,                                         &testDDSetNVCalibrationRecord },
+    { MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD,                                       &testDDSetNVInstitutionalRecord },
+    { MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD,                                          &testDDSetNVUsageInfoRecord },
     { MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testRORejectionRatioDataPublishIntervalOverride },
     { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
     { MSG_ID_FP_SET_TEST_CONFIGURATION,                                             &testSetTestConfiguration },