Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -ra7bb148f195e19802a905fade4a43e8fb403d474 -r8b5a8c816d953cfc1e2ee17a2f4b447e96e85d44
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision a7bb148f195e19802a905fade4a43e8fb403d474)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 8b5a8c816d953cfc1e2ee17a2f4b447e96e85d44)
@@ -35,7 +35,7 @@
 #define ENERGIZED                                       1                                                           ///< 1 for energized valve.
 #define ALL_VALVES_DEENERGIZED                          0x0000                                                      ///< 0 in U16 bit field for all valves.
 
-#define VALVE_PWM_PERIOD                                500                                                          ///< Valve PWM Period in 0.1 us res ( 20kHz )
+#define VALVE_PWM_PERIOD                                500                                                         ///< Valve PWM Period in 0.1 us res ( 20kHz )
 #define VALVE_PWM_LOW                                   ( VALVE_PWM_PERIOD * 0.2 )                                  ///< Valve low PWM percentage
 #define VALVE_PWM_PULL_IN                               100                                                         ///< Valve 'strike' period at 100% PWM in ms
 
@@ -126,7 +126,7 @@
 
     // TODO set FPGA PWM after finalizing the decision on valve strike and hold behavior
     // initially set valve PWM configuration and enable
-//    setFPGAPWMConfigurations();
+    //setFPGAPWMConfigurations();
 
     // initially set all valves to de-energized state via FPGA
     setFPGADDValveStates( commandedValvesStates );
@@ -175,7 +175,7 @@
         valveSPBits |= 0x01 << ( i - FIRST_SP_VALVE );
     }
 
-    for ( i = M12_VALV; i <= LAST_IO_VALVE; i++ )
+    for ( i = FIRST_IO_VALVE; i <= LAST_IO_VALVE; i++ )
     {
         valveIOBits |= 0x01 << ( i - FIRST_IO_VALVE );
     }
Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -reff029546b54e512bd6bdb8f24aea58b04ed1e7f -r8b5a8c816d953cfc1e2ee17a2f4b447e96e85d44
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision eff029546b54e512bd6bdb8f24aea58b04ed1e7f)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 8b5a8c816d953cfc1e2ee17a2f4b447e96e85d44)
@@ -245,7 +245,6 @@
     enqueue( TEENSY_CMD_GET_INIT_STATUS );
     enqueue( TEENSY_CMD_SELECT_SENSOR );
     enqueue( TEENSY_CMD_GET_EEPROM_DATA );
-    condInitTime = 0;
 }
 
 /*********************************************************************//**
@@ -2297,6 +2296,7 @@
     condCalculatedMeasurement[ sensorNum ].Temperature.data = (F32)calculatedTemperature;
 }
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -ra7bb148f195e19802a905fade4a43e8fb403d474 -r8b5a8c816d953cfc1e2ee17a2f4b447e96e85d44
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision a7bb148f195e19802a905fade4a43e8fb403d474)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 8b5a8c816d953cfc1e2ee17a2f4b447e96e85d44)
@@ -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 },
@@ -274,17 +284,6 @@
     { 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_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
 };
 
 /// Calculation for number of entries in the incoming message function handler look-up table.