Index: unittests/tst_models.h
===================================================================
diff -u -rc421ddadef2ade71d3abe269493a84b12b85296b -raa0772fe1b0ff6b07e9f64e8c38acad66ad5468d
--- unittests/tst_models.h	(.../tst_models.h)	(revision c421ddadef2ade71d3abe269493a84b12b85296b)
+++ unittests/tst_models.h	(.../tst_models.h)	(revision aa0772fe1b0ff6b07e9f64e8c38acad66ad5468d)
@@ -31,23 +31,6 @@
     void tst_MTreatmentRanges_data ();
     void tst_MTreatmentRanges      ();
 
-
-    // - 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
@@ -69,5 +52,40 @@
     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();
 };