Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rb8b2189750438d1a671114c39b871602ed7e5d0d -rad0b52bbb67a70e5a629d919ce71196c310da809
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision b8b2189750438d1a671114c39b871602ed7e5d0d)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision ad0b52bbb67a70e5a629d919ce71196c310da809)
@@ -105,7 +105,7 @@
     BOOL fillEmptyBicarbBottleDetected;                                                                      ///< Fill bicarb bottle empty detected.
 } FILL_CONDITION_STATUS_T;
 
-static U32 dataPublishCounter;                                                                  ///< Used to schedule dialysate fill data publication to CAN bus.
+static U32 dataPublishCounter;                                                                               ///< Used to schedule dialysate fill data publication to CAN bus.
 static DG_FILL_MODE_STATE_T fillState;                                                                       ///< Currently active fill state.
 static U32 dialysateFillStartTime;                                                                           ///< Current time when starting to fill dialysate.
 static F32 reservoirBaseWeight;                                                                              ///< Fill reservoir base weight.
@@ -134,7 +134,6 @@
 
 static U32 pumpSpeedIndex;                                                                                   ///< Index used to access the desired pump speed in roPumpFlushBubblesSpeed table.
 
-
 static OVERRIDE_F32_T usedAcidVolumeML = { 0.0, 0.0, 0.0, 0.0 };                                             ///< The integrated acid concentration volume has been used in mL.
 static OVERRIDE_F32_T usedBicarbVolumeML = { 0.0, 0.0, 0.0, 0.0 };                                           ///< The integrated bicarb concentration volume has been used in mL.
 static OVERRIDE_U32_T fillModeDataPublishInterval = { FILL_MODE_DATA_PUB_INTERVAL,
@@ -935,6 +934,11 @@
     }
 }
 
+
+/*************************************************************************
+ *                       TEST SUPPORT FUNCTIONS
+ *************************************************************************/
+
 /*********************************************************************//**
  * @brief
  * The testSetUsedAcidVolumeMLOverride function overrides the