Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r01223b53b80fa66e1974a2b1e57590f6fe308374 -rc61acc968c77e85a31addacee80afb15285eae44
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 01223b53b80fa66e1974a2b1e57590f6fe308374)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision c61acc968c77e85a31addacee80afb15285eae44)
@@ -871,6 +871,7 @@
     return ( ( origTreatmentParams.uFVolume_L * ML_PER_LITER ) / origTreatmentParams.treatmentDuration_min );
 }
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -922,64 +923,64 @@
  * treatment parameters.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-
-
-BOOL testUpdateCurrentTreatmentParameters( void )
+BOOL testSendCurrentTreatmentParameters( void )
 {
-   BOOL result = FALSE;
-   CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T current_treatment_params;
-   // Test one parameter for set since all parameters are set after parameter validation.
-   if(TRUE == isCriticalDataSet( &treatmentParameters[TREATMENT_PARAM_BLOOD_FLOW] ))
-   {
-       result = TRUE;
-       current_treatment_params.accepted = TRUE;
-       current_treatment_params.treatment_parameters.bloodFlowRate_mL_min = getTreatmentParameterU32(TREATMENT_PARAM_BLOOD_FLOW);
-       current_treatment_params.treatment_parameters.dialysateFlowRate_mL_min = getTreatmentParameterU32(TREATMENT_PARAM_DIALYSATE_FLOW);
-       current_treatment_params.treatment_parameters.treatmentDuration_min = getTreatmentParameterU32(TREATMENT_PARAM_TREATMENT_DURATION);
-       current_treatment_params.treatment_parameters.heparinPreStop_min = getTreatmentParameterU32(TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME);
-       current_treatment_params.treatment_parameters.salineBolusVolume_mL = getTreatmentParameterU32(TREATMENT_PARAM_SALINE_BOLUS_VOLUME);
-       current_treatment_params.treatment_parameters.acidConcentrate = getTreatmentParameterU32(TREATMENT_PARAM_ACID_CONCENTRATE);
-       current_treatment_params.treatment_parameters.bicarbConcentrate = getTreatmentParameterU32(TREATMENT_PARAM_BICARB_CONCENTRATE);
-       current_treatment_params.treatment_parameters.dialyzerType = getTreatmentParameterU32(TREATMENT_PARAM_DIALYZER_TYPE);
-       current_treatment_params.treatment_parameters.heparinType = getTreatmentParameterU32(TREATMENT_PARAM_HEPARIN_TYPE);
-       current_treatment_params.treatment_parameters.bloodPressureMeasurementInterval_min = getTreatmentParameterU32(TREATMENT_PARAM_BP_MEAS_INTERVAL);
-       current_treatment_params.treatment_parameters.rinsebackFlowRate_mL_min = getTreatmentParameterU32(TREATMENT_PARAM_RINSEBACK_FLOW_RATE);
-       current_treatment_params.treatment_parameters.arterialPressureLowLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT);
-       current_treatment_params.treatment_parameters.arterialPressureHighLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT);
-       current_treatment_params.treatment_parameters.venousPressureLowLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT);
-       current_treatment_params.treatment_parameters.venousPressureHighLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT);
-       current_treatment_params.treatment_parameters.heparinDispenseRate_mL_hr = getTreatmentParameterF32(TREATMENT_PARAM_HEPARIN_DISPENSE_RATE);
-       current_treatment_params.treatment_parameters.heparinBolusVolume_mL = getTreatmentParameterF32(TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME);
-       current_treatment_params.treatment_parameters.dialysateTemperature_degC = getTreatmentParameterF32(TREATMENT_PARAM_DIALYSATE_TEMPERATURE);
-       current_treatment_params.uFVolume_L = getTreatmentParameterF32(TREATMENT_PARAM_UF_VOLUME);
-   }
-   else
-   {
-       current_treatment_params.accepted = FALSE;
-       current_treatment_params.treatment_parameters.bloodFlowRate_mL_min = 0;
-       current_treatment_params.treatment_parameters.dialysateFlowRate_mL_min = 0;
-       current_treatment_params.treatment_parameters.treatmentDuration_min = 0;
-       current_treatment_params.treatment_parameters.heparinPreStop_min = 0;
-       current_treatment_params.treatment_parameters.salineBolusVolume_mL = 0;
-       current_treatment_params.treatment_parameters.acidConcentrate = 0;
-       current_treatment_params.treatment_parameters.bicarbConcentrate = 0;
-       current_treatment_params.treatment_parameters.dialyzerType = 0;
-       current_treatment_params.treatment_parameters.heparinType = 0;
-       current_treatment_params.treatment_parameters.bloodPressureMeasurementInterval_min = 0;
-       current_treatment_params.treatment_parameters.rinsebackFlowRate_mL_min = 0;
-       current_treatment_params.treatment_parameters.arterialPressureLowLimit_mmHg = 0;
-       current_treatment_params.treatment_parameters.arterialPressureHighLimit_mmHg = 0;
-       current_treatment_params.treatment_parameters.venousPressureLowLimit_mmHg = 0;
-       current_treatment_params.treatment_parameters.venousPressureHighLimit_mmHg = 0;
-       current_treatment_params.treatment_parameters.heparinDispenseRate_mL_hr = 0;
-       current_treatment_params.treatment_parameters.heparinBolusVolume_mL = 0;
-       current_treatment_params.treatment_parameters.dialysateTemperature_degC = 0;
-       current_treatment_params.uFVolume_L = 0;
-   }
-   sendTestCurrentTreatmentParametersResponse(current_treatment_params);
-   return result;
+    BOOL result = FALSE;
+    CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T current_treatment_params;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        // Test one parameter for set since all parameters are set after parameter validation.
+        if(TRUE == isCriticalDataSet( &treatmentParameters[TREATMENT_PARAM_BLOOD_FLOW] ))
+        {
+           result = TRUE;
+           current_treatment_params.accepted = TRUE;
+           current_treatment_params.treatment_parameters.bloodFlowRate_mL_min = getTreatmentParameterU32(TREATMENT_PARAM_BLOOD_FLOW);
+           current_treatment_params.treatment_parameters.dialysateFlowRate_mL_min = getTreatmentParameterU32(TREATMENT_PARAM_DIALYSATE_FLOW);
+           current_treatment_params.treatment_parameters.treatmentDuration_min = getTreatmentParameterU32(TREATMENT_PARAM_TREATMENT_DURATION);
+           current_treatment_params.treatment_parameters.heparinPreStop_min = getTreatmentParameterU32(TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME);
+           current_treatment_params.treatment_parameters.salineBolusVolume_mL = getTreatmentParameterU32(TREATMENT_PARAM_SALINE_BOLUS_VOLUME);
+           current_treatment_params.treatment_parameters.acidConcentrate = getTreatmentParameterU32(TREATMENT_PARAM_ACID_CONCENTRATE);
+           current_treatment_params.treatment_parameters.bicarbConcentrate = getTreatmentParameterU32(TREATMENT_PARAM_BICARB_CONCENTRATE);
+           current_treatment_params.treatment_parameters.dialyzerType = getTreatmentParameterU32(TREATMENT_PARAM_DIALYZER_TYPE);
+           current_treatment_params.treatment_parameters.heparinType = getTreatmentParameterU32(TREATMENT_PARAM_HEPARIN_TYPE);
+           current_treatment_params.treatment_parameters.bloodPressureMeasurementInterval_min = getTreatmentParameterU32(TREATMENT_PARAM_BP_MEAS_INTERVAL);
+           current_treatment_params.treatment_parameters.rinsebackFlowRate_mL_min = getTreatmentParameterU32(TREATMENT_PARAM_RINSEBACK_FLOW_RATE);
+           current_treatment_params.treatment_parameters.arterialPressureLowLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT);
+           current_treatment_params.treatment_parameters.arterialPressureHighLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT);
+           current_treatment_params.treatment_parameters.venousPressureLowLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT);
+           current_treatment_params.treatment_parameters.venousPressureHighLimit_mmHg = getTreatmentParameterS32(TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT);
+           current_treatment_params.treatment_parameters.heparinDispenseRate_mL_hr = getTreatmentParameterF32(TREATMENT_PARAM_HEPARIN_DISPENSE_RATE);
+           current_treatment_params.treatment_parameters.heparinBolusVolume_mL = getTreatmentParameterF32(TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME);
+           current_treatment_params.treatment_parameters.dialysateTemperature_degC = getTreatmentParameterF32(TREATMENT_PARAM_DIALYSATE_TEMPERATURE);
+           current_treatment_params.uFVolume_L = getTreatmentParameterF32(TREATMENT_PARAM_UF_VOLUME);
+        }
+        else
+        {
+           current_treatment_params.accepted = FALSE;
+           current_treatment_params.treatment_parameters.bloodFlowRate_mL_min = 0;
+           current_treatment_params.treatment_parameters.dialysateFlowRate_mL_min = 0;
+           current_treatment_params.treatment_parameters.treatmentDuration_min = 0;
+           current_treatment_params.treatment_parameters.heparinPreStop_min = 0;
+           current_treatment_params.treatment_parameters.salineBolusVolume_mL = 0;
+           current_treatment_params.treatment_parameters.acidConcentrate = 0;
+           current_treatment_params.treatment_parameters.bicarbConcentrate = 0;
+           current_treatment_params.treatment_parameters.dialyzerType = 0;
+           current_treatment_params.treatment_parameters.heparinType = 0;
+           current_treatment_params.treatment_parameters.bloodPressureMeasurementInterval_min = 0;
+           current_treatment_params.treatment_parameters.rinsebackFlowRate_mL_min = 0;
+           current_treatment_params.treatment_parameters.arterialPressureLowLimit_mmHg = 0;
+           current_treatment_params.treatment_parameters.arterialPressureHighLimit_mmHg = 0;
+           current_treatment_params.treatment_parameters.venousPressureLowLimit_mmHg = 0;
+           current_treatment_params.treatment_parameters.venousPressureHighLimit_mmHg = 0;
+           current_treatment_params.treatment_parameters.heparinDispenseRate_mL_hr = 0;
+           current_treatment_params.treatment_parameters.heparinBolusVolume_mL = 0;
+           current_treatment_params.treatment_parameters.dialysateTemperature_degC = 0;
+           current_treatment_params.uFVolume_L = 0;
+        }
+        sendTestCurrentTreatmentParametersResponse(current_treatment_params);
+    }
+    return result;
 }
 
-
-
 /**@}*/
Index: firmware/App/Modes/ModeTreatmentParams.h
===================================================================
diff -u -rf15b66d94af1b415f57a7cc37372dba4fa793fbe -rc61acc968c77e85a31addacee80afb15285eae44
--- firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision f15b66d94af1b415f57a7cc37372dba4fa793fbe)
+++ firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision c61acc968c77e85a31addacee80afb15285eae44)
@@ -108,7 +108,7 @@
 F32 getUltrafiltrationRateOriginal( void );                                               // Get/calculate the original ultrafiltration rate, by ultrafiltration volume and treatment duration set in pre-treatment mode by user.
 
 BOOL testSetTreatmentParameter( TREATMENT_PARAM_T param, CRITICAL_DATAS_T value );  // Set a specific treatment parameter value
-BOOL testUpdateCurrentTreatmentParameters();                                        // Update current treatment parameters
+BOOL testSendCurrentTreatmentParameters();                                        // Update current treatment parameters
 
 /**@}*/
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r01223b53b80fa66e1974a2b1e57590f6fe308374 -rc61acc968c77e85a31addacee80afb15285eae44
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 01223b53b80fa66e1974a2b1e57590f6fe308374)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c61acc968c77e85a31addacee80afb15285eae44)
@@ -6791,7 +6791,6 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-
 void handleTestCurrentTreamtmentParametersRequest( MESSAGE_T *message )
 {
     BOOL result = FALSE;
@@ -6800,7 +6799,7 @@
     {
         result = TRUE;
         // ACK request
-        result = testUpdateCurrentTreatmentParameters();
+        result = testSendCurrentTreatmentParameters();
     }
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
@@ -6814,7 +6813,6 @@
  * @param data response data record
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-
 BOOL sendTestCurrentTreatmentParametersResponse(CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T current_params)
 {
     MESSAGE_T msg;