Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r5eda216f634a74512a5bc11b0984676567512d80 -r1500c2a584e9e9ce0ffcd32727c0b9e7cdd141b6
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 5eda216f634a74512a5bc11b0984676567512d80)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 1500c2a584e9e9ce0ffcd32727c0b9e7cdd141b6)
@@ -472,7 +472,7 @@
 static VALVE_STATE_T handleValvesFindEnergizedEdgeState( VALVE_T valve )
 {
     VALVE_STATE_T nextState = VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE;
-    S16 currPos              = currentValveStates[ valve ].currentEncPosition;
+    S16 currPos             = currentValveStates[ valve ].currentEncPosition;
     BOOL hasEdgeBeenReached = FALSE;
 
     checkValveInRange( valve, SW_FAULT_ID_TD_VALVES_INVALID_FIND_ENERGIZED_EDGE );
Index: firmware/App/Drivers/RotaryValve.c
===================================================================
diff -u -r5eda216f634a74512a5bc11b0984676567512d80 -r1500c2a584e9e9ce0ffcd32727c0b9e7cdd141b6
--- firmware/App/Drivers/RotaryValve.c	(.../RotaryValve.c)	(revision 5eda216f634a74512a5bc11b0984676567512d80)
+++ firmware/App/Drivers/RotaryValve.c	(.../RotaryValve.c)	(revision 1500c2a584e9e9ce0ffcd32727c0b9e7cdd141b6)
@@ -412,6 +412,7 @@
     return maxEncoderValue;
 }
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rcf22584fb68bb29311d81d1e5ad79f8cf064b8fb -r1500c2a584e9e9ce0ffcd32727c0b9e7cdd141b6
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision cf22584fb68bb29311d81d1e5ad79f8cf064b8fb)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 1500c2a584e9e9ce0ffcd32727c0b9e7cdd141b6)
@@ -161,6 +161,7 @@
     { MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST,                               &testSetOperationMode },
     { MSG_ID_TD_EJECTOR_MOTOR_SET_SPEED_REQUEST,                        &testSetEjectorMotorSpeed },
     { MSG_ID_TD_EJECTOR_COMMAND,                                        &testEjectorCommand },
+    { MSG_ID_TD_EJECTOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testEjectorDataPublishIntervalOverride },
     { MSG_ID_TD_SET_AIR_TRAP_CONTROL,                                   &testSetAirTrapControl },
     { MSG_ID_TD_HOME_BLOOD_PUMP,                                        &testHomeBloodPump },
     { MSG_ID_TD_BLOOD_FLOW_ALPHA_Y_INTERCEPT_OVERRIDE_REQUEST,          &testBPFlowAlphaYInterceptOverride },
Index: firmware/App/TDCommon.h
===================================================================
diff -u -rc9677b13a02409d13d23783194ad1ce872c8020d -r1500c2a584e9e9ce0ffcd32727c0b9e7cdd141b6
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision c9677b13a02409d13d23783194ad1ce872c8020d)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 1500c2a584e9e9ce0ffcd32727c0b9e7cdd141b6)
@@ -36,7 +36,7 @@
 //    #define TEST_PINCH_VALVES               1           // Alpha unit pinch valve testing
 //    #define TEST_DEBUGGER                   1           // Testing with debugger - prevents FPGA comm alarms caused by breakpoints
 //    #define TEST_PROCESS_TASKS_WO_UI        1           // Allow task processing even when UI not connected
-    #define TEST_UI_ONLY                    1           // Alpha test with TD and UI only - no DD
+//    #define TEST_UI_ONLY                    1           // Alpha test with TD and UI only - no DD
 //    #define TEST_USE_OFF_AS_STOP_BUTTON     1           // Alpha test re-purposing off button as a stop button
     #define TEST_NO_PRESSURE_CHECKS         1           // Alpha test with no pressure sensor checks
 //    #define TEST_NO_STOP_CONSUME_CHECK      1           // Alpha test with no check for stop button timeout