Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r88e0f56fa5eb3af397fee7cebb49efdab54f8491 -rfbec5d240350b320e0e15df4623b2ba36ce73aac
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 88e0f56fa5eb3af397fee7cebb49efdab54f8491)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision fbec5d240350b320e0e15df4623b2ba36ce73aac)
@@ -39,6 +39,8 @@
 
 #define RESERVOIR_SETTLE_TIME_MS                5000                        ///< Time (in ms) allotted for reservoir to settle (after fill, before drain).
 
+#define MAX_RESERVOIR_VOLUME_ML                 1950.0                      ///< Maximum reservoir volume.  Switch reservoirs if active reservoir exceeds this volume.
+
 #define SIZE_OF_LARGE_LOAD_CELL_AVG             32                          ///< Large load cell moving average has 32 samples.
 
 #define DIALYSATE_TEMP_PERSISTENCE_PERIOD       ( 3 * MS_PER_SECOND )       ///< Persistence period for dialysate temperature alarm.
@@ -48,10 +50,6 @@
 #define DIALYSATE_TEMP_HIGH_LIMIT_C             42.0                        ///< Dialysate high temperature limit in degree C.
 #define DIALYSATE_TEMP_LOW_LIMIT_C              33.0                        ///< Dialysate low temperature limit in degree C.
 
-#define MAX_RESERVOIR_VOLUME_ML                 1950.0                      ///< Maximum reservoir volume.  Switch reservoirs if active reservoir exceeds this volume.
-
-#define SIZE_OF_LARGE_LOAD_CELL_AVG             32                          ///< Large load cell moving average has 32 samples.
-
 /// States of the treatment reservoir management state machine.
 typedef enum TreatmentReservoirMgmt_States
 {
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r88e0f56fa5eb3af397fee7cebb49efdab54f8491 -rfbec5d240350b320e0e15df4623b2ba36ce73aac
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 88e0f56fa5eb3af397fee7cebb49efdab54f8491)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision fbec5d240350b320e0e15df4623b2ba36ce73aac)
@@ -136,7 +136,6 @@
 
         case POST_STATE_FW_INTEGRITY:
             testStatus = execIntegrityTest();
-            testStatus = SELF_TEST_STATUS_PASSED;
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -198,10 +197,6 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
-        case POST_STATE_ALARM_AUDIO:
-            postState = POST_STATE_ACCELEROMETER;
-            break;
-
         case POST_STATE_ACCELEROMETER:
 #ifndef DISABLE_ACCELS
             testStatus = execAccelTest();