Index: unittests/tst_models.h
===================================================================
diff -u -r7d3062c841b788ced31d939dec990afe0de1442d -rc421ddadef2ade71d3abe269493a84b12b85296b
--- unittests/tst_models.h	(.../tst_models.h)	(revision 7d3062c841b788ced31d939dec990afe0de1442d)
+++ unittests/tst_models.h	(.../tst_models.h)	(revision c421ddadef2ade71d3abe269493a84b12b85296b)
@@ -28,27 +28,44 @@
 
 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      ();
 
-    void tst_MTemperatureSensors_data ();
-    void tst_MTemperatureSensors      ();
+    // - DG Data
+    // -- DG Drain Pump
+    void tst_MDGDrainPump_data ();
+    void tst_MDGDrainPump      ();
 
+    // -- DG Heaters
+    void tst_MDGHeaters_data ();
+    void tst_MDGHeaters      ();
+
+    // DG Load Cell Readings
+    void tst_MDGLoadCellReadings_data ();
+    void tst_MDGLoadCellReadings      ();
+
+    void tst_MDGTemperatures_data ();
+    void tst_MDGTemperatures      ();
+
+    // - Treatment Adjustments
+
+    // -- 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      ();