Index: denali.pro.user
===================================================================
diff -u -r542278273f3d13ad5fb5ba8916178d747c78fe77 -r97fc44f948bd39ed0b4238558a16bf99f750bf5e
--- denali.pro.user	(.../denali.pro.user)	(revision 542278273f3d13ad5fb5ba8916178d747c78fe77)
+++ denali.pro.user	(.../denali.pro.user)	(revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2020-08-12T17:25:20. -->
+<!-- Written by QtCreator 4.10.0, 2020-08-14T14:06:45. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -89,7 +89,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.5 GCC 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.5 GCC 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5125.gcc_64_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">9</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -1185,7 +1185,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/denali/projects/tmp/build/unittest/tst_views</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/denali/projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>
Index: sources/model/mtreatmentparameters.cpp
===================================================================
diff -u -rc838ade760d18fe2b391ea2e90bc04de0d4aa1eb -r97fc44f948bd39ed0b4238558a16bf99f750bf5e
--- sources/model/mtreatmentparameters.cpp	(.../mtreatmentparameters.cpp)	(revision c838ade760d18fe2b391ea2e90bc04de0d4aa1eb)
+++ sources/model/mtreatmentparameters.cpp	(.../mtreatmentparameters.cpp)	(revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e)
@@ -45,10 +45,10 @@
     data.bicarbonateConcentrate          = list[8].toUInt();
     data.dialyzerType                    = list[9].toUInt();
     data.dialysateTemp                   = list[10].toUInt();
-    data.arterialPressureLimitLow        = list[11].toUInt();
-    data.arterialPressureLimitHigh       = list[12].toUInt();
-    data.venousPressureLimitLow          = list[13].toUInt();
-    data.venousPressureLimitHigh         = list[14].toUInt();
+    data.arterialPressureLimitLow        = list[11].toInt();
+    data.arterialPressureLimitHigh       = list[12].toInt();
+    data.venousPressureLimitLow          = list[13].toInt();
+    data.venousPressureLimitHigh         = list[14].toInt();
     data.bloodPressureMeasureInterval    = list[15].toUInt();
     data.rinsebackFlowRate               = list[16].toUInt();
     return data;
Index: sources/view/VCreateTreatment.cpp
===================================================================
diff -u -r9551959461d534dc624f0cbcca0e6f953844fb16 -r97fc44f948bd39ed0b4238558a16bf99f750bf5e
--- sources/view/VCreateTreatment.cpp	(.../VCreateTreatment.cpp)	(revision 9551959461d534dc624f0cbcca0e6f953844fb16)
+++ sources/view/VCreateTreatment.cpp	(.../VCreateTreatment.cpp)	(revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e)
@@ -134,6 +134,7 @@
     reset_acidConcentrate();
     reset_bicarbonateConcentrate();
     reset_dialyzerType();
+    reset_dialysateTemp();
     reset_arterialPressureLimitLow();
     reset_arterialPressureLimitHigh();
     reset_venousPressureLimitLow();
Index: unittests/tst_messaging.cpp
===================================================================
diff -u -r9551959461d534dc624f0cbcca0e6f953844fb16 -r97fc44f948bd39ed0b4238558a16bf99f750bf5e
--- unittests/tst_messaging.cpp	(.../tst_messaging.cpp)	(revision 9551959461d534dc624f0cbcca0e6f953844fb16)
+++ unittests/tst_messaging.cpp	(.../tst_messaging.cpp)	(revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e)
@@ -810,6 +810,12 @@
 
     msg.actionId = Gui::GuiActionType::ID_CreateTreatmentReq;
     QVERIFY(! interpreter.createTreatmentRespData(msg, data));
+
+    QVariantList variantList = QVariantList() << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0
+                                                  << 0 << 0 << 0;
+    QByteArray byteArray;
+    QVERIFY(interpreter.interpretMessage(msg.actionId, variantList, byteArray));
+
 }
 
 /*!
Index: unittests/tst_models.cpp
===================================================================
diff -u -r68af13f9f6502069c79b7b63b5d9481abb2f270f -r97fc44f948bd39ed0b4238558a16bf99f750bf5e
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 68af13f9f6502069c79b7b63b5d9481abb2f270f)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e)
@@ -1384,49 +1384,84 @@
 {
     QTest::addColumn<int        >("errorIndex");
     QTest::addColumn<QByteArray >("data");
-    QTest::newRow("msg complete")                 <<  0 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"));
+    QTest::newRow("msg complete")                 <<  0 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"));
+
     QTest::newRow("requestValid")                 <<  1 << QByteArray::fromHex(QByteArray());
-    QTest::newRow("bloodFlowRate")                <<  2 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"));
-    QTest::newRow("dialysateFlowRate")            <<  3 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("duration")                     <<  4 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("heparinDispensingRate")        <<  5 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("heparinBolusVolume")           <<  6 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("heparinStopTime")              <<  7 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  ));
-    QTest::newRow("salineBolus")                  <<  8 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("acidConcentrate")              <<  9 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("bicarbonateConcentrate")       <<  10 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("dialyzerType")                 <<  11 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("dialysateTemp")                <<  12 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  ));
-    QTest::newRow("arterialPressureLimitLow")     <<  13 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("arterialPressureLimitHigh")    <<  14 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("venousPressureLimitLow")       <<  15 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("venousPressureLimitHigh")      <<  16 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
-    QTest::newRow("bloodPressureMeasureInterval") <<  17 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  ));
-    QTest::newRow("rinsebackFlowRate")            <<  18 << QByteArray::fromHex(QByteArray("00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
-                                                                                          "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("bloodFlowRate")                <<  2 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"));
+
+    QTest::newRow("dialysateFlowRate")            <<  3 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("duration")                     <<  4 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("heparinDispensingRate")        <<  5 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("heparinBolusVolume")           <<  6 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("heparinStopTime")              <<  7 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  ));
+    QTest::newRow("salineBolus")                  <<  8 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("acidConcentrate")              <<  9 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("bicarbonateConcentrate")       <<  10 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("dialyzerType")                 <<  11 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("dialysateTemp")                <<  12 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  ));
+
+    QTest::newRow("arterialPressureLimitLow")     <<  13 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("arterialPressureLimitHigh")    <<  14 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  ));
+
+    QTest::newRow("venousPressureLimitLow")       <<  15 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"));
+
+    QTest::newRow("venousPressureLimitHigh")      <<  16 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"));
+
+    QTest::newRow("bloodPressureMeasureInterval") <<  17 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  ));
+
+    QTest::newRow("rinsebackFlowRate")            <<  18 << QByteArray::fromHex(QByteArray(
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"  "00" "00" "00" "00"
+           "00" "00" "00" "00"  "00" "00" "00" "00"  ));
 }
 
 
@@ -1451,25 +1486,62 @@
              << "data: " << data;
 #endif
     switch (errorIndex) {
-    case  0:  { index = 0                                                      ; QVERIFY (  mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  1:  { index = index * sizeof mData._data.requestValid                ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  2:  { index = index * sizeof mData._data.bloodFlowRate               ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  3:  { index = index * sizeof mData._data.dialysateFlowRate           ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  4:  { index = index * sizeof mData._data.duration                    ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  5:  { index = index * sizeof mData._data.heparinDispensingRate       ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  6:  { index = index * sizeof mData._data.heparinBolusVolume          ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  7:  { index = index * sizeof mData._data.heparinStopTime             ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  8:  { index = index * sizeof mData._data.salineBolus                 ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  9:  { index = index * sizeof mData._data.acidConcentrate             ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  10: { index = index * sizeof mData._data.bicarbonateConcentrate      ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  11: { index = index * sizeof mData._data.dialyzerType                ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  12: { index = index * sizeof mData._data.dialysateTemp               ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  13: { index = index * sizeof mData._data.arterialPressureLimitLow    ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  14: { index = index * sizeof mData._data.arterialPressureLimitHigh   ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  15: { index = index * sizeof mData._data.venousPressureLimitLow      ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  16: { index = index * sizeof mData._data.venousPressureLimitHigh     ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  17: { index = index * sizeof mData._data.bloodPressureMeasureInterval; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
-    case  18: { index = index * sizeof mData._data.rinsebackFlowRate           ; QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+    case  0:  { index = 0;
+        QVERIFY (  mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  1:  { index = index * sizeof mData._data.requestValid;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  2:  { index = index * sizeof mData._data.bloodFlowRate;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  3:  { index = index * sizeof mData._data.dialysateFlowRate;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  4:  { index = index * sizeof mData._data.duration;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  5:  { index = index * sizeof mData._data.heparinDispensingRate;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  6:  { index = index * sizeof mData._data.heparinBolusVolume;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  7:  { index = index * sizeof mData._data.heparinStopTime;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  8:  { index = index * sizeof mData._data.salineBolus;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  9:  { index = index * sizeof mData._data.acidConcentrate;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  10: { index = index * sizeof mData._data.bicarbonateConcentrate;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  11: { index = index * sizeof mData._data.dialyzerType;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  12: { index = index * sizeof mData._data.dialysateTemp;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  13: { index = index * sizeof mData._data.arterialPressureLimitLow;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  14: { index = index * sizeof mData._data.arterialPressureLimitHigh;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  15: { index = index * sizeof mData._data.venousPressureLimitLow;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  16: { index = index * sizeof mData._data.venousPressureLimitHigh;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  17: { index = index * sizeof mData._data.bloodPressureMeasureInterval;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
+
+    case  18: { index = index * sizeof mData._data.rinsebackFlowRate;
+        QVERIFY ( !mData.fromByteArray(data)); QCOMPARE(index, startIndex); } break;
     default:
         QVERIFY2(false, "Incorrect Test");
         break;
@@ -1530,3 +1602,59 @@
         }
     }
 }
+
+
+void tst_models::tst_MTreatmentParameters_fromVariantList()
+{
+    Model::TreatmentParameters mData;
+
+    QVariantList list;
+    for (int i = 0; i < 20; ++i)
+    {
+
+        list.append(QVariant(1));
+        TreatmentData tempData = mData.fromVariantList(list);
+        if (i == 16) {
+            QVERIFY(1 == tempData.bloodFlowRate);
+            QVERIFY(1 == tempData.dialysateFlowRate);
+            QVERIFY(1 == tempData.duration);
+            QVERIFY(1 == tempData.heparinDispensingRate);
+            QVERIFY(1 == tempData.heparinBolusVolume);
+            QVERIFY(1 == tempData.heparinStopTime);
+            QVERIFY(1 == tempData.salineBolus);
+            QVERIFY(1 == tempData.acidConcentrate);
+            QVERIFY(1 == tempData.bicarbonateConcentrate);
+            QVERIFY(1 == tempData.dialyzerType);
+            QVERIFY(1 == tempData.dialysateTemp);
+            QVERIFY(1 == tempData.arterialPressureLimitLow);
+            QVERIFY(1 == tempData.arterialPressureLimitHigh);
+            QVERIFY(1 == tempData.venousPressureLimitLow);
+            QVERIFY(1 == tempData.venousPressureLimitHigh);
+            QVERIFY(1 == tempData.bloodPressureMeasureInterval);
+            QVERIFY(1 == tempData.rinsebackFlowRate);
+        }
+        else {
+            TreatmentData data;
+            QVERIFY(data.bloodFlowRate               == tempData.bloodFlowRate);
+            QVERIFY(data.dialysateFlowRate           == tempData.dialysateFlowRate);
+            QVERIFY(data.duration                    == tempData.duration);
+            QVERIFY(data.heparinDispensingRate       == tempData.heparinDispensingRate);
+            QVERIFY(data.heparinBolusVolume          == tempData.heparinBolusVolume);
+            QVERIFY(data.heparinStopTime             == tempData.heparinStopTime);
+            QVERIFY(data.salineBolus                 == tempData.salineBolus);
+            QVERIFY(data.acidConcentrate             == tempData.acidConcentrate);
+            QVERIFY(data.bicarbonateConcentrate      == tempData.bicarbonateConcentrate);
+            QVERIFY(data.dialyzerType                == tempData.dialyzerType);
+            QVERIFY(data.dialysateTemp               == tempData.dialysateTemp);
+            QVERIFY(data.arterialPressureLimitLow    == tempData.arterialPressureLimitLow);
+            QVERIFY(data.arterialPressureLimitHigh   == tempData.arterialPressureLimitHigh);
+            QVERIFY(data.venousPressureLimitLow      == tempData.venousPressureLimitLow);
+            QVERIFY(data.venousPressureLimitHigh     == tempData.venousPressureLimitHigh);
+            QVERIFY(data.bloodPressureMeasureInterval== tempData.bloodPressureMeasureInterval);
+            QVERIFY(data.rinsebackFlowRate           == tempData.rinsebackFlowRate);
+
+        }
+    }
+
+
+}
Index: unittests/tst_models.h
===================================================================
diff -u -r68af13f9f6502069c79b7b63b5d9481abb2f270f -r97fc44f948bd39ed0b4238558a16bf99f750bf5e
--- unittests/tst_models.h	(.../tst_models.h)	(revision 68af13f9f6502069c79b7b63b5d9481abb2f270f)
+++ unittests/tst_models.h	(.../tst_models.h)	(revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e)
@@ -103,6 +103,7 @@
     void tst_MAlarmCleared();
 
     // Treatment Parameters
+    void tst_MTreatmentParameters_fromVariantList();
     void tst_MTreatmentParametersResp_data();
     void tst_MTreatmentParametersResp();
     void tst_MTreatmentParametersResp_fromVariantList();
Index: unittests/tst_views.cpp
===================================================================
diff -u -rc838ade760d18fe2b391ea2e90bc04de0d4aa1eb -r97fc44f948bd39ed0b4238558a16bf99f750bf5e
--- unittests/tst_views.cpp	(.../tst_views.cpp)	(revision c838ade760d18fe2b391ea2e90bc04de0d4aa1eb)
+++ unittests/tst_views.cpp	(.../tst_views.cpp)	(revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e)
@@ -269,7 +269,7 @@
     view.set_bicarbonateConcentrate(-1);
 
     view.set_dialyzerType(-1);
-    view.set_dialysateTemp(0);
+    view.set_dialysateTemp(1);
     view.set_arterialPressureLimitLow(1);
     view.set_arterialPressureLimitHigh(1);
     view.set_venousPressureLimitLow(1);
@@ -343,6 +343,155 @@
 
 }
 
+void tst_views::VCreateTreatment_check_init()
+{
+    View::VCreateTreatment view;
+    quint32 val = 150; view.bloodFlowRateMin(val); ++val;
+                       view.bloodFlowRateMin(val);
+    QCOMPARE(val,      view.bloodFlowRateMin());
+
+    val = 501;    view.bloodFlowRateMax(val); ++val;
+                  view.bloodFlowRateMax(val);
+                  view.bloodFlowRateMax(val);
+    QCOMPARE(val, view.bloodFlowRateMax());
+
+    val = 100;    view.dialysateFlowRateMin(val); ++val;
+                  view.dialysateFlowRateMin(val);
+    QCOMPARE(val, view.dialysateFlowRateMin());
+
+    val = 600;    view.dialysateFlowRateMax(val); ++val;
+                  view.dialysateFlowRateMax(val);
+    QCOMPARE(val, view.dialysateFlowRateMax());
+
+    val = 60;     view.durationMin(val); ++val;
+                  view.durationMin(val);
+    QCOMPARE(val, view.durationMin());
+
+    val = 480;    view.durationMax(val); ++val;
+                  view.durationMax(val);
+    QCOMPARE(val, view.durationMax());
+
+    val = 0;      view.heparinDispensingRateMin(val); ++val;
+                  view.heparinDispensingRateMin(val);
+    QCOMPARE(val, view.heparinDispensingRateMin());
+
+    val = 1000;   view.heparinDispensingRateMax(val); ++val;
+                  view.heparinDispensingRateMax(val);
+    QCOMPARE(val, view.heparinDispensingRateMax());
+
+    val = 100;    view.heparinBolusVolumeMin(val); ++val;
+                  view.heparinBolusVolumeMin(val);
+    QCOMPARE(val, view.heparinBolusVolumeMin());
+
+    val = 2000;   view.heparinBolusVolumeMax(val); ++val;
+                  view.heparinBolusVolumeMax(val);
+    QCOMPARE(val, view.heparinBolusVolumeMax());
+
+    val = 1000;   view.heparinStopTimeMin(val); ++val;
+                  view.heparinStopTimeMin(val);
+    QCOMPARE(val, view.heparinStopTimeMin());
+
+    val = 2000;   view.heparinStopTimeMax(val); ++val;
+                  view.heparinStopTimeMax(val);
+    QCOMPARE(val, view.heparinStopTimeMax());
+
+    val = 480;    view.durationMax(val); ++val;
+                  view.durationMax(val);
+    QCOMPARE(val, view.durationMax());
+
+    QStringList options = QStringList() << "100 mL" << "200 mL" << "300 mL";
+                      view.salineBolusOptions(options); options.append(" ");
+                      view.salineBolusOptions(options);
+    QCOMPARE(options, view.salineBolusOptions());
+
+
+    options = QStringList() << "08-1251-1" << "08-2251-0" << "08-3251-9";
+                      view.acidConcentrateOptions(options); options.append(" ");
+                      view.acidConcentrateOptions(options);
+    QCOMPARE(options, view.acidConcentrateOptions());
+
+    options = QStringList() << "Dimesol - BC-201";
+                      view.bicarbonateConcentrateOptions(options); options.append(" ");
+                      view.bicarbonateConcentrateOptions(options);
+    QCOMPARE(options, view.bicarbonateConcentrateOptions());
+
+
+    options = QStringList() << "Nipro Elisio-H 17"
+                            << "Nipro Elisio-H 19"
+                            << "Fresenius Optiflux F160NRe"
+                            << "Fresenius Optiflux F180NRe";
+                      view.dialyzerTypeOptions(options); options.append(" ");
+                      view.dialyzerTypeOptions(options);
+    QCOMPARE(options, view.dialyzerTypeOptions());
+
+    val = 36;     view.dialysateTempMin(val); ++val;
+                  view.dialysateTempMin(val);
+    QCOMPARE(val, view.dialysateTempMin());
+
+    val = 37;     view.dialysateTempMax(val); ++val;
+                  view.dialysateTempMax(val);
+    QCOMPARE(val, view.dialysateTempMax());
+
+    qint32 v;
+    v = -299;   view.arterialPressureLimitLowMin(v); ++v;
+                view.arterialPressureLimitLowMin(v);
+    QCOMPARE(v, view.arterialPressureLimitLowMin());
+
+    v = 201;    view.arterialPressureLimitLowMax(v); ++v;
+                view.arterialPressureLimitLowMax(v);
+    QCOMPARE(v, view.arterialPressureLimitLowMax());
+
+    v = 1000;   view.arterialPressureLimitHighMin(v); ++v;
+                view.arterialPressureLimitHighMin(v);
+    QCOMPARE(v, view.arterialPressureLimitHighMin());
+
+    v = 2000;   view.arterialPressureLimitHighMax(v); ++v;
+                view.arterialPressureLimitHighMax(v);
+    QCOMPARE(v, view.arterialPressureLimitHighMax());
+
+    v = -101;   view.venousPressureLimitLowMin(v); ++v;
+                view.venousPressureLimitLowMin(v);
+    QCOMPARE(v, view.venousPressureLimitLowMin());
+
+    v = 601;    view.venousPressureLimitLowMax(v); ++v;
+                view.venousPressureLimitLowMax(v);
+    QCOMPARE(v, view.venousPressureLimitLowMax());
+
+    v = 10;     view.venousPressureLimitHighMin(v); ++v;
+                view.venousPressureLimitHighMin(v);
+    QCOMPARE(v, view.venousPressureLimitHighMin());
+
+    v = 601;    view.venousPressureLimitHighMax(v); ++v;
+                view.venousPressureLimitHighMax(v);
+    QCOMPARE(v, view.venousPressureLimitHighMax());
+
+
+    val = 1;      view.bloodPressureMeasureIntervalMin(val); ++val;
+                  view.bloodPressureMeasureIntervalMin(val);
+    QCOMPARE(val, view.bloodPressureMeasureIntervalMin());
+
+    val = 31;     view.bloodPressureMeasureIntervalMax(val); ++val;
+                  view.bloodPressureMeasureIntervalMax(val);
+    QCOMPARE(val, view.bloodPressureMeasureIntervalMax());
+
+
+    val = 10;     view.rinsebackFlowRateMin(val); ++val;
+                  view.rinsebackFlowRateMin(val);
+    QCOMPARE(val, view.rinsebackFlowRateMin());
+
+    val = 149;    view.rinsebackFlowRateMax(val); ++val;
+                  view.rinsebackFlowRateMax(val);
+    QCOMPARE(val, view.rinsebackFlowRateMax());
+
+    bool b = false; view.continueEnabled(b);
+                    view.continueEnabled(b);
+    QCOMPARE(b,     view.continueEnabled());
+
+                    view.saveTreatmentProfile(b);
+                    view.saveTreatmentProfile(b);
+    QCOMPARE(b,     view.saveTreatmentProfile());
+}
+
 void tst_views::VCreateTreatment_save_csv()
 {
     View::VCreateTreatment view;
@@ -387,9 +536,14 @@
         {"rinsebackFlowRate",           QString::number(view.treatmentData.rinsebackFlowRate)}
     };
 
+    QString oldFilename = view.saveNewTreatment(objectWritten);
+
+    QThread::msleep(500);
     QString filename = view.saveNewTreatment(objectWritten);
 
+    QVERIFY(oldFilename != filename);
 
+
     QThread::msleep(500);
 
     QJsonObject objectRead;
Index: unittests/tst_views.h
===================================================================
diff -u -rc838ade760d18fe2b391ea2e90bc04de0d4aa1eb -r97fc44f948bd39ed0b4238558a16bf99f750bf5e
--- unittests/tst_views.h	(.../tst_views.h)	(revision c838ade760d18fe2b391ea2e90bc04de0d4aa1eb)
+++ unittests/tst_views.h	(.../tst_views.h)	(revision 97fc44f948bd39ed0b4238558a16bf99f750bf5e)
@@ -44,5 +44,6 @@
     void VCreateTreatment_fw_validation_response();
     void VCreateTreatment_init_ranges(QJsonObject &obj);
     void VCreateTreatment_load_parameter_ranges();
+    void VCreateTreatment_check_init();
 };