Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r0c850275df7a63f620bfb06e3b9fe8a2aeebab7b -r79906a34c1e88c2b02c7453079a6dffe09f9dfb4
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 0c850275df7a63f620bfb06e3b9fe8a2aeebab7b)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 79906a34c1e88c2b02c7453079a6dffe09f9dfb4)
@@ -465,7 +465,7 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
     {
         //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
         setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
@@ -700,7 +700,7 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
     {
         //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
         setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
Index: firmware/App/Controllers/Ultrafiltration.c
===================================================================
diff -u -r8f8c4ba2fe7eb6be3f939ccf9bf3b0cc76741f08 -r79906a34c1e88c2b02c7453079a6dffe09f9dfb4
--- firmware/App/Controllers/Ultrafiltration.c	(.../Ultrafiltration.c)	(revision 8f8c4ba2fe7eb6be3f939ccf9bf3b0cc76741f08)
+++ firmware/App/Controllers/Ultrafiltration.c	(.../Ultrafiltration.c)	(revision 79906a34c1e88c2b02c7453079a6dffe09f9dfb4)
@@ -247,7 +247,7 @@
         F32 balancingError;
 
         // Fresh side dialysate density
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
         {
             freshDensity = ( COMP_SLOPE * getD4AverageTemperature() ) + COMP_INTERCEPT;
         }
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r0c850275df7a63f620bfb06e3b9fe8a2aeebab7b -r79906a34c1e88c2b02c7453079a6dffe09f9dfb4
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 0c850275df7a63f620bfb06e3b9fe8a2aeebab7b)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 79906a34c1e88c2b02c7453079a6dffe09f9dfb4)
@@ -272,7 +272,7 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
             {
                 setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
             }
@@ -316,7 +316,7 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
             {
                 setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
             }