Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r636775bd0ba262967bcf06e194658b97720e2517 -r3e2535bbf3d15295a844adc3590824f9e44dbe3d
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 636775bd0ba262967bcf06e194658b97720e2517)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 3e2535bbf3d15295a844adc3590824f9e44dbe3d)
@@ -323,34 +323,32 @@
 # TDPreTreatmentModesStates.TD_PRE_TREATMENT_SELF_TEST_DRY_STATE sub states
 @unique
 class TDPreTreaDrySelfTestStates(DialinEnum):
-    DRY_SELF_TESTS_START_STATE                              = 0         # Dry self-tests starting state
-    DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE                = 1         # Wait for door to close before executing self-tests
-    DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE               = 2         # Used cartridge check dry self-test state
-    DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE             = 3         # Cartridge loaded check dry self-test state
-    DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE            = 4         # Tube set authentication state
-    DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE                  = 5         # Syringe pump seek state
-    DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE      = 6         # Pressure sensor normal setup state
-    DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE              = 7         # Venous pressure sensor dry self-test setup valves and pump state
-    DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE      = 8         # Venous pressure verify pressure stability state
-    DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE         = 9         # Venous pressure leak check state
-    DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE             = 10        # Venous pressure relief state
-    DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE            = 11        # Arterial pressure sensor dry self-test setup valves and pump state
-    DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE    = 12        # Arterial pressure verify pressure stability state
-    DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE       = 13        # Arterial pressure leak check state
-    DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE           = 14        # Arterial pressure relief state
-    DRY_SELF_TESTS_SYRINGE_PRIME_STATE                      = 15        # Prime syringe pump state
-    DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE       = 16        # Occlusion detection state
-    DRY_SELF_TESTS_COMPLETE_STATE                           = 17        # Dry self-test complete state
-    DRY_SELF_TESTS_STOPPED_STATE                            = 18        # Dry self-test stopped state
-    NUM_OF_DRY_SELF_TESTS_STATES                            = 19        # Number of dry self-tests states
+    DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE                = 0         # Wait for door to close before executing self-tests
+    DRY_SELF_TESTS_USED_TUBING_CHECK_STATE                  = 1         # Used tubing check dry self-test state
+    DRY_SELF_TESTS_TUBING_LOADED_CHECK_STATE                = 2         # Tubing loaded check dry self-test state
+    DRY_SELF_TESTS_TUBING_SET_AUTHENTICATION_STATE          = 3         # Tubing set authentication state
+    DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE                  = 4         # Syringe pump seek state
+    DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE      = 5         # Pressure sensor normal setup state
+    DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE              = 6         # Venous pressure sensor dry self-test setup valves and pump state
+    DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE      = 7         # Venous pressure verify pressure stability state
+    DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE         = 8         # Venous pressure leak check state
+    DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE             = 9         # Venous pressure relief state
+    DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE            = 10        # Arterial pressure sensor dry self-test setup valves and pump state
+    DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE    = 11        # Arterial pressure verify pressure stability state
+    DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE       = 12        # Arterial pressure leak check state
+    DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE           = 13        # Arterial pressure relief state
+    DRY_SELF_TESTS_SYRINGE_PRIME_STATE                      = 14        # Prime syringe pump state
+    DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE       = 15        # Occlusion detection state
+    DRY_SELF_TESTS_COMPLETE_STATE                           = 16        # Dry self-test complete state
+    DRY_SELF_TESTS_STOPPED_STATE                            = 17        # Dry self-test stopped state
+    NUM_OF_DRY_SELF_TESTS_STATES                            = 18        # Number of dry self-tests states
 
 TDPreTreaDrySelfTestStates._str_list = {
     # Official Name :       Accepted strings
-    'DRY_SELF_TESTS_START_STATE': ['start'],
     'DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE': ['wait for front door to close', 'wait for door close'],
-    'DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE': ['used cartridge check'],
-    'DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE': ['cartridge loaded check'],
-    'DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE': ['tube set authentication', 'tube authentication'],
+    'DRY_SELF_TESTS_USED_TUBING_CHECK_STATE': ['used tubing check'],
+    'DRY_SELF_TESTS_TUBING_LOADED_CHECK_STATE': ['tubing loaded check'],
+    'DRY_SELF_TESTS_TUBING_SET_AUTHENTICATION_STATE': ['tubing set authentication', 'tubing authentication'],
     'DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE': ['srynge pump seek', 'pump seek'],
     'DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE': ['pressure sensors normal setup'],
     'DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE': ['pressure venous setup', 'venous setup'],