Index: unittests/tst_models.h
===================================================================
diff -u -r0de28b779f05ad19581646e2efc4b3ffda65de21 -r4489378415df8f8398f59a20ca637b39f2ed2613
--- unittests/tst_models.h	(.../tst_models.h)	(revision 0de28b779f05ad19581646e2efc4b3ffda65de21)
+++ unittests/tst_models.h	(.../tst_models.h)	(revision 4489378415df8f8398f59a20ca637b39f2ed2613)
@@ -34,8 +34,6 @@
     // Treatment Start / Stop
     void tst_MAdjustInitTreatmentResponse_data();
     void tst_MAdjustInitTreatmentResponse();
-    void tst_MEndTreatmentResponse_data();
-    void tst_MEndTreatmentResponse();
     void tst_MInitTreatmentRequest();
     void tst_MEndTreatmentRequest();
 
@@ -69,10 +67,6 @@
     void tst_MAdjustPressuresLimitsResponse_data ();
     void tst_MAdjustPressuresLimitsResponse      ();
 
-    // -- Treatment Saline Bolus
-//    void tst_MSalineBolusResponse_data();
-//    void tst_MSalineBolusResponse();
-
     // -- Treatment Heparin
     void tst_MHeparinResponse_data();
     void tst_MHeparinResponse();
@@ -119,6 +113,66 @@
     void tst_MPreTreatmentPrime_data();
     void tst_MPreTreatmentPrime();
 
+    // Treatment Parameters
+    void tst_MTreatmentParametersResp_data();
+    void tst_MTreatmentParametersResp();
+    void tst_MAdjustTreatmentLogResponse_data();
+    void tst_MAdjustTreatmentLogResponse();
+    void tst_MHDSyringePump_data();
+    void tst_MHDSyringePump();
+    void tst_MHDAirTrapData_data();
+    void tst_MHDAirTrapData();
+    void tst_MHDBloodLeakData_data();
+    void tst_MHDBloodLeakData();
+    void tst_MHDAccelerometer_data();
+    void tst_MHDAccelerometer();
+    void tst_MHDUsageInfoResponse_data();
+    void tst_MHDUsageInfoResponse();
+    void tst_MHDAirBubbleData_data();
+    void tst_MHDAirBubbleData();
+    void tst_MPreTreatmentStates_data();
+    void tst_MPreTreatmentStates();
+    void tst_MPreTreatmentSelfTestNoCartridge_data();
+    void tst_MPreTreatmentSelfTestNoCartridge();
+    void tst_MPreTreatmentSelfTestDry_data();
+    void tst_MPreTreatmentSelfTestDry();
+    void tst_MPostTreatmentStates_data();
+    void tst_MPostTreatmentStates();
+    void tst_MTreatmentStop_data();
+    void tst_MTreatmentStop();
+    void tst_MTreatmentRinseback_data();
+    void tst_MTreatmentRinseback();
+    void tst_MTreatmentRecirculate_data();
+    void tst_MTreatmentRecirculate();
+    void tst_MTreatmentBloodPrime_data();
+    void tst_MTreatmentBloodPrime();
+    void tst_MTreatmentLogEventData_data();
+    void tst_MTreatmentLogEventData();
+    void tst_MTreatmentLogAvrgeData_data();
+    void tst_MTreatmentLogAvrgeData();
+    void tst_MTreatmentLogAlarmData_data();
+    void tst_MTreatmentLogAlarmData();
+
+    // data post
+    void tst_MHDRTCEpochData_data();
+    void tst_MHDRTCEpochData();
+    void tst_MHDPostSingleResult_data();
+    void tst_MHDPostSingleResult();
+    void tst_MHDPostFinalResult_data();
+    void tst_MHDPostFinalResult();
+
+    // hd/adjustments/settings
+    void tst_MAdjustHDAlarmVolumeResponse_data();
+    void tst_MAdjustHDAlarmVolumeResponse();
+    void tst_MAdjustHDDateTimeResponse_data();
+    void tst_MAdjustHDDateTimeResponse();
+    void tst_MAdjustServiceModeResponse_data();
+    void tst_MAdjustServiceModeResponse();
+    void tst_MAdjustVersionsHDResponse_data();
+    void tst_MAdjustVersionsHDResponse();
+    void tst_MAdjustServiceDatesHDResponse_data();
+    void tst_MAdjustServiceDatesHDResponse();
+
     // Alarms
     void tst_MAlarmStatus_text();
 
@@ -133,8 +187,4 @@
 
     void tst_MAlarmAcknowledgeRequest();
 
-
-    // Treatment Parameters
-    void tst_MTreatmentParametersResp_data();
-    void tst_MTreatmentParametersResp();
 };