Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r63ee0dc6bdeffc45e3730f5579af3133a212d8f9 -ra6737c3bcc8286c153b778c2c395f465e76aaafb
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 63ee0dc6bdeffc45e3730f5579af3133a212d8f9)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision a6737c3bcc8286c153b778c2c395f465e76aaafb)
@@ -135,35 +135,35 @@
                 break;
 
             case D63_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
                 }
                 else
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 break;
 
             case D98_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
                 }
                 else
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 break;
 
             case D46_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD46LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW;
                 }
                 else
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD46LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 break;
 
@@ -447,42 +447,44 @@
     {
        levelStatus = getFPGAD6LevelStatus();
 
-       if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
+       if ( ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE ) &&
+            ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) )
        {
            // Beta 1.9 behavior
            currentLevelStatus = getLevelStateBeta19( levelStatus );
        }
-       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
        {
-           // Beta 1.0 behavior
-           currentLevelStatus = getLevelStateBeta10( levelStatus );
+           // Beta 2.0 behavior
+           currentLevelStatus = getLevelState( levelStatus );
        }
        else
        {
-           // Beta 2.0 behavior
-           currentLevelStatus = getLevelState( levelStatus );
+           // Beta 1.0 behavior
+           currentLevelStatus = getLevelStateBeta10( levelStatus );
        }
     }
 
     else if ( P25_LEVL == levelId )
     {
        levelStatus = getFPGAP25FloaterState();
 
-       if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
+       if ( ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE ) &&
+            ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) )
        {
            // Beta 1.9 behavior
            currentLevelStatus = getLevelStateBeta19( levelStatus );
        }
-       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+      {
+          // Beta 2.0 behavior
+          currentLevelStatus = getLevelState( levelStatus );
+      }
+       else
        {
            // Beta 1.0 behavior
            currentLevelStatus = getLevelStateBeta10( levelStatus );
        }
-       else
-       {
-           // Beta 2.0 behavior
-           currentLevelStatus = getLevelState( levelStatus );
-       }
     }
 
     else