Index: dialin/common/hd_defs.py
===================================================================
diff -u -r8ff49bb248b9b98b18dde057d836b5c2d308922c -r4c196bf0092414737023812b5bda5defab3f5ba4
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 8ff49bb248b9b98b18dde057d836b5c2d308922c)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 4c196bf0092414737023812b5bda5defab3f5ba4)
@@ -196,13 +196,14 @@
 class PreTreatmentModeStates(DialinEnum):
     HD_PRE_TREATMENT_START_STATE = 0                  # Start pre-treatment mode state
     HD_PRE_TREATMENT_WATER_SAMPLE_STATE = 1           # Water sample state
-    HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE = 2      # Self tests with no cartridge state
-    HD_PRE_TREATMENT_CART_INSTALL_STATE = 3           # Consumable and cartridge installation state
-    HD_PRE_TREATMENT_SELF_TEST_DRY_STATE = 4          # Self tests dry state
-    HD_PRE_TREATMENT_PRIME_STATE = 5                  # Prime blood and dialysate circuits and run wet self-tests state
-    HD_PRE_TREATMENT_RECIRCULATE_STATE = 6            # Re-circulate blood and dialysate circuits state
-    HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE = 7     # Patient connection state
-    NUM_OF_HD_PRE_TREATMENT_STATES = 8                # Number of pre-treatment mode states
+    HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE = 2   # Consumable self-tests state
+    HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE = 3      # Self tests with no cartridge state
+    HD_PRE_TREATMENT_CART_INSTALL_STATE = 4           # Consumable and cartridge installation state
+    HD_PRE_TREATMENT_SELF_TEST_DRY_STATE = 5          # Self tests dry state
+    HD_PRE_TREATMENT_PRIME_STATE = 6                  # Prime blood and dialysate circuits and run wet self-tests state
+    HD_PRE_TREATMENT_RECIRCULATE_STATE = 7            # Re-circulate blood and dialysate circuits state
+    HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE = 8     # Patient connection state
+    NUM_OF_HD_PRE_TREATMENT_STATES = 9                # Number of pre-treatment mode states
 
 
 @unique
@@ -270,12 +271,14 @@
     HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE = 4                # Circulate blood circuit state
     HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE = 5              # Wait for reservoir 1 fill complete
     HD_PRIME_DIALYSATE_DIALYZER_STATE = 6                       # Dialysate dialyzer fluid path state
-    HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE = 7              # Wait for reservoir 2 fill complete
-    HD_PRIME_DIALYSATE_BYPASS_STATE = 8                         # Dialysate bypass fluid path state
-    HD_PRIME_WET_SELF_TESTS_STATE = 9                           # Perform wet self-tests after priming complete
-    HD_PRIME_PAUSE = 10                                         # Prime pause state = waits to be resumed
-    HD_PRIME_COMPLETE = 11                                      # Prime complete state
-    NUM_OF_HD_PRIME_STATES = 12                                 # Number of prime sub-mode states
+    HD_PRIME_SALINE_DIALYZER_SETUP_STATE = 7                    # Saline dialyzer setup state
+    HD_PRIME_SALINE_DIALYZER_STATE = 8                          # Saline dialyzer fluid path state
+    HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE = 9              # Wait for reservoir 2 fill complete
+    HD_PRIME_DIALYSATE_BYPASS_STATE = 10                        # Dialysate bypass fluid path state
+    HD_PRIME_WET_SELF_TESTS_STATE = 11                          # Perform wet self-tests after priming complete
+    HD_PRIME_PAUSE = 12                                         # Prime pause state = waits to be resumed
+    HD_PRIME_COMPLETE = 13                                      # Prime complete state
+    NUM_OF_HD_PRIME_STATES = 14                                 # Number of prime sub-mode states
 
 
 @unique