Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r74be223d47ea7bb0ac7d814e74d3627d830a5fac
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 74be223d47ea7bb0ac7d814e74d3627d830a5fac)
@@ -312,7 +312,11 @@
 
         if ( elapsedSelfTestTimeInSecs <= MAX_NO_CARTRIDGE_SELF_TEST_TIME )
         {
-            broadcastNoCartSelfTestTime( MAX_NO_CARTRIDGE_SELF_TEST_TIME, ( MAX_NO_CARTRIDGE_SELF_TEST_TIME - elapsedSelfTestTimeInSecs ) );
+            SELF_TEST_NO_CARTRIDGE_PAYLOAD_T data;
+
+            data.timeout   = MAX_NO_CARTRIDGE_SELF_TEST_TIME;
+            data.countdown = ( MAX_NO_CARTRIDGE_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
+            broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
         }
         else
         {
@@ -443,7 +447,11 @@
 
         if ( elapsedSelfTestTimeInSecs <= MAX_DRY_SELF_TEST_TIME )
         {
-            broadcastDrySelfTestTime( MAX_DRY_SELF_TEST_TIME, ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs ) );
+            SELF_TEST_DRY_PAYLOAD_T data;
+
+            data.timeout   = MAX_DRY_SELF_TEST_TIME;
+            data.countdown = ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
+            broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
         }
         else
         {
@@ -848,8 +856,8 @@
     }
     else
     {
-        previousNormalArterialPressure = getMeasuredArterialPressure();
-        previousNormalVenousPressure = getMeasuredVenousPressure();
+        previousNormalArterialPressure = getFilteredArterialPressure();
+        previousNormalVenousPressure = getFilteredVenousPressure();
 
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
@@ -875,8 +883,8 @@
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsState( SELF_TEST_STATUS_T *result )
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_STATE;
-    F32 const arterialPressure = getMeasuredArterialPressure();
-    F32 const venousPressure = getMeasuredVenousPressure();
+    F32 const arterialPressure = getFilteredArterialPressure();
+    F32 const venousPressure = getFilteredVenousPressure();
 
     // End the test when reaching target pressure or time out
     if ( ( TRUE == didTimeout( pressureSelfTestBloodPumpRunStartTime, BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST ) ) ||
@@ -919,8 +927,8 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE;
 
-    F32 const arterialPressureDiff = fabs( getMeasuredArterialPressure() - previousNormalArterialPressure );
-    F32 const venousPressureDiff = fabs( getMeasuredVenousPressure() - previousNormalVenousPressure );
+    F32 const arterialPressureDiff = fabs( getFilteredArterialPressure() - previousNormalArterialPressure );
+    F32 const venousPressureDiff = fabs( getFilteredVenousPressure() - previousNormalVenousPressure );
 
     if ( TRUE == didTimeout( pressureSelfTestNormalizedStartTime, NORMALIZED_PRESSURE_SELF_TEST_TIME ) )
     {