Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r9e2667ac9d2f1b2add9811f93477f0365f1b4eb7 -r6cd85442baebdeecec6fc9b5009011b8d961f45c
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 9e2667ac9d2f1b2add9811f93477f0365f1b4eb7)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 6cd85442baebdeecec6fc9b5009011b8d961f45c)
@@ -28,8 +28,8 @@
 
 // ********** private data **********
 
-static CONSUMABLE_SELF_TESTS_STATE_T currentConsumableSelfTestState;
-static BOOL confirmConsumableInstallRequested;
+static CONSUMABLE_SELF_TESTS_STATE_T currentConsumableSelfTestState;        ///< Current state of the consumable self-tests state machine.
+static BOOL confirmConsumableInstallRequested;                              ///< Flag indicates user has confirmed the installation of consumables.
 
 // ********** private function prototypes **********
 
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r9e2667ac9d2f1b2add9811f93477f0365f1b4eb7 -r6cd85442baebdeecec6fc9b5009011b8d961f45c
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9e2667ac9d2f1b2add9811f93477f0365f1b4eb7)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 6cd85442baebdeecec6fc9b5009011b8d961f45c)
@@ -34,14 +34,13 @@
 
 // ********** private definitions **********
 
-///< Interval (ms/task time) at which the pre-treatment state data is published on the CAN bus.
-#define PRE_TREATMENT_DATA_PUB_INTERVAL        ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
+/// Interval (ms/task time) at which the pre-treatment state data is published on the CAN bus.
+#define PRE_TREATMENT_DATA_PUB_INTERVAL                 ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
 
 #define DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN         100             ///< Patient connection sub-mode dialysate inlet pump flow rate in mL/min.
 
-/// Fill reservoir one to this volume (in mL) during prime.
-#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      ( FILL_RESERVOIR_TO_VOLUME_ML - PRIME_CONSUMED_DIALYSATE_VOLUME_ML )
-#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      500             ///< Fill reservoir two to this volume (in mL) during prime.
+#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      1300            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
+#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      700             ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
 
 /// States of the pre-treatment reservoir management state machine.
 typedef enum PreTreatmentReservoirMgmt_States
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r9e2667ac9d2f1b2add9811f93477f0365f1b4eb7 -r6cd85442baebdeecec6fc9b5009011b8d961f45c
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9e2667ac9d2f1b2add9811f93477f0365f1b4eb7)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 6cd85442baebdeecec6fc9b5009011b8d961f45c)
@@ -49,11 +49,11 @@
 
 #define DIP_FLOW_RATE_SETUP_ML_MIN                          100                                     ///< Dialysate inlet pump flow rate during the setup for wet self-test.
 #define DIP_FLOW_RATE_FIRST_DISPLACEMENT_ML_MIN             100                                     ///< Dialysate inlet pump flow rate during the first displacement in wet self-test.
-#define DIP_FLOW_RATE_SECOND_DISPLACEMENT_ML_MIN            300                                     ///< Dialysate inlet pump flow rate during the second displacement in wet self-test.
+#define DIP_FLOW_RATE_SECOND_DISPLACEMENT_ML_MIN            600                                     ///< Dialysate inlet pump flow rate during the second displacement in wet self-test.
 
-#define WET_SELF_TEST_RESERVOIR_ONE_SETUP_VOLUME_ML         1500                                    ///< Setup volume for reservoir one before wet self-test in ml.
+#define WET_SELF_TEST_RESERVOIR_ONE_SETUP_VOLUME_ML         1200                                    ///< Setup volume for reservoir one before wet self-test in ml.
 #define WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML   100                                     ///< Target of first displacement volume in ml.
-#define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  300                                     ///< Target of second displacement volume in ml.
+#define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  600                                     ///< Target of second displacement volume in ml.
 #define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           5                                       ///< Tolerance on integrated volume in percentage.
 #define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              1.5                                     ///< Tolerance in the load cell readings of the displacement in grams.
 #define WET_SELF_TEST_DISPLACEMENT_TIME_MS                  ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms.
@@ -1223,7 +1223,7 @@
     {
         F32 const resOneDiffAfterDisplacement = fabs( getReservoirWeightLargeFilter( DG_RESERVOIR_1 ) - reservoirVolume[ DG_RESERVOIR_1 ] );
         F32 const resTwoDiffAfterDisplacement = fabs( getReservoirWeightLargeFilter( DG_RESERVOIR_2 ) - reservoirVolume[ DG_RESERVOIR_2 ] );
-        F32 const integratedVolumeToTargetPercent = 1 - ( fmdIntegratedVolume / WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML );
+        F32 const integratedVolumeToTargetPercent = 1 - ( fmdIntegratedVolume / WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML );
 
         if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
              ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE ) )