Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
===================================================================
diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -rc3fb36648391c5b7738adfd0062ad2ac0b8e4749
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision c3fb36648391c5b7738adfd0062ad2ac0b8e4749)
@@ -86,22 +86,25 @@
     // Self tests dry state
     bool mSelfTestDry                               = vData.mSubMode                    == GuiPreTreatmentStates                    ::TD_PRE_TREATMENT_SELF_TEST_DRY_STATE                   ;
     if ( mSelfTestDry ) {
-          selfTestDry_start                         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_START_STATE                            );
-          selfTestDry_waitDoorClose                 ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE              );
-          selfTestDry_usedCartridge                 ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE             );
-          selfTestDry_cartridgeLoaded               ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE           );
-          selfTestDry_pressureSensorsNormalSetup    ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE    );
-          selfTestDry_pressureSensorsVenousSetup    ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE    );
-          selfTestDry_pressureSensorsVenous         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS                );
-          selfTestDry_pressureSensorsArterialSetup  ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE  );
-          selfTestDry_pressureSensorsArterial       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL              );
-          selfTestDry_pressureSensorsDecay          ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE           );
-          selfTestDry_pressureSensorsStability      ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE       );
-          selfTestDry_pressureSensorsNormal         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE          );
-          selfTestDry_syringePump                   ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE               );
-          selfTestDry_syringePumpOcclusionDetection ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE );
-          selfTestDry_stopped                       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_STOPPED_STATE                          );
-          selfTestDry_complete                      ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_COMPLETE_STATE                         );
+          selfTestDry_start                           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_START_STATE                            );
+          selfTestDry_waitDoorClose                   ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE              );
+          selfTestDry_usedTubeSetCheck                ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE              );
+          selfTestDry_tubeSetLoadedCheck              ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE            );
+          selfTestDry_tubeSetAuthentication           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE          );
+          selfTestDry_syringePumpSeek                 ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE                );
+          selfTestDry_pressureSensorNormalSetup       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE     );
+          selfTestDry_pressureSensorVenousSetup       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE            );
+          selfTestDry_venousPressureStabilization     ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE    );
+          selfTestDry_venousPressureLeakCheck         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE       );
+          selfTestDry_venousPressureRelief            ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE           );
+          selfTestDry_pressureArterialSetup           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE          );
+          selfTestDry_arterialPressureStabilization   ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE  );
+          selfTestDry_arterialPressureLeakCheck       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE     );
+          selfTestDry_arterialPressureRelief          ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE         );
+          selfTestDry_syringePump                     ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE               );
+          selfTestDry_syringePumpOcclusionCheck       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE     );
+          selfTestDry_complete                        ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_COMPLETE_STATE                         );
+          selfTestDry_stopped                         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_STOPPED_STATE                          );
     }
     selfTestDry(mSelfTestDry); // it's the main even so moved last to have all the sub-states updated prior to.
 
Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rc3fb36648391c5b7738adfd0062ad2ac0b8e4749
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision c3fb36648391c5b7738adfd0062ad2ac0b8e4749)
@@ -89,22 +89,23 @@
     // Self tests dry state
     PROPERTY( bool   , selfTestDry_start                        , false ) ///< DRY_SELF_TESTS_START_STATE                       , Dry self-tests starting state.
     PROPERTY( bool   , selfTestDry_waitDoorClose                , false ) ///< DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE         , Wait for door to close before executing self-tests.
-    STATE   ( bool   , selfTestDry_usedCartridge                , false ) ///< DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE        , Used Cartridge self-test state.
-    STATE   ( bool   , selfTestDry_cartridgeLoaded              , false ) ///< DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE      , Cartridge loaded check dry self-test state.
-
-    STATE   ( bool   , selfTestDry_pressureSensorsNormalSetup   , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE       , Pressure sensor setup state.
-    STATE   ( bool   , selfTestDry_pressureSensorsVenousSetup   , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE       , Venous pressure sensor dry self-test setup valves and pump state
-    STATE   ( bool   , selfTestDry_pressureSensorsVenous        , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS                   , Venous pressure sensor dry self-test
-    STATE   ( bool   , selfTestDry_pressureSensorsArterialSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE     , Arterial pressure sensor dry self-test setup valves and pump state
-    STATE   ( bool   , selfTestDry_pressureSensorsArterial      , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL                 , Arterial pressure sensor dry self-test
-
-    STATE   ( bool   , selfTestDry_pressureSensorsDecay         , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE      , Pressure sensors verify pressure loss state
-    STATE   ( bool   , selfTestDry_pressureSensorsStability     , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE  , Pressure sensors verify pressure stability state
-    STATE   ( bool   , selfTestDry_pressureSensorsNormal        , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE     , Pressure sensors verify normal pressure readings state.
+    STATE   ( bool   , selfTestDry_usedTubeSetCheck             , false ) ///< DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE
+    STATE   ( bool   , selfTestDry_tubeSetLoadedCheck           , false ) ///< DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE
+    STATE   ( bool   , selfTestDry_tubeSetAuthentication        , false ) ///< DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE
+    STATE   ( bool   , selfTestDry_syringePumpSeek              , false ) ///< DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE
+    STATE   ( bool   , selfTestDry_pressureSensorNormalSetup    , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE
+    STATE   ( bool   , selfTestDry_pressureSensorVenousSetup    , false ) ///< DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE
+    STATE   ( bool   , selfTestDry_venousPressureStabilization  , false ) ///< DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE
+    STATE   ( bool   , selfTestDry_venousPressureLeakCheck      , false ) ///< DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE
+    STATE   ( bool   , selfTestDry_venousPressureRelief         , false ) ///< DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE
+    STATE   ( bool   , selfTestDry_pressureArterialSetup        , false ) ///< DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE
+    STATE   ( bool   , selfTestDry_arterialPressureStabilization, false ) ///< DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE
+    STATE   ( bool   , selfTestDry_arterialPressureLeakCheck    , false ) ///< DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE
+    STATE   ( bool   , selfTestDry_arterialPressureRelief       , false ) ///< DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE
     STATE   ( bool   , selfTestDry_syringePump                  , false ) ///< DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE          , Prime syringe pump state
-    STATE   ( bool   , selfTestDry_syringePumpOcclusionDetection, false ) ///< DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE    , Occlusion detection state
-    STATE   ( bool   , selfTestDry_stopped                      , false ) ///< DRY_SELF_TESTS_STOPPED_STATE                     , Dry self-test stopped state.
+    STATE   ( bool   , selfTestDry_syringePumpOcclusionCheck    , false ) ///< DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE, Occlusion check state
     STATE   ( bool   , selfTestDry_complete                     , false ) ///< DRY_SELF_TESTS_COMPLETE_STATE                    , Dry self-test complete state.
+    STATE   ( bool   , selfTestDry_stopped                      , false ) ///< DRY_SELF_TESTS_STOPPED_STATE                     , Dry self-test stopped state.
 
     // Prime blood and dialysate circuits and run wet self-tests state
     STATE   ( bool   , prime_waitUserStart                      , false ) ///< HD_PRIME_WAIT_FOR_USER_START_STATE               , Wait for user to start prime state