Index: firmware/App/DGCommon.h
===================================================================
diff -u -r45a4f6517bd771cde7cba75c9150acef8176fa13 -r834383d5b8aab93b93425fdcc36954b9a89aef74
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 45a4f6517bd771cde7cba75c9150acef8176fa13)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 834383d5b8aab93b93425fdcc36954b9a89aef74)
@@ -25,7 +25,7 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        24
+#define DG_VERSION_BUILD        150
 
 // ********** build switches **********
 
@@ -56,16 +56,17 @@
 //    #define NEW_FMD_FLOW_SENSOR             1            // Not needed
     #define DISABLE_HEATERS_EFFICIENCY      1
     #define DISABLE_COND_STATUS_CHECK       1            /// Build switch
+
     #define DISABLE_DISINFECT_CONDUCTIVITY 1           // Implement
 //    #define DISABLE_CONC_PUMPS             1
 //    #define DISABLE_CAP_SWITCHES            1           // Implement
     #define DISABLE_UV_REACTORS             1
     #define DISABLE_ACID_BICARB_ALARMS      1            // Implement
     #define DISABLE_EMPTY_BOTTLES_ALARMS    1           // Implement
 
-//    #define DISABLE_PRIME_CONCENT_LINES        1
-//    #define DISABLE_BICARB_CONDUCTIVITY_TEST   1
-//    #define DISABLE_ACID_CONDUCTIVITY_TEST     1
+
+    #define DISABLE_BICARB_CONDUCTIVITY_TEST   1
+    #define DISABLE_ACID_CONDUCTIVITY_TEST     1
     // Turn these flags on to disable dialysate mixing
 //    #define DISABLE_DIALYSATE_CHECK         1  // Disabled for Tom  // Implement
 //    #define DISABLE_MIXING                  1                     // Implement
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r45a4f6517bd771cde7cba75c9150acef8176fa13 -r834383d5b8aab93b93425fdcc36954b9a89aef74
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 45a4f6517bd771cde7cba75c9150acef8176fa13)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 834383d5b8aab93b93425fdcc36954b9a89aef74)
@@ -300,15 +300,15 @@
 {
     DG_POST_STATE_T result = postState;
 
-    if ( ( SELF_TEST_STATUS_PASSED == testStatus ) || ( SELF_TEST_STATUS_FAILED == testStatus ) )
+    if ( ( testStatus == SELF_TEST_STATUS_PASSED ) || ( testStatus == SELF_TEST_STATUS_FAILED ) )
     {
-        BOOL passed = ( SELF_TEST_STATUS_PASSED == testStatus ? TRUE : FALSE );
+        BOOL passed = ( testStatus == SELF_TEST_STATUS_PASSED ? 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 ( SELF_TEST_STATUS_FAILED == testStatus )
+        if ( testStatus == SELF_TEST_STATUS_FAILED )
         {
             tempPOSTPassed = FALSE;
         }