Index: unittests/tst_models.cpp
===================================================================
diff -u -r7777127f3b60d5f884cd07adc9d586353d914f69 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 7777127f3b60d5f884cd07adc9d586353d914f69)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383)
@@ -41,6 +41,7 @@
 #include "MTreatmentSalineData.h"
 #include "MPrimingData.h"
 
+#include "MTreatmentAdjustUltrafiltrationInitResponse.h"
 #include "MTreatmentAdjustUltrafiltrationStateResponse.h"
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
 #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
@@ -1515,7 +1516,43 @@
     }
 }
 
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmClearedCondition ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmClearedCondition data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MAlarmClearedCondition_data () {
+    QTest::addColumn<int        >("errorIndex");
+    QTest::addColumn<QByteArray >("data");
+    QTest::newRow("msg complete") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03"));
+    QTest::newRow("mAlarmID    ") <<  1 << QByteArray::fromHex(QByteArray());
+    QTest::newRow("mAlarmID    ") <<  1 << QByteArray::fromHex(QByteArray("00"));
+    QTest::newRow("mAlarmID    ") <<  1 << QByteArray::fromHex(QByteArray("00" "01"));
+    QTest::newRow("mAlarmID    ") <<  1 << QByteArray::fromHex(QByteArray("00" "01" "02"));
+}
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAlarmCleared test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MAlarmClearedCondition() {
+    Model::MAlarmClearedCondition mData;
 
+    QFETCH(int       , errorIndex );
+    QFETCH(QByteArray, data       );
+
+    int startIndex  = 0;
+    int index       = errorIndex - 1;
+    bool ok         = mData.fromByteArray(data, &startIndex);
+    Q_UNUSED(ok)
+#ifdef CONSOLEOUT
+    qDebug() << index << errorIndex << startIndex << ok << data ;
+#endif
+
+    switch (errorIndex) {
+    case  0: { index = 0                                  ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    case  1: { index = index * sizeof mData._data.mAlarmID; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break;
+    default:
+        QVERIFY2(false, "Incorrect Test");
+        break;
+    }
+}
+
+
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentParametersResp test ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentParametersResp data definition ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MTreatmentParametersResp_data()
@@ -1791,7 +1828,7 @@
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MStartTreatmentResponse() {
-    Model::MStartTreatmentResponse mData;
+    Model::MTreatmentStartResponse mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1829,7 +1866,7 @@
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MEndTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MEndTreatmentResponse() {
-    Model::MEndTreatmentResponse mData;
+    Model::MTreatmentEndResponse mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1962,15 +1999,15 @@
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_StartTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentStartReq, vData, payload));
 }
 
 void tst_models::tst_MConfirmTreatmentRequest()
 {
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_ConfirmTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentConfirmReq, vData, payload));
 }
 
 void tst_models::tst_MEndTreatmentRequest()
@@ -1979,18 +2016,34 @@
     QVariantList vData;
     QByteArray payload;
     Message msg;
-    msg.actionId = Gui::GuiActions::ID_EndTreatmentReq;
+    msg.actionId = Gui::GuiActions::ID_TreatmentEndReq;
 
-    QVERIFY(interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload));
+    QVERIFY(interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentEndReq, vData, payload));
     QVERIFY(!interpreter.interpretMessage_HD(msg,vData));
     vData.append(0);
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentEndReq, vData, payload));
 }
 
 void tst_models::tst_MAdjustmentTreatmentParametersRequest()
 {
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_CreateTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentCreateReq, vData, payload));
 }
+
+void tst_models::tst_MAlarmUserActionRequest()
+{
+    MessageInterpreter interpreter;
+    QVariantList vData;
+    QByteArray payload;
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmUserActionReq, vData, payload));
+}
+
+void tst_models::tst_MAlarmClearedConditionRequest()
+{
+    MessageInterpreter interpreter;
+    QVariantList vData;
+    QByteArray payload;
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmClearedConditionReq, vData, payload));
+}