Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision e699d00afc964052ec0e91ca72e101d21aa00413)
@@ -37,10 +37,6 @@
     recirculateState        ( vData.mRecirculateState           );
     patientConnectionState  ( vData.mPatientConnectionState     );
 
-    // start state
-    start                                           ( vData.mSubMode                    == GuiPreTreatmentStates                    ::HD_PRE_TREATMENT_START_STATE                      );
-
-
     // water sample state
     bool mWaterSample                               = vData.mSubMode                    == GuiPreTreatmentStates                    ::HD_PRE_TREATMENT_WATER_SAMPLE_STATE                ;
     if ( mWaterSample ) {
@@ -53,7 +49,7 @@
     bool mSelfTestConsumables                       = vData.mSubMode                    == GuiPreTreatmentStates                    ::HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE        ;
     if ( mSelfTestConsumables ) {
           selfTestConsumables_install               ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_INSTALL_STATE               );
-          selfTestConsumables_waterQuality          ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE   );
+          selfTestConsumables_prime                 ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_PRIME_STATE                 );
           selfTestConsumables_biCarbPump            ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE     );
           selfTestConsumables_acidPump              ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE       );
           selfTestConsumables_complete              ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_COMPLETE_STATE              );
@@ -64,7 +60,6 @@
     // Self tests with no cartridge state
     bool mSelfTestNoCartridge                       = vData.mSubMode                    == GuiPreTreatmentStates                    ::HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE           ;
     if ( mSelfTestNoCartridge ) {
-          selfTestNoCartridge_start                 ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_START_STATE                   );
           selfTestNoCartridge_waitDoorClose         ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE     );
           selfTestNoCartridge_pressureCheck         ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE         );
           selfTestNoCartridge_homeValves            ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_VALVES_STATE             );
@@ -92,7 +87,7 @@
           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_occlusionSensors              ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_OCCLUSION_SENSORS_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                );
@@ -112,7 +107,6 @@
     // Prime blood and dialysate circuits and run wet self-tests state
     bool mPrime                                     = vData.mSubMode                    == GuiPreTreatmentStates                    ::HD_PRE_TREATMENT_PRIME_STATE                       ;
     if ( mPrime ) {
-          prime_start                               ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_START_STATE                              );
           prime_waitUserStart                       ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_WAIT_FOR_USER_START_STATE                );
           prime_salineSetup                         ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_SALINE_SETUP_STATE                       );
           prime_salinePurgeAir                      ( vData.mPrimeState                 == GuiPreTreatmentPrimeStates               ::HD_PRIME_SALINE_PURGE_AIR_STATE                   );