Index: unittests/tst_views.cpp
===================================================================
diff -u -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a -r7cc15ae5968205b241a08ca4646f283b8bf97b03
--- unittests/tst_views.cpp	(.../tst_views.cpp)	(revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a)
+++ unittests/tst_views.cpp	(.../tst_views.cpp)	(revision 7cc15ae5968205b241a08ca4646f283b8bf97b03)
@@ -136,7 +136,7 @@
             QCOMPARE(view.bloodPressureMeasureInterval(), view.bloodPressureMeasureIntervalMax());
             QCOMPARE(view.rinsebackFlowRate(), view.rinsebackFlowRateMax());
 
-            view.doFinishedCreate();
+            view.doValidation();
         }
         else {
             QCOMPARE(view.validate(view.treatmentData), false);
@@ -395,7 +395,7 @@
         }
 
         QCOMPARE(view.validate(view.treatmentData), false);
-        view.doFinishedCreate();
+        view.doValidation();
     }
     view.dialyzerType(-1);
     QVERIFY(!(view.dialyzerTypeOptions().length() - 1 < (int)view.dialyzerType()));
@@ -733,32 +733,23 @@
         if (i == 15)  respData.heparinDispensingRate        = 1; else respData.heparinDispensingRate       = 0;
         if (i == 16)  respData.heparinBolusVolume           = 1; else respData.heparinBolusVolume          = 0;
         if (i == 17)  respData.dialysateTemp                = 1; else respData.dialysateTemp               = 0;
-        QVERIFY(!view.doActionReceive(respData));
+        QVERIFY(!view.onActionReceive(respData));
     }
 
     AdjustParametersValidationRequestData dataBackup = view.treatmentData;
 
     AdjustParametersValidationResponseData respData;
 
-    AdjustInitTreatmentResponseData startResponse;
+    QVERIFY(view.onActionReceive(respData));
 
-    startResponse.startTreatmentResponse = 0; // REJECT
-    view.doActionReceive(startResponse);
-    QCOMPARE(view.pageToShow, View::VTreatmentCreate::Page::None);
-
-    QVERIFY(view.doActionReceive(respData));
-
     view.saveTreatmentProfile(false);
     QVERIFY(!view._saveTreatmentProfile);
-    view.doFinishedConfirm();
+    view.doConfirm();
 
     view.saveTreatmentProfile(true);
     QVERIFY(view._saveTreatmentProfile);
-    view.doFinishedConfirm();
+    view.doConfirm();
 
-    view.onFinishedSaveNewTreatment(true);
-    view.onFinishedSaveNewTreatment(false);
-    view.doFinishedPrime();
     view.doStartTreatment();
 
     QCOMPARE(view.treatmentData.bloodFlowRate, dataBackup.bloodFlowRate);