Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rdcc1278c9008ca5169a5d7b7f11e50e471af16b6 -rc1978d8ab5a143cd71d24be5bee8198026c1a830
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision dcc1278c9008ca5169a5d7b7f11e50e471af16b6)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision c1978d8ab5a143cd71d24be5bee8198026c1a830)
@@ -566,8 +566,10 @@
     // handle a home request
     if ( TRUE == currentValveStates[ valve ].hasHomingBeenRequested )
     {
-        // Transition to homing not started. Reseting and enabling the valve and encoder is not needed
-        nextState = VALVE_STATE_HOMING_NOT_STARTED;
+        // Homing has been requested, enable the homing bit.
+        setValveHomingEnableDisable( valve, TRUE );
+        // Transition to enable homing to set the encode to 0.
+        nextState = VALVE_STATE_ENABLE_VALVE;
     }
     // handle a position change request
     else if ( TRUE == currentValveStates[ valve ].hasTransitionBeenRequested )
Index: firmware/App/TDCommon.h
===================================================================
diff -u -rfaf64f3fb669c2a86a9d96bd51669cfbd731f6ba -rc1978d8ab5a143cd71d24be5bee8198026c1a830
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision faf64f3fb669c2a86a9d96bd51669cfbd731f6ba)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision c1978d8ab5a143cd71d24be5bee8198026c1a830)
@@ -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