Index: firmware/App/HDCommon.h
===================================================================
diff -u -re476a0911226c1390c131d4c90e955f1fdc13eb1 -rdd1c45cd9a612aaf63de14ffddecab573ead6095
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision e476a0911226c1390c131d4c90e955f1fdc13eb1)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision dd1c45cd9a612aaf63de14ffddecab573ead6095)
@@ -62,7 +62,7 @@
     #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
     #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 //    #define V1_5_SYSTEM                     1           // Build for v1.5 system
-    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
+//    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
     #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
     #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
     #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r8910c1a21976afcc84fe1d9504916efbc192325d -rdd1c45cd9a612aaf63de14ffddecab573ead6095
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 8910c1a21976afcc84fe1d9504916efbc192325d)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision dd1c45cd9a612aaf63de14ffddecab573ead6095)
@@ -156,6 +156,10 @@
 #endif
             break;
 
+        case POST_STATE_ALARM_AUDIO:
+            postState = POST_STATE_ACCELEROMETER;
+            break;
+
         case POST_STATE_ACCELEROMETER:
 #ifndef DISABLE_ACCELS
             testStatus = execAccelTest();
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r518745cc77b07b0a6aa35d5530255d2bcc8b1090 -rdd1c45cd9a612aaf63de14ffddecab573ead6095
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 518745cc77b07b0a6aa35d5530255d2bcc8b1090)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision dd1c45cd9a612aaf63de14ffddecab573ead6095)
@@ -365,6 +365,10 @@
         case ALARM_ACTION_END_TREATMENT:
             if ( HD_PRE_TREATMENT_PRIME_STATE > currentPreTreatmentState )
             {
+                if ( HD_PRE_TREATMENT_WATER_SAMPLE_STATE == currentPreTreatmentState )
+                {
+                    cmdDGSampleWater( SAMPLE_WATER_CMD_END );
+                }
                 requestNewOperationMode( MODE_STAN );
             }
             else
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rb7764e26a3460652da29b1f957706dfaca413226 -rdd1c45cd9a612aaf63de14ffddecab573ead6095
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision b7764e26a3460652da29b1f957706dfaca413226)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision dd1c45cd9a612aaf63de14ffddecab573ead6095)
@@ -582,6 +582,7 @@
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
+    selfTestStartTime = getMSTimerCount();
 
     // TODO: Use appropriate sensor driver
     if ( STATE_CLOSED == getFPGADoorState() )
@@ -764,6 +765,9 @@
 {
     NO_CART_SELF_TESTS_STATE_T state = NO_CART_SELF_TESTS_STOPPED_STATE;
 
+    // Restart self-test start time
+    selfTestStartTime = getMSTimerCount();
+
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
@@ -786,6 +790,9 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
 
+    // Restart self-test start time
+    selfTestStartTime = getMSTimerCount();
+
     // TODO: Use appropriate sensor driver
     if ( STATE_CLOSED == getFPGADoorState() )
     {
@@ -1007,6 +1014,9 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_STOPPED_STATE;
 
+    // Restart self-test start time
+    selfTestStartTime = getMSTimerCount();
+
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;