Index: firmware/App/Drivers/EjectorMotor.c
===================================================================
diff -u -r2b69ad7efb0008f063d2ddacb5972250da7b7ec5 -rfaf64f3fb669c2a86a9d96bd51669cfbd731f6ba
--- firmware/App/Drivers/EjectorMotor.c	(.../EjectorMotor.c)	(revision 2b69ad7efb0008f063d2ddacb5972250da7b7ec5)
+++ firmware/App/Drivers/EjectorMotor.c	(.../EjectorMotor.c)	(revision faf64f3fb669c2a86a9d96bd51669cfbd731f6ba)
@@ -66,10 +66,8 @@
                                                      EJECTOR_MOTOR_CONTROL_32TH_STEP;
 
 /// Control bits to disable ejector motor
-static const U08 EJECTOR_MOTOR_CONTROL_DISABLED    = EJECTOR_MOTOR_CONTROL_SLEEP_OFF |
-                                                     EJECTOR_MOTOR_CONTROL_NOT_RESET |
-                                                     EJECTOR_MOTOR_CONTROL_FORWARD_DIR |
-                                                     EJECTOR_MOTOR_CONTROL_32TH_STEP;
+// Set all bits to 0 for disabling
+static const U08 EJECTOR_MOTOR_CONTROL_DISABLED = 0;
 
 /// Payload record structure for ejector motor set request
 typedef struct
Index: firmware/App/TDCommon.h
===================================================================
diff -u -r1c6d80a873aa1bd11e28a8955ff38866fc5717f4 -rfaf64f3fb669c2a86a9d96bd51669cfbd731f6ba
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 1c6d80a873aa1bd11e28a8955ff38866fc5717f4)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision faf64f3fb669c2a86a9d96bd51669cfbd731f6ba)
@@ -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