Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rcc067242d41776eb2a598212413e25df5a58b1fe -r75788e41eba1d0ad14c699d091c0c3f25c5b218e
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision cc067242d41776eb2a598212413e25df5a58b1fe)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 75788e41eba1d0ad14c699d091c0c3f25c5b218e)
@@ -15,11 +15,15 @@
 *
 ***************************************************************************/
 
+#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"
 
 /**
@@ -133,7 +137,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;