Index: dialin/common/hd_defs.py
===================================================================
diff -u -rcef58c0d38f9eb6cd0d34cd6a223fc2c19256167 -rf3c8dcc3a9c5996ba591c96270832e330c508d19
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision cef58c0d38f9eb6cd0d34cd6a223fc2c19256167)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision f3c8dcc3a9c5996ba591c96270832e330c508d19)
@@ -100,26 +100,24 @@
 @unique
 class PreTreatmentConsumableSelfTestStates(DialinEnum):
     CONSUMABLE_SELF_TESTS_INSTALL_STATE                     =  0    # Consumable self-tests install state
-    CONSUMABLE_SELF_TESTS_FILL_CMD_STATE                    =  1    # Send command to DG to fill reservoir state
-    CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE         =  2    # Consumable self-tests water quality check state
-    CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE           =  3    # Consumable self-tests bicarbonate concentrate pump check state
-    CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE             =  4    # Consumable self-tests acid concentrate pump check state
-    CONSUMABLE_SELF_TESTS_COMPLETE_STATE                    =  5    # Consumable self-tests complete state
-    NUM_OF_CONSUMABLE_SELF_TESTS_STATES                     =  6    # Number of consumable install sub-mode states
+    CONSUMABLE_SELF_TESTS_PRIME_STATE                       =  1    # Consumable self-tests prime concentrate lines state
+    CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE           =  2    # Consumable self-tests bicarbonate concentrate pump check state
+    CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE             =  3    # Consumable self-tests acid concentrate pump check state
+    CONSUMABLE_SELF_TESTS_COMPLETE_STATE                    =  4    # Consumable self-tests complete state
+    NUM_OF_CONSUMABLE_SELF_TESTS_STATES                     =  5    # Number of consumable install sub-mode states
 
 
 @unique
 class PreTreatmentNoCartSelfTestStates(DialinEnum):
-    NO_CART_SELF_TESTS_START_STATE                          =  0    # No cartridge self-tests starting state
-    NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE            =  1    # Wait for door to be closed before running self-tests
-    NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE                =  2    # No cartridge pressure sensors self-test state
-    NO_CART_SELF_TESTS_HOME_VALVES_STATE                    =  3    # No cartridge home valves state
-    NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE              =  4    # No cartridge home syringe pump state
-    NO_CART_SELF_TESTS_PUMPS_STATE                          =  5    # No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state
-    NO_CART_SELF_TESTS_HOME_IDLE_STATE                      =  6    # Wait for valves and pumps finish homing state
-    NO_CART_SELF_TESTS_STOPPED_STATE                        =  7    # No cart self-test stopped state
-    NO_CART_SELF_TESTS_COMPLETE_STATE                       =  8    # No cartridge self-test complete state
-    NUM_OF_NO_CART_SELF_TESTS_STATES                        =  9    # Number of no cartridge self-tests states
+    NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE            =  0    # Wait for door to be closed before running self-tests
+    NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE                =  1    # No cartridge pressure sensors self-test state
+    NO_CART_SELF_TESTS_HOME_VALVES_STATE                    =  2    # No cartridge home valves state
+    NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE              =  3    # No cartridge home syringe pump state
+    NO_CART_SELF_TESTS_PUMPS_STATE                          =  4    # No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state
+    NO_CART_SELF_TESTS_HOME_IDLE_STATE                      =  5    # Wait for valves and pumps finish homing state
+    NO_CART_SELF_TESTS_STOPPED_STATE                        =  6    # No cart self-test stopped state
+    NO_CART_SELF_TESTS_COMPLETE_STATE                       =  7    # No cartridge self-test complete state
+    NUM_OF_NO_CART_SELF_TESTS_STATES                        =  8    # Number of no cartridge self-tests states
 
 
 @unique