Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r4ea05914616f25058c242b8300f83770438b01d0 -r54f47e88c2aac4b18b089e52fd030888ad6ce916
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4ea05914616f25058c242b8300f83770438b01d0)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 54f47e88c2aac4b18b089e52fd030888ad6ce916)
@@ -306,7 +306,7 @@
 //        cmdResponse.rejectCode  = DD_CMD_REQUEST_REJECT_REASON_NONE;
 //
 //#ifndef _RELEASE_
-//        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+//        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_CAPS_MONITOR ) )
 //        {
 //            concCap = STATE_CLOSED;
 //            diaCap  = STATE_CLOSED;
@@ -366,7 +366,7 @@
 //        cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE;
 //
 //#ifndef _RELEASE_
-//        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+//        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_CAPS_MONITOR ) )
 //        {
 //            concCap = STATE_CLOSED;
 //            diaCap  = STATE_CLOSED;
@@ -427,7 +427,7 @@
 //        cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE;
 //
 //#ifndef _RELEASE_
-//        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+//        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_CAPS_MONITOR ) )
 //        {
 //            concCap = STATE_CLOSED;
 //            diaCap  = STATE_CLOSED;
Index: firmware/App/Monitors/Voltages.c
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r54f47e88c2aac4b18b089e52fd030888ad6ce916
--- firmware/App/Monitors/Voltages.c	(.../Voltages.c)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Monitors/Voltages.c	(.../Voltages.c)	(revision 54f47e88c2aac4b18b089e52fd030888ad6ce916)
@@ -213,7 +213,7 @@
              ( ( channel != MONITORED_VOLTAGE_24V_1 ) && ( channel != MONITORED_VOLTAGE_24V_2 ) ) )
         {
 #ifndef _RELEASE_
-//            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_VOLTAGES_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+//            if ( getTestConfigStatus( TEST_CONFIG_DISABLE_VOLTAGES_ALARMS ) != TRUE )
 #endif
             {
                 volts = getMonitoredLineLevel( channel );