Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf)
@@ -72,14 +72,9 @@
     STATE   ( bool   , selfTestConsumables_acidPump             , false ) ///< CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE      , Consumable self-tests acid concentrate pump check state
     STATE   ( bool   , selfTestConsumables_complete             , false ) ///< CONSUMABLE_SELF_TESTS_COMPLETE_STATE             , Consumable self-tests complete state
 
-    // Self tests with no cartridge state
     PROPERTY( bool   , selfTestNoCartridge_start                , false ) ///< NO_CART_SELF_TESTS_START_STATE                   , No cartridge self-tests starting state.
     PROPERTY( bool   , selfTestNoCartridge_waitDoorClose        , false ) ///< NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE     , Wait for door to be closed before running self-tests.
-    PROPERTY( bool   , selfTestNoCartridge_occlusionSensors     , false ) ///< NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE       , No cartridge occlusion sensors self-test state.
-    PROPERTY( bool   , selfTestNoCartridge_bloodFlowMeters      , false ) ///< NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE       , No cartridge blood flow meter self-test state.
-    PROPERTY( bool   , selfTestNoCartridge_dialysateFlowMeters  , false ) ///< NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE   , No cartridge dialysate flow meter self-test state.
-    PROPERTY( bool   , selfTestNoCartridge_leakDetectors        , false ) ///< NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE          , No cartridge leak detectors self-test state.
-    PROPERTY( bool   , selfTestNoCartridge_boardTemperature     , false ) ///< NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE       , No cartridge board temperature self-test state.
+    PROPERTY( bool   , selfTestNoCartridge_pressureCheck        , false ) ///< NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE         , No cartridge pressure sensors self-test state
     PROPERTY( bool   , selfTestNoCartridge_homeValves           , false ) ///< NO_CART_SELF_TESTS_HOME_VALVES_STATE             , No cartridge home valves state
     PROPERTY( bool   , selfTestNoCartridge_homeSyringePump      , false ) ///< NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE       , No cartridge home syringe pump state
     PROPERTY( bool   , selfTestNoCartridge_pumps                , false ) ///< NO_CART_SELF_TESTS_PUMPS_STATE                   , No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state.
@@ -100,6 +95,7 @@
     STATE   ( bool   , selfTestDry_pressureSensors              , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_STATE            , Pressure sensors verify pressure readings state.
     STATE   ( bool   , selfTestDry_pressureSensorsNormal        , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE     , Pressure sensors verify normal pressure readings 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_complete                     , false ) ///< DRY_SELF_TESTS_COMPLETE_STATE                    , Dry self-test complete state.
 
@@ -111,6 +107,8 @@
     STATE   ( bool   , prime_salineCirculateBloodCircuit        , false ) ///< HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE         , Circulate blood circuit state
     STATE   ( bool   , prime_reservoiOneFillComplete            , false ) ///< HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE       , Wait for reservoir 1 fill complete
     STATE   ( bool   , prime_dialysateDialyzer                  , false ) ///< HD_PRIME_DIALYSATE_DIALYZER_STATE                , Dialysate dialyzer fluid path state
+    STATE   ( bool   , prime_salineDialyzerSetup                , false ) ///< HD_PRIME_SALINE_DIALYZER_SETUP_STATE             , Saline dialyzer setup state
+    STATE   ( bool   , prime_salineDialyzer                     , false ) ///< HD_PRIME_SALINE_DIALYZER_STATE                   , Saline dialyzer fluid path state
     STATE   ( bool   , prime_reservoirTwoFillComplete           , false ) ///< HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE       , Wait for reservoir 2 fill complete
     STATE   ( bool   , prime_dialysateBypass                    , false ) ///< HD_PRIME_DIALYSATE_BYPASS_STATE                  , Dialysate bypass fluid path state
     STATE   ( bool   , prime_wetSelfTests                       , false ) ///< HD_PRIME_WET_SELF_TESTS_STATE                    , Perform wet self-tests after priming complete