Index: firmware/App/Controllers/Voltages.c
===================================================================
diff -u -r2166449661816a6c2845b7036ae7ddaedaeb9f9a -r5156a859330f51537606ffdab32ea63d8fac9cac
--- firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 2166449661816a6c2845b7036ae7ddaedaeb9f9a)
+++ firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 5156a859330f51537606ffdab32ea63d8fac9cac)
@@ -32,7 +32,7 @@
 #define VOLTAGES_DATA_PUB_INTERVAL          ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )       ///< Interval (ms/task time) at which the voltages data is published on the CAN bus.
 #define VOLTAGES_ALARM_PERSISTENCE          ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )       ///< Alarm persistence period for voltage monitor alarms.
 
-/// Defined states for the pressure and occlusion monitor state machine.
+/// Defined states for the voltage monitor state machine.
 typedef enum Voltages_States
 {
     VOLTAGES_INIT_STATE = 0,                ///< Initialization state.
Index: firmware/App/Controllers/Voltages.h
===================================================================
diff -u -r2166449661816a6c2845b7036ae7ddaedaeb9f9a -r5156a859330f51537606ffdab32ea63d8fac9cac
--- firmware/App/Controllers/Voltages.h	(.../Voltages.h)	(revision 2166449661816a6c2845b7036ae7ddaedaeb9f9a)
+++ firmware/App/Controllers/Voltages.h	(.../Voltages.h)	(revision 5156a859330f51537606ffdab32ea63d8fac9cac)
@@ -31,7 +31,7 @@
 
 // ********** public definitions **********
 
-/// Enumeration of pressure sensors monitored by this module.
+/// Enumeration of voltages monitored by this module.
 typedef enum Voltages
 {
     MONITORED_LINE_24V_MAIN = 0,            ///< Main voltage (24V)
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r23120d5201ec71f5bf9597c4951524652e3672ad -r5156a859330f51537606ffdab32ea63d8fac9cac
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 23120d5201ec71f5bf9597c4951524652e3672ad)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 5156a859330f51537606ffdab32ea63d8fac9cac)
@@ -124,11 +124,6 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
-        case DG_POST_STATE_LOAD_CELL:
-            testStatus = execLoadCellsSelfTest();
-            postState = handlePOSTStatus( testStatus );
-            break;
-
         case DG_POST_STATE_TEMPERATURE_SENSORS:
 #ifdef DONT_SKIP_NV_POST
             // Skip the rest of the POSTs
@@ -181,9 +176,14 @@
             break;
 #endif
 
-        // Should be last POST
         case DG_POST_STATE_WATCHDOG:
             testStatus = execWatchdogTest();
+            postState = handlePOSTStatus( testStatus );
+            break;
+
+            // Should be last POST (and last POST test must be a test that completes in a single call)
+        case DG_POST_STATE_LOAD_CELL:
+            testStatus = execLoadCellsSelfTest();
             handlePOSTStatus( testStatus );  // ignoring return value because last test
             if ( TRUE == tempPOSTPassed )
             {