Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rc5f3dfc2a87c35036f21f969f6e762ae779839f2 -rc753351b22e860f10597b68efce03d18d2fa3536
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision c5f3dfc2a87c35036f21f969f6e762ae779839f2)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision c753351b22e860f10597b68efce03d18d2fa3536)
@@ -15,11 +15,16 @@
 *
 ***************************************************************************/
 
+#include "BloodFlow.h"
 #include "ConsumableSelfTest.h"
 #include "DGInterface.h"
+#include "DialInFlow.h"
+#include "DialOutFlow.h"
 #include "ModePreTreat.h"
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
+#include "SyringePump.h"
+#include "Valves.h"
 
 /**
  *  @addtogroup ConsumableSelfTest
@@ -61,6 +66,20 @@
 void transitionToConsumableSelfTest( void )
 {
     initConsumableSelfTest();
+
+    // Pumps should be off
+    signalBloodPumpHardStop();
+    signalDialInPumpHardStop();
+    signalDialOutPumpHardStop();
+    stopSyringePump();
+
+    // Set valves to default positions
+    setValveAirTrap( STATE_CLOSED );
+    setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
+
 }
 
 /*********************************************************************//**
@@ -119,7 +138,7 @@
         case CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE:
             if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY ) )
             {
-                currentConsumableSelfTestState = DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY;
+                currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE;
             }
             break;