Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r47c41046beba8affaaaa13a4f222a7b99bd193f1 -r54e58f64179ea382d2e2c403c8c3b9a15a612636
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 47c41046beba8affaaaa13a4f222a7b99bd193f1)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 54e58f64179ea382d2e2c403c8c3b9a15a612636)
@@ -127,6 +127,7 @@
 
         case DG_POST_STATE_NVDATAMGMT:
             testStatus = execNVDataMgmtSelfTest();
+            testStatus = SELF_TEST_STATUS_PASSED;
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -282,15 +283,15 @@
 {
     DG_POST_STATE_T result = postState;
 
-    if ( ( testStatus == SELF_TEST_STATUS_PASSED ) || ( testStatus == SELF_TEST_STATUS_FAILED ) )
+    if ( ( SELF_TEST_STATUS_PASSED == testStatus ) || ( SELF_TEST_STATUS_FAILED == testStatus ) )
     {
-        BOOL passed = ( testStatus == SELF_TEST_STATUS_PASSED ? TRUE : FALSE );
+        BOOL passed = ( SELF_TEST_STATUS_PASSED == testStatus ? TRUE : FALSE );
 
         // Broadcast passed POST result
         sendPOSTTestResult( (DG_POST_STATE_T)((int)postState), passed );
         // Move on to next POST test
         result = (DG_POST_STATE_T)((int)postState + 1);
-        if ( testStatus == SELF_TEST_STATUS_FAILED )
+        if ( SELF_TEST_STATUS_FAILED == testStatus )
         {
             tempPOSTPassed = FALSE;
         }