Index: unittests/tst_models.cpp
===================================================================
diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rb635ddbc3ec048453e1c2f5a7565385ecdd78d74
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision b635ddbc3ec048453e1c2f5a7565385ecdd78d74)
@@ -49,7 +49,6 @@
 #include "MAlarmTriggered.h"
 #include "MAlarmCleared.h"
 
-#include "MTreatmentParameters.h"
 #include "MTreatmentParametersResp.h"
 
 // #define CONSOLEOUT
@@ -1592,116 +1591,6 @@
     }
 }
 
-void tst_models::tst_MTreatmentParametersResp_fromVariantList()
-{
-    Model::MTreatmentParametersResponse mData;
-
-    QVariantList list;
-    for (int i = 0; i < 20; ++i)
-    {
-
-        list.append(QVariant(1));
-        AdjustTreatmentParametersResponseData tempData = mData.fromVariantList(list);
-        if (i == 17) {
-            QVERIFY(1 == tempData.requestValid);
-            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 {
-            AdjustTreatmentParametersResponseData data;
-            QVERIFY(data.requestValid                == tempData.requestValid);
-            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);
-
-        }
-    }
-}
-
-
-void tst_models::tst_MTreatmentParameters_fromVariantList()
-{
-    Model::MAdjustTreatmentParametersRequest mData;
-
-    QVariantList list;
-    for (int i = 0; i < 20; ++i)
-    {
-
-        list.append(QVariant(1));
-        AdjustTreatmentParametersRequestData 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 {
-            AdjustTreatmentParametersRequestData 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);
-
-        }
-    }
-}
-
-
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
Index: unittests/tst_models.h
===================================================================
diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rb635ddbc3ec048453e1c2f5a7565385ecdd78d74
--- unittests/tst_models.h	(.../tst_models.h)	(revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac)
+++ unittests/tst_models.h	(.../tst_models.h)	(revision b635ddbc3ec048453e1c2f5a7565385ecdd78d74)
@@ -101,10 +101,8 @@
     void tst_MAlarmCleared();
 
     // Treatment Parameters
-    void tst_MTreatmentParameters_fromVariantList();
     void tst_MTreatmentParametersResp_data();
     void tst_MTreatmentParametersResp();
-    void tst_MTreatmentParametersResp_fromVariantList();
 
     void tst_MTreatmentSalineBolusData_data();
     void tst_MTreatmentSalineBolusData();