Index: TestSupport.c
===================================================================
diff -u -rfa4ec44fcd8f3d3598485bdb9a94a08490f4ef6d -r84116eb2eac6426f294626ecc0259296b8da52ce
--- TestSupport.c	(.../TestSupport.c)	(revision fa4ec44fcd8f3d3598485bdb9a94a08490f4ef6d)
+++ TestSupport.c	(.../TestSupport.c)	(revision 84116eb2eac6426f294626ecc0259296b8da52ce)
@@ -532,21 +532,20 @@
         testConfig[ config ] = TEST_CONFIG_ENABLE_KEY;
         status               = TRUE;
 #ifdef _DD_
-        if ( config == TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW )
+        if ( config == TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW )
         {
             if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
             {
                 // If beta 2.0 config is enabled by mistake when beta 1.0 config is active
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, config )
             }
-            else
-            {
-                // Initialize the blood leak driver since the FPGA registers are changed
-                initBloodLeak();
-                // initialize FPGA registers to Beta 2.0
-                initFPGAPerHW( TRUE );
-            }
         }
+        else
+        {
+            // initialize FPGA registers to Beta 2.0
+            initFPGAPerHW( TRUE );
+        }
+
 #endif
     }
 
@@ -571,16 +570,14 @@
     {
         testConfig[ config ] = TEST_CONFIG_DISABLE_KEY;
         status               = TRUE;
+    }
 #ifdef _DD_
-        if ( config == TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW )
+        if ( config == TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW )
         {
-            // Initialize the blood leak driver since the FPGA registers are changed
-            initBloodLeak();
             // initialize FPGA registers to Beta 1.9 or below
             initFPGAPerHW( FALSE );
         }
 #endif
-    }
 
     return status;
 }