Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r8b5a8c816d953cfc1e2ee17a2f4b447e96e85d44 -r4c340aa7b7dfaff7e23b6d6b3ff010b83f7e5f9c
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 8b5a8c816d953cfc1e2ee17a2f4b447e96e85d44)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 4c340aa7b7dfaff7e23b6d6b3ff010b83f7e5f9c)
@@ -260,6 +260,12 @@
     { MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST,                            &testRinsePumpPWMPercentOverride },
     { MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST,                                     &testRinsePumpTurnOnOffRequest },
     { MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST,                                    &testSetGeneratePermeateSignal },
+    { MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDryBiCartDataPublishIntervalOverride },
+    { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST,                         &testDryBiCartFillCycleMaxCountOverride },
+    { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST,                           &testDryBiCartFillRequestOverride },
+    { 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_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 },
@@ -278,9 +284,6 @@
     { MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                      &testPreGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_STATUS_REQUEST,                                                 &testGetFPDefeaturedStatus },
-    { MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDryBiCartDataPublishIntervalOverride },
-    { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST,                         &testDryBiCartFillCycleMaxCountOverride },
-    { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST,                           &testDryBiCartFillRequestOverride },
     { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
     { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
     { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },