Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r74be223d47ea7bb0ac7d814e74d3627d830a5fac -r5bfaf341319b9fd763d07ad0a68a986028c37587
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 74be223d47ea7bb0ac7d814e74d3627d830a5fac)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 5bfaf341319b9fd763d07ad0a68a986028c37587)
@@ -7,8 +7,8 @@
 *
 * @file    ModeInitPOST.c
 *
-* @author  (last)      Quang Nguyen
-* @date    (last)      19-Aug-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      10-Nov-2021
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -152,8 +152,7 @@
             break;
 
         case POST_STATE_WATCHDOG:
-            //testStatus = execWatchdogTest();
-            testStatus = SELF_TEST_STATUS_PASSED; // Why is this not passing in unit 4?
+            testStatus = execWatchdogTest();
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -225,8 +224,7 @@
             break;
 
         case POST_STATE_UI_POST:
-            //testStatus = execUITest();
-            testStatus = SELF_TEST_STATUS_PASSED; // TODO why is this failing in unit 4?
+            testStatus = execUITest();
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -307,13 +305,13 @@
  * The signalDGPOSTFinalResult function records the final POST result for
  * the DG.
  * @details Inputs: none
- * @details Outputs: dgPOSTPassed
+ * @details Outputs: dgPOSTPassed, dgPOSTResultReceived
  * @param passed TRUE if DG POST tests all passed, FALSE if any DG POST test failed
  * @return none
  *************************************************************************/
 void signalDGPOSTFinalResult( BOOL passed )
 {
-    dgPOSTPassed = passed;
+    dgPOSTPassed         = passed;
     dgPOSTResultReceived = TRUE;
 }
 
@@ -374,8 +372,8 @@
  * @brief
  * The handlePOSTStatus function handles a status result returned by a
  * POST function.
- * @details Inputs: postPassed
- * @details Outputs: none
+ * @details Inputs: testStatus
+ * @details Outputs: tempPOSTPassed
  * @param testStatus status reported by last test
  * @return recommended next POST state
  *************************************************************************/