Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -r5e650bc96230e209560abfe290f1ec93e1667d82 -r3dcee9e3e8351d93d57dcccd97223f513ec488a6
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 5e650bc96230e209560abfe290f1ec93e1667d82)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 3dcee9e3e8351d93d57dcccd97223f513ec488a6)
@@ -194,6 +194,7 @@
             bubblesStatus[ bubble ].data = BUBBLE_DETECTED;
         }
 
+#ifndef DISABLE_BUBBLE_ALARMS
         // Check status reading and act upon
         if ( BUBBLE_DETECTED == getBubbleStatus( bubble ) )
         {
@@ -245,6 +246,7 @@
                 clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
             }
         }
+#endif
 
         if ( TRUE == bubblesSelfTestRequested[ bubble ] )
         {
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r7690b677a3870da643e67bd622d3b342dfac0040 -r3dcee9e3e8351d93d57dcccd97223f513ec488a6
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 7690b677a3870da643e67bd622d3b342dfac0040)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 3dcee9e3e8351d93d57dcccd97223f513ec488a6)
@@ -113,8 +113,6 @@
         // Ignore stop button in this mode.
     }
 
-    // TODO - send POST status on CAN
-
     // Execute current POST state     *Note - these switch cases must be in same order as enum HD_POST_States
     switch ( postState )
     {
@@ -175,8 +173,9 @@
             break;
 
         case POST_STATE_ALARM_AUDIO:
-            testStatus = execAlarmAudioSelfTest();
-            postState = handlePOSTStatus( testStatus );
+//            testStatus = execAlarmAudioSelfTest();
+//            postState = handlePOSTStatus( testStatus );
+            postState = POST_STATE_ALARM_LAMP;
             break;
 
         case POST_STATE_ALARM_LAMP:
Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -rbd0ae373570f7f224bb9a6a4e86f805be77de192 -r3dcee9e3e8351d93d57dcccd97223f513ec488a6
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision bd0ae373570f7f224bb9a6a4e86f805be77de192)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 3dcee9e3e8351d93d57dcccd97223f513ec488a6)
@@ -345,7 +345,7 @@
         TREATMENT_PARAM_T param;
 
         // Set all treatment parameters (except UF volume which is not yet received)
-        for ( param = TREATMENT_PARAM_FIRST_UINT; param < TREATMENT_PARAM_UF_VOLUME; param++ )
+        for ( param = TREATMENT_PARAM_FIRST_UINT; param < NUM_OF_TREATMENT_PARAMS; param++ )
         {
             setCriticalData( &treatmentParameters[ param ], stagedParams[ param ] );
         }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6f2218c22e666aec059afbd60f3d0d268b305ad0 -r3dcee9e3e8351d93d57dcccd97223f513ec488a6
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6f2218c22e666aec059afbd60f3d0d268b305ad0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3dcee9e3e8351d93d57dcccd97223f513ec488a6)
@@ -5377,13 +5377,13 @@
  *************************************************************************/
 void handleSetFluidLeakStateOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
             result = testSetFluidLeakStateOverride( ( FLUID_LEAK_STATES_T)( payload.state.u32 ) );
@@ -6214,6 +6214,40 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleTestValvesCurrentOverrideRequest function handles a
+ * request to override HD valves' current.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestValvesCurrentOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetValvesCurrentOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetValvesCurrentOverride( payload.index );
+        }
+
+        result = testSetValvesCurrentOverride( payload.index, payload.state.f32 );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleTestAlarmInfoSendIntervalOverrideRequest function handles a
  * request to override the HD alarm information broadcast interval.
  * @details Inputs: none
@@ -6495,7 +6529,36 @@
             result = testResetSyringePumpADCReadCounter();
         }
     }
+}
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestValvesPositionCountOverrideRequest function handles a
+ * request to override HD valves' position in counts.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestValvesPositionCountOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetValvesPositionCountOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetValvesPositionCountOverride( payload.index );
+        }
+    }
+
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r6820043b5dc623a84e7323168dd1d4bd9815e859 -r3dcee9e3e8351d93d57dcccd97223f513ec488a6
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6820043b5dc623a84e7323168dd1d4bd9815e859)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3dcee9e3e8351d93d57dcccd97223f513ec488a6)
@@ -713,6 +713,12 @@
 // MSG_ID_HD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE
 void handleTestSyringePumpADCReadCtrOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_VALVES_CURRENT_OVERRIDE
+void handleTestValvesCurrentOverrideRequest( MESSAGE_T *message );
+
+// MSD_ID_HD_VALVES_POSITION_COUNT_OVERRIDE
+void handleTestValvesPositionCountOverrideRequest( MESSAGE_T *message );
+
 /**@}*/
 
 #endif