Index: unittests/tst_models.h
===================================================================
diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -rd2035a8728794afeefaa244bf8d1597926d945f5
--- unittests/tst_models.h	(.../tst_models.h)	(revision 44a85c96ab55e424866ec4cca0270aa218355f82)
+++ unittests/tst_models.h	(.../tst_models.h)	(revision d2035a8728794afeefaa244bf8d1597926d945f5)
@@ -29,30 +29,66 @@
 
 private slots:
 
-    void tst_MAdjustBloodDialysateResponse_data ();
-    void tst_MAdjustBloodDialysateResponse      ();
-
-    void tst_MAdjustDurationResponse_data ();
-    void tst_MAdjustDurationResponse      ();
-
     void tst_MTreatmentRanges_data ();
     void tst_MTreatmentRanges      ();
 
-    void tst_MLoadCellReadings_data ();
-    void tst_MLoadCellReadings      ();
+    // - Treatment Adjustments
 
-    void tst_MTemperatureSensors_data ();
-    void tst_MTemperatureSensors      ();
+    // -- Treatment Duration
+    void tst_MAdjustDurationResponse_data ();
+    void tst_MAdjustDurationResponse      ();
 
+    // -- 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      ();
 
     void tst_MAlarmStatus();
+    
+    // - 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();
 };