Index: unittests/tst_models.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -ra4a9b265047c67b7f2b058bcfd4d6b15bb4f2651
--- unittests/tst_models.h	(.../tst_models.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ unittests/tst_models.h	(.../tst_models.h)	(revision a4a9b265047c67b7f2b058bcfd4d6b15bb4f2651)
@@ -28,113 +28,134 @@
     explicit tst_models(QObject *parent = nullptr);
 
 private slots:
-    void tst_MTreatmentRanges_data ();
-    void tst_MTreatmentRanges      ();
+    // -- UI/Data
+    void tst_MUIBloodPressureData_data();
+    void tst_MUIBloodPressureData();
 
-    // Treatment Start / Stop
-    void tst_MAdjustInitTreatmentResponse_data();
-    void tst_MAdjustInitTreatmentResponse();
-    void tst_MEndTreatmentResponse_data();
-    void tst_MEndTreatmentResponse();
-    void tst_MInitTreatmentRequest();
-    void tst_MEndTreatmentRequest();
+    // ---------- HD ---------- //
+    // -- Adjustment disinfect --
+    // -- Adjustment Post Treatment --
+    void tst_MPostTreatmentAdjustTreatmentLogResponse_data();
+    void tst_MPostTreatmentAdjustTreatmentLogResponse();
+    //void tst_MAdjustDisposablesRemovalConfirmResponse_data();
+    //void tst_MAdjustDisposablesRemovalConfirmResponse();
 
-    // - Treatment Adjustments
-    void tst_MAdjustmentTreatmentParametersRequest();
+    // -- Adjustment Pre Treatment --
+    void tst_MPreTreatmentAdjustParametersValidationResponse_data   (); //Parameter Validation response
+    void tst_MPreTreatmentAdjustParametersValidationResponse        ();
+    void tst_MAdjustUltrafiltrationInitResponse_data                (); // UF init
+    void tst_MAdjustUltrafiltrationInitResponse                     ();
 
-    // -- Treatment Duration
-    void tst_MAdjustDurationResponse_data ();
-    void tst_MAdjustDurationResponse      ();
+    // --Adjustment Settings --
+    void tst_MAdjustHDServiceDatesResponse_data(); //Service Dates
+    void tst_MAdjustHDServiceDatesResponse     ();
+    void tst_MAdjustHDServiceModeResponse_data (); //Service Modes
+    void tst_MAdjustHDServiceModeResponse      ();
 
-    // -- Treatment Blood/Dialysate Flow
-    void tst_MAdjustBloodDialysateResponse_data ();
-    void tst_MAdjustBloodDialysateResponse      ();
-
-    // -- Ultrafiltration
-    // --- Init
-    void tst_MAdjustUltrafiltrationInitResponse_data ();
-    void tst_MAdjustUltrafiltrationInitResponse      ();
-    // --- State
-    void tst_MAdjustUltrafiltrationStateResponse_data ();
-    void tst_MAdjustUltrafiltrationStateResponse      ();
-    // --- Edit
-    void tst_MAdjustUltrafiltrationEditResponse_data ();
-    void tst_MAdjustUltrafiltrationEditResponse      ();
-    // --- Confirm
-    void tst_MAdjustUltrafiltrationConfirmResponse_data ();
+    // -- Treatment --
+    void tst_MAdjustBloodDialysateResponse_data         (); //Blood Dialysate Response
+    void tst_MAdjustBloodDialysateResponse              ();
+    void tst_MAdjustDurationResponse_data               (); //Duration Response
+    void tst_MAdjustDurationResponse                    ();
+    void tst_MAdjustUltrafiltrationStateResponse_data   (); //UF State
+    void tst_MAdjustUltrafiltrationStateResponse        ();
+    void tst_MAdjustUltrafiltrationEditResponse_data    (); //UF Edit
+    void tst_MAdjustUltrafiltrationEditResponse         ();
+    void tst_MAdjustUltrafiltrationConfirmResponse_data (); //UF Confirm
     void tst_MAdjustUltrafiltrationConfirmResponse      ();
-    void tst_MConfirmTreatmentRequest();
 
-    // -- Treatment Inline pressures
-    void tst_MAdjustPressuresLimitsResponse_data ();
-    void tst_MAdjustPressuresLimitsResponse      ();
+    // -- Data Messages --
+    void tst_MHDSyringePump_data    (); //Syringe Pump
+    void tst_MHDSyringePump         ();
+    void tst_MTreatmentRanges_data  (); //Treatment Ranges
+    void tst_MTreatmentRanges       ();
+    void tst_MBloodLeak_data        (); //Blood leak
+    void tst_MBloodLeak             ();
+    // Treatment Data Messages
+    void tst_MTreatmentStateData_data();
+    void tst_MTreatmentStateData();
+    // -- Alarms
+    void tst_AlarmActiveList_data();
+    void tst_AlarmActiveList();
+    //    void tst_MAlarmStatus_text();
+    //    void tst_MAlarmStatus_data();
+    //    void tst_MAlarmStatus();
+    //    void tst_MAlarmTriggered_data();
+    //    void tst_MAlarmTriggered();
+    //    void tst_MAlarmCleared_data();
+    //    void tst_MAlarmCleared();
+    //    void tst_MAlarmAcknowledgeRequest();
 
-    // -- Treatment Saline Bolus
-    void tst_MSalineBolusResponse_data();
-    void tst_MSalineBolusResponse();
 
-    // -- Treatment Heparin
-    void tst_MHeparinResponse_data();
-    void tst_MHeparinResponse();
-
-    // - Data Messages
-    void tst_DGROPumpData_data();
-    void tst_DGROPumpData();
-    void tst_DGPressuresData_data();
-    void tst_DGPressuresData();
-    void tst_DGDrainPumpData_data();
-    void tst_DGDrainPumpData();
-    void tst_DGOperationMode_data();
-    void tst_DGOperationMode();
-    void tst_DGReservoirData_data();
-    void tst_DGReservoirData();
-    void tst_DGValvesStates_data();
-    void tst_DGValvesStates();
-    void tst_DGHeatersData_data();
-    void tst_DGHeatersData();
-    void tst_DGLoadCellReadingsData_data();
-    void tst_DGLoadCellReadingsData();
+    // -- DG
+    // -- Data Messages
     void tst_DGTemperaturesData_data();
     void tst_DGTemperaturesData();
-    void tst_MTreatmentStateData_data();
-    void tst_MTreatmentStateData();
-    void tst_MHDOperationModeData_data();
-    void tst_MHDOperationModeData();
-    void tst_MOutletFlowData_data();
-    void tst_MOutletFlowData();
-    void tst_MBloodFlowData_data();
-    void tst_MBloodFlowData();
-    void tst_MDialysateFlowData_data();
-    void tst_MDialysateFlowData();
-    void tst_MTreatmentTimeData_data();
-    void tst_MTreatmentTimeData();
-    void tst_MPressureOcclusionData_data();
-    void tst_MPressureOcclusionData();
-    void tst_MTreatmentSalineBolusData_data();
-    void tst_MTreatmentSalineBolusData();
-    void tst_MTreatmentHeparinData_data();
-    void tst_MTreatmentHeparinData();
-    void tst_MPowerOff_data();
-    void tst_MPowerOff();
-    void tst_MPreTreatmentPrime_data();
-    void tst_MPreTreatmentPrime();
+    //    void tst_DGROPumpData_data();
+    //    void tst_DGROPumpData();
+    //    void tst_DGPressuresData_data();
+    //    void tst_DGPressuresData();
+    //    void tst_DGDrainPumpData_data();
+    //    void tst_DGDrainPumpData();
+    //    void tst_DGOperationMode_data();
+    //    void tst_DGOperationMode();
+    //    void tst_DGReservoirData_data();
+    //    void tst_DGReservoirData();
+    //    void tst_DGValvesStates_data();
+    //    void tst_DGValvesStates();
+    //    void tst_DGHeatersData_data();
+    //    void tst_DGHeatersData();
+    //    void tst_DGLoadCellReadingsData_data();
+    //    void tst_DGLoadCellReadingsData();
 
-    // Alarms
-    void tst_MAlarmStatus_text();
 
-    void tst_MAlarmStatus_data();
-    void tst_MAlarmStatus();
 
-    void tst_MAlarmTriggered_data();
-    void tst_MAlarmTriggered();
 
-    void tst_MAlarmCleared_data();
-    void tst_MAlarmCleared();
+//    void tst_MConfirmTreatmentRequest();
 
-    void tst_MAlarmAcknowledgeRequest();
+//    // Treatment Start / Stop
+//    void tst_MAdjustInitTreatmentResponse_data();
+//    void tst_MAdjustInitTreatmentResponse();
+//    void tst_MEndTreatmentResponse_data();
+//    void tst_MEndTreatmentResponse();
+//    void tst_MInitTreatmentRequest();
+//    void tst_MEndTreatmentRequest();
 
+//    // - Treatment Adjustments
+//    void tst_MAdjustmentTreatmentParametersRequest();
 
-    // Treatment Parameters
-    void tst_MTreatmentParametersResp_data();
-    void tst_MTreatmentParametersResp();
+//    // -- Treatment Inline pressures
+//    void tst_MAdjustPressuresLimitsResponse_data ();
+//    void tst_MAdjustPressuresLimitsResponse      ();
+
+//    // -- Treatment Saline Bolus
+//    void tst_MSalineBolusResponse_data();
+//    void tst_MSalineBolusResponse();
+
+//    // -- Treatment Heparin
+//    void tst_MHeparinResponse_data();
+//    void tst_MHeparinResponse();
+
+//    // - Data Messages
+//    void tst_MHDOperationModeData_data();
+//    void tst_MHDOperationModeData();
+//    void tst_MOutletFlowData_data();
+//    void tst_MOutletFlowData();
+//    void tst_MBloodFlowData_data();
+//    void tst_MBloodFlowData();
+//    void tst_MDialysateFlowData_data();
+//    void tst_MDialysateFlowData();
+//    void tst_MTreatmentTimeData_data();
+//    void tst_MTreatmentTimeData();
+//    void tst_MPressureOcclusionData_data();
+//    void tst_MPressureOcclusionData();
+//    void tst_MTreatmentSalineBolusData_data();
+//    void tst_MTreatmentSalineBolusData();
+//    void tst_MTreatmentHeparinData_data();
+//    void tst_MTreatmentHeparinData();
+//    void tst_MPowerOff_data();
+//    void tst_MPowerOff();
+//    void tst_MPreTreatmentPrime_data();
+//    void tst_MPreTreatmentPrime();
+
 };