Index: unittests/tst_models.h
===================================================================
diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -red5d989264015440d9da6d0830679394a323cf55
--- unittests/tst_models.h	(.../tst_models.h)	(revision b798668f16ad0967ab97e96f5f9a2cdd821e899f)
+++ unittests/tst_models.h	(.../tst_models.h)	(revision ed5d989264015440d9da6d0830679394a323cf55)
@@ -2,13 +2,14 @@
  *
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \copyright
- *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,
- *          IN PART OR IN WHOLE,
- *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file    tst_models.h
- * \date    04/16/2020
- * \author  Behrouz NematiPour
+ * \file tst_models.h
+ * \author (last) Peter Lucia
+ * \date (last) 01-Jul-2020
+ * \author (original) Behrouz NematiPour
+ * \date (original) 21-Apr-2020
  *
  */
 #pragma once
@@ -27,15 +28,75 @@
     explicit tst_models(QObject *parent = nullptr);
 
 private slots:
+    void tst_MTreatmentRanges_data ();
+    void tst_MTreatmentRanges      ();
 
-    void tst_MAdjustBloodDialysateResponse_data ();
-    void tst_MAdjustBloodDialysateResponse      ();
+    // - Treatment Adjustments
 
+    // -- Treatment Duration
     void tst_MAdjustDurationResponse_data ();
     void tst_MAdjustDurationResponse      ();
 
-    void tst_MTreatmentRanges_data ();
-    void tst_MTreatmentRanges      ();
+    // -- Treatment Blood/Dialysate Flow
+    void tst_MAdjustBloodDialysateResponse_data ();
+    void tst_MAdjustBloodDialysateResponse      ();
 
-};
+    // -- Ultrafiltration
+    // --- State
+    void tst_MAdjustUltrafiltrationStateResponse_data ();
+    void tst_MAdjustUltrafiltrationStateResponse      ();
+    // --- Edit
+    void tst_MAdjustUltrafiltrationEditResponse_data ();
+    void tst_MAdjustUltrafiltrationEditResponse      ();
+    // --- Confirm
+    void tst_MAdjustUltrafiltrationConfirmResponse_data ();
+    void tst_MAdjustUltrafiltrationConfirmResponse      ();
 
+    // - 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_MPowerOff_data();
+    void tst_MPowerOff();
+
+    // 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();
+};