Index: unittests/tst_models.h
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rc9a1c1dd6e73cba5f266595f948c77422472a150
--- unittests/tst_models.h	(.../tst_models.h)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ unittests/tst_models.h	(.../tst_models.h)	(revision c9a1c1dd6e73cba5f266595f948c77422472a150)
@@ -28,113 +28,184 @@
     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 --
+//    void tst_MDisinfectAdjustRequest();
 
-    // - Treatment Adjustments
-    void tst_MAdjustmentTreatmentParametersRequest();
+    // -- Adjustment Post Treatment --
+    void tst_MPostTreatmentAdjustTreatmentLogResponse_data();
+    void tst_MPostTreatmentAdjustTreatmentLogResponse();
+    //void tst_MAdjustDisposablesRemovalConfirmResponse_data();
+    //void tst_MAdjustDisposablesRemovalConfirmResponse();
 
-    // -- Treatment Duration
-    void tst_MAdjustDurationResponse_data ();
-    void tst_MAdjustDurationResponse      ();
+    // -- Adjustment Pre Treatment --
+    void tst_MPreTreatmentAdjustParametersValidationResponse_data   (); //Parameter Validation response
+    void tst_MPreTreatmentAdjustParametersValidationResponse        ();
+    void tst_MAdjustUltrafiltrationInitResponse_data                (); //UF init
+    void tst_MAdjustUltrafiltrationInitResponse                     ();
 
-    // -- Treatment Blood/Dialysate Flow
-    void tst_MAdjustBloodDialysateResponse_data ();
-    void tst_MAdjustBloodDialysateResponse      ();
+    // --Adjustment Settings --
+    void tst_MAdjustHDServiceDatesResponse_data(); //Service Dates
+    void tst_MAdjustHDServiceDatesResponse     ();
+    void tst_MAdjustHDServiceModeResponse_data (); //Service Modes
+    void tst_MAdjustHDServiceModeResponse      ();
+    void tst_MAdjustHDVersionResponse_data     (); //Versions Response
+    void tst_MAdjustHDVersionResponse          ();
+    void tst_MAdjustHDAlarmVolumeResponse_data (); //Alarm Volume Response
+    void tst_MAdjustHDAlarmVolumeResponse      ();
+    void tst_MAdjustHDDateTimeResponse_data    (); //Date Time Respomse
+    void tst_MAdjustHDDateTimeResponse         ();
 
-    // -- 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 ();
+    // -- Adjustment 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      ();
-
-    // -- Treatment Saline Bolus
-    void tst_MSalineBolusResponse_data();
+    void tst_MAdjustPressuresLimits_Response_data       (); //Pressures Limits Response
+    void tst_MAdjustPressuresLimits_Response            ();
+    void tst_MSalineBolusResponse_data                  (); //Saline Bolus Response
     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();
-    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();
-
-    // Alarms
+    // -- 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();
 
-    void tst_MAlarmCleared_data();
-    void tst_MAlarmCleared();
+    // -- Data Messages --
+    void tst_MHDAccelerometer_data  (); //Accelerometer
+    void tst_MHDAccelerometer       ();
+    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_MTreatmentState_data           (); // Treatment State Data
+    void tst_MTreatmentState                ();
+    void tst_MBloodFlowData_data            (); // Blood Flow Data
+    void tst_MBloodFlowData                 ();
+    void tst_MDialysateFlowData_data        (); // Dialysate Flow Data
+    void tst_MDialysateFlowData             ();
+    void tst_MOutletFlowData_data           (); // Outlet Flow Data
+    void tst_MOutletFlowData                ();
+    void tst_MPressureOcclusionData_data    (); // Pressure and Occlusion Data
+    void tst_MPressureOcclusionData         ();
+    void tst_MTreatmentRinsebackData_data   (); // Rinseback Data
+    void tst_MTreatmentRinsebackData        ();
+    void tst_MTreatmentBloodPrimeData_data  (); // Blood Prime Data
+    void tst_MTreatmentBloodPrimeData       ();
+    void tst_MTreatmentSalineBolusData_data (); // Saline Bolus Data
+    void tst_MTreatmentSalineBolusData      ();
+    void tst_MTreatmentTimeData_data        (); // Treatment Time Data
+    void tst_MTreatmentTimeData             ();
+    // -- Pre-Treatment States Data
+    void tst_MPreTreatmentStates_data       (); // PreTreatment States Data
+    void tst_MPreTreatmentStates            ();
+    // -- Treatment Log Data
+    void tst_MtreatmentLogAvrge_data        (); // Treatment log average
+    void tst_MtreatmentLogAvrge             ();
+    void tst_MTreatmentLogAlarm_data        (); // Treatment log alarm
+    void tst_MTreatmentLogAlarm             ();
+    void tst_MTreatmentLogEventData_data    (); // Treatment log event
+    void tst_MTreatmentLogEventData         ();
 
-    void tst_MAlarmAcknowledgeRequest();
+    // -- DG
+    // -- Adjustment/Settings
+    void tst_MDGVersionsResponse_data           (); //DG Versions Response
+    void tst_MDGVersionsResponse                ();
+    void tst_MAdjustDGDateTimeResponse_data     (); //DG Date Time Response
+    void tst_MAdjustDGDateTimeResponse          ();
+    void tst_MAdjustDGServiceDatesResponse_data (); //DG Service Dates Response
+    void tst_MAdjustDGServiceDatesResponse      ();
 
+    // -- Disinfect Data Messages
+//    void tst_MDisinfectStates_data      (); //Disinfect States
+//    void tst_MDisinfectStates           ();
 
-    // Treatment Parameters
-    void tst_MTreatmentParametersResp_data();
-    void tst_MTreatmentParametersResp();
+    // -- Poost Data Messages
+    void tst_MDGPostSingleResult_data   ();//DG Post Single Result Data
+    void tst_MDGPostSingleResult        ();
+
+    // -- Pretreatment Data Messages
+    void tst_MDGFilterFlush_data        (); //DG Filter Flush
+    void tst_MDGFilterFlush             ();
+
+    // -- Data Messages
+    void tst_MDGAccelerometer_data      (); //DG Accelerometer
+    void tst_MDGAccelerometer           ();
+    void tst_MDGTemperaturesData_data   (); //DG Temperature Data
+    void tst_MDGTemperaturesData        ();
+    void tst_MDGConductivity_data       (); //DG Conductivity
+    void tst_MDGConductivity            ();
+    void tst_DGDrainPumpData_data       (); //Drain Pump
+    void tst_DGDrainPumpData            ();
+    void tst_DGLoadCellReadingsData_data(); //Load Cell Readings
+    void tst_DGLoadCellReadingsData     ();
+    void tst_DGPressuresData_data       (); //Pressure Data
+    void tst_DGPressuresData            ();
+    void tst_DGROPumpData_data          (); //RO Pump Data
+    void tst_DGROPumpData               ();
+    void tst_DGHeatersData_data         (); //Heaters Data
+    void tst_DGHeatersData              ();
+    void tst_DGReservoirData_data       (); //Reservoir Data
+    void tst_DGReservoirData            ();
+    void tst_DGOperationMode_data       (); //DG Operation Mode Data
+    void tst_DGOperationMode            ();
+
+    //    void tst_DGValvesStates_data();
+    //    void tst_DGValvesStates();
+
+
+
+
+
+//    void tst_MConfirmTreatmentRequest();
+
+//    // 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 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_MTreatmentHeparinData_data();
+//    void tst_MTreatmentHeparinData();
+//    void tst_MPowerOff_data();
+//    void tst_MPowerOff();
+//    void tst_MPreTreatmentPrime_data();
+//    void tst_MPreTreatmentPrime();
 };