Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rff5a1225d790700eccfc9a15c581934ec82a170b -r4c340aa7b7dfaff7e23b6d6b3ff010b83f7e5f9c
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision ff5a1225d790700eccfc9a15c581934ec82a170b)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 4c340aa7b7dfaff7e23b6d6b3ff010b83f7e5f9c)
@@ -129,7 +129,17 @@
     { MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDDPressureSensorDataPublishIntervalOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST,                   &testDDPressureSensorFilteredReadingsOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST,                &testDDPressureSensorFilteredTemperatureReadingsOverride },
-#ifndef __TEENSY_CONDUCTIVITY_DRIVER__
+#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testDDConductivitySensorDataPublishIntervalOverride },
+    { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testFPConductivitySensorDataPublishIntervalOverride },
+    { MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST,                                     &testSetTeenyConductivityModel },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testTeensyConductivitySensorReadingsOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testTeensyConductivitySensorTemperatureReadingsOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST,                    &testTeensyConductivitySensorResistanceReadingsOverride },
+    { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST,                                      &testTeensyConductivitySensorReadingsOverride },
+    { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                                 &testTeensyConductivitySensorTemperatureReadingsOverride },
+    { MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST,                    &testTeensyConductivitySensorResistanceReadingsOverride },
+#else
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testDDConductivitySensorReadingsOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testDDConductivitySensorTemperatureReadingsOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,                  &testDDConductivitySensorReadCounterOverride },
@@ -275,17 +285,8 @@
     { MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_STATUS_REQUEST,                                                 &testGetFPDefeaturedStatus },
     { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testDDConductivitySensorDataPublishIntervalOverride },
-    { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testFPConductivitySensorDataPublishIntervalOverride },
-    { MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST,                                     &testSetTeenyConductivityModel },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testTeensyConductivitySensorReadingsOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testTeensyConductivitySensorTemperatureReadingsOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST,                    &testTeensyConductivitySensorResistanceReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST,                                      &testTeensyConductivitySensorReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                                 &testTeensyConductivitySensorTemperatureReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST,                    &testTeensyConductivitySensorResistanceReadingsOverride },
-#endif
+    { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
+    { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },
 };
 
 /// Calculation for number of entries in the incoming message function handler look-up table.