Index: firmware/App/HDCommon.h
===================================================================
diff -u -r4b358e1af8512dd9a0e948ef7c534b6af393b611 -r8910c1a21976afcc84fe1d9504916efbc192325d
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 4b358e1af8512dd9a0e948ef7c534b6af393b611)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 8910c1a21976afcc84fe1d9504916efbc192325d)
@@ -32,7 +32,7 @@
 // TODO - remove build switches before release
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
-    #define BOARD_WITH_NO_HARDWARE          1
+//    #define BOARD_WITH_NO_HARDWARE          1
 //    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rd6c75118f4e5792b40b744a0b29e44c78368a469 -r8910c1a21976afcc84fe1d9504916efbc192325d
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision d6c75118f4e5792b40b744a0b29e44c78368a469)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 8910c1a21976afcc84fe1d9504916efbc192325d)
@@ -132,13 +132,8 @@
             break;
 
         case POST_STATE_BLOOD_FLOW:
-#ifdef DONT_SKIP_NV_POST
-            // Skip the rest of the POSTs
-            postState = POST_STATE_COMPLETED;
-#else
             testStatus = execBloodFlowTest();
             postState = handlePOSTStatus( testStatus );
-#endif
             break;
 
         case POST_STATE_DIALYSATE_FLOW:
@@ -152,8 +147,13 @@
             break;
 
         case POST_STATE_ALARM_LAMP:
+#ifdef DONT_SKIP_NV_POST
+            // Skip the rest of the POSTs
+            postState = POST_STATE_COMPLETED;
+#else
             testStatus = execAlarmLampTest();
             postState = handlePOSTStatus( testStatus );
+#endif
             break;
 
         case POST_STATE_ACCELEROMETER: