Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rd210786d6c7d75bb0b4d9e18efc40a01d85123fe -r8cb3950f846ba6e3946cbcc1b321b7849d64c23f
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision d210786d6c7d75bb0b4d9e18efc40a01d85123fe)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 8cb3950f846ba6e3946cbcc1b321b7849d64c23f)
@@ -250,6 +250,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 },
@@ -268,12 +274,7 @@
     { 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 },
 #ifdef __TEENSY_CONDUCTIVITY_DRIVER__
     { MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST,                                     &testSetTeenyConductivityModel },
 #endif