Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -rb9300084966f27ebd166962121c5217f5cd30eb0 -r3c31e9f1a903e2829911aeacd23e50dbdce71add
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision b9300084966f27ebd166962121c5217f5cd30eb0)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 3c31e9f1a903e2829911aeacd23e50dbdce71add)
@@ -130,6 +130,8 @@
         case SAFETY_SHUTDOWN_SELF_TEST_STATE_START:
             safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_IN_PROGRESS;
 #ifndef DISABLE_WD_AND_SFTY_POST_TESTS
+                F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
+
                 // Verify 24V is up
                 if ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER )
                 {
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rfb1673d2282822995ed233f3e9ea5dfb0567780d -r3c31e9f1a903e2829911aeacd23e50dbdce71add
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision fb1673d2282822995ed233f3e9ea5dfb0567780d)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3c31e9f1a903e2829911aeacd23e50dbdce71add)
@@ -434,7 +434,7 @@
             currentDrySelfTestsState = handleDrySelfTestPressureSensorsSetupState();
             break;
 
-        case DRY_SELF_TESTS_PRESSURE_SENSORS_STATE:
+        case DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE:
             currentDrySelfTestsState = handleDrySelfTestPressureSensorsState();
             break;
 
@@ -908,7 +908,7 @@
  *************************************************************************/
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsSetupState( void )
 {
-    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_STATE;
+    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE;
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
@@ -942,7 +942,7 @@
  *************************************************************************/
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsState( void )
 {
-    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_STATE;
+    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE;
     F32 const arterialPressure = getFilteredArterialPressure();
     F32 const venousPressure = getFilteredVenousPressure();