Index: firmware/App/Controllers/Voltages.c
===================================================================
diff -u -r08e11fb11f818dd326617362ca7361b2fae1662a -r2166449661816a6c2845b7036ae7ddaedaeb9f9a
--- firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 08e11fb11f818dd326617362ca7361b2fae1662a)
+++ firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 2166449661816a6c2845b7036ae7ddaedaeb9f9a)
@@ -40,15 +40,6 @@
     NUM_OF_VOLTAGES_STATES                  ///< Number of voltage monitor states.
 } VOLTAGES_STATE_T;
 
-/// Defined states for the voltage monitor self-test state machine.
-typedef enum Voltages_Self_Test_States
-{
-    VOLTAGES_SELF_TEST_STATE_START = 0,     ///< Self test start state.
-    VOLTAGES_TEST_STATE_IN_PROGRESS,        ///< Self test in progress state.
-    VOLTAGES_TEST_STATE_COMPLETE,           ///< Self test completed state.
-    NUM_OF_VOLTAGES_SELF_TEST_STATES        ///< Number of voltage monitor self-test states.
-} VOLTAGES_SELF_TEST_STATE_T;
-
 /// Maximum voltage/current level for each monitored signal.
 static const F32 MAX_VOLTAGES[ NUM_OF_MONITORED_LINES ] =
 {
@@ -152,7 +143,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, 0, voltagesState )   // TODO - add enum for this s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, (U32)SW_FAULT_ID_INVALID_VOLTAGE_MONITOR_STATE, voltagesState )
             break;
     }
 
@@ -164,8 +155,8 @@
  * @brief
  * The handleVoltagesInitState function handles the initialize state
  * of the voltages monitor state machine.
- * @details Inputs: TBD
- * @details Outputs: TBD
+ * @details Inputs: none
+ * @details Outputs: none
  * @return next state
  *************************************************************************/
 static VOLTAGES_STATE_T handleVoltagesInitState( void )
@@ -294,7 +285,7 @@
     }
     else
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, (U32)SW_FAULT_ID_INVALID_MONITORED_VOLTAGE_ID, (U32)signal )
     }
 
     return result;
@@ -335,22 +326,7 @@
         voltagesDataPublicationTimerCounter = 0;
     }
 }
-
-/*********************************************************************//**
- * @brief
- * The execVoltagesTest function executes the voltage monitor self-test.
- * @details Inputs: none
- * @details Outputs: none
- * @return the result of the voltage monitor self-test.
- *************************************************************************/
-SELF_TEST_STATUS_T execVoltagesTest( void )
-{
-    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
 
-    // TODO - implement
-
-    return result;
-}
 
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
Index: firmware/App/Controllers/Voltages.h
===================================================================
diff -u -r08e11fb11f818dd326617362ca7361b2fae1662a -r2166449661816a6c2845b7036ae7ddaedaeb9f9a
--- firmware/App/Controllers/Voltages.h	(.../Voltages.h)	(revision 08e11fb11f818dd326617362ca7361b2fae1662a)
+++ firmware/App/Controllers/Voltages.h	(.../Voltages.h)	(revision 2166449661816a6c2845b7036ae7ddaedaeb9f9a)
@@ -78,8 +78,6 @@
 void initVoltagesMonitor( void );
 void execVoltagesMonitor( void );
 
-SELF_TEST_STATUS_T execVoltagesTest( void );
-
 F32 getMonitoredLineLevel( MONITORED_VOLTAGES_T signal );
 
 BOOL testSetVoltagesDataPublishIntervalOverride( U32 value );
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r08e11fb11f818dd326617362ca7361b2fae1662a -r2166449661816a6c2845b7036ae7ddaedaeb9f9a
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 08e11fb11f818dd326617362ca7361b2fae1662a)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 2166449661816a6c2845b7036ae7ddaedaeb9f9a)
@@ -155,12 +155,14 @@
     SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID,
     SW_FAULT_ID_HEAT_DISINFECT_INVALID_EXEC_STATE,                      // 75
     SW_FAULT_ID_INVALID_DG_RESERVOIR_SELECTED,
-    SW_FAULT_ID_STANDBY_MODE_INVALID_EXEC_STATE,                        // 75
+    SW_FAULT_ID_STANDBY_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_RECIRC_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_DRAIN_MODE_INVALID_EXEC_STATE,
-    SW_FAULT_ID_FILL_MODE_INVALID_EXEC_STATE,
+    SW_FAULT_ID_FILL_MODE_INVALID_EXEC_STATE,                           // 80
     SW_FAULT_ID_PRESSURE_INVALID_EXEC_STATE,
-    SW_FAULT_ID_INVALID_NVDATAMGMT_EXEC_CAL_STATE,                      // 80
+    SW_FAULT_ID_INVALID_NVDATAMGMT_EXEC_CAL_STATE,
+    SW_FAULT_ID_INVALID_VOLTAGE_MONITOR_STATE,
+    SW_FAULT_ID_INVALID_MONITORED_VOLTAGE_ID,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;