Index: sources/view/VCreateTreatment.cpp
===================================================================
diff -u -r542278273f3d13ad5fb5ba8916178d747c78fe77 -r9612f309f51323d5f89fa7acd64acb3e355380e2
--- sources/view/VCreateTreatment.cpp	(.../VCreateTreatment.cpp)	(revision 542278273f3d13ad5fb5ba8916178d747c78fe77)
+++ sources/view/VCreateTreatment.cpp	(.../VCreateTreatment.cpp)	(revision 9612f309f51323d5f89fa7acd64acb3e355380e2)
@@ -29,11 +29,10 @@
  *  Loads treatment parameters from a json file
  * \return QJsonObject holding the treatment parameters
  */
-QJsonObject VCreateTreatment::loadTreatmentParameterRanges()
+QJsonObject VCreateTreatment::loadTreatmentParameterRanges(const QString &path)
 {
-    // coco begin validated: The treatment parameters file needs to be present
     QJsonObject obj;
-    if (!FileHandler::readJSON(Treatment_Parameter_Ranges_Path, obj))
+    if (!FileHandler::readJSON(path, obj))
     {
         // TODO: notify user
     }
@@ -71,8 +70,6 @@
             _salineBolusOptions = jsonArrayToStringList(value.toArray());
         else if (key == GET_VARIABLE_NAME(acidConcentrateOptions))
             _acidConcentrateOptions = jsonArrayToStringList(value.toArray());
-        else if (key == GET_VARIABLE_NAME(acidConcentrateOptions))
-            _acidConcentrateOptions = jsonArrayToStringList(value.toArray());
         else if (key == GET_VARIABLE_NAME(bicarbonateConcentrateOptions))
             _bicarbonateConcentrateOptions = jsonArrayToStringList(value.toArray());
         else if (key == GET_VARIABLE_NAME(dialyzerTypeOptions))
@@ -118,8 +115,6 @@
     }
 
     return obj;
-
-    // coco end
 }
 
 /**
@@ -264,11 +259,12 @@
  *  Slot to handle a validation response from FW
  * \param actionType The action type must be a create treatment response
  * \param messageData The message data must contain the reject reason codes for all parameters
+ * \returns True if FW OK's treatment parameters, false otherwise
  */
-void VCreateTreatment::onFWValidationResponse(GuiActionType actionType, QVariantList messageData) {
+bool VCreateTreatment::onFWValidationResponse(GuiActionType actionType, QVariantList messageData) {
 
     if (actionType != GuiActionType::ID_CreateTreatmentRsp)
-        return;
+        return false;
 
     Model::TreatmentParametersResp response;
     TreatmentParametersRespData data = response.fromVariantList(messageData);
@@ -352,6 +348,8 @@
     if (success)
         emit showConfirm();
 
+    return success;
+
 }
 
 /**