Index: firmware/App/Controllers/AirPump.c
===================================================================
diff -u -raa6d45143096dfab776ce2ed7c775cfe2dd6db18 -recd6cd89ced8a30e1865eb120c0b8d080cc3cab9
--- firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision aa6d45143096dfab776ce2ed7c775cfe2dd6db18)
+++ firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision ecd6cd89ced8a30e1865eb120c0b8d080cc3cab9)
@@ -242,5 +242,42 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testSetAirPump function sets the air pump to a given state (on/off).
+ * @details \b Inputs: none
+ * @details \b Outputs: currentAirPumpMotorPowerLevel
+ * @param message set message from Dialin which includes the state to set
+ * the air pump to.
+ * @return TRUE if set request is successful, FALSE if not
+ *************************************************************************/
+BOOL testSetAirPump( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // Verify tester has logged in with TD and override type is valid
+    if ( TRUE == isTestingActivated() )
+    {
+        // Verify payload length is valid
+        if ( sizeof( U32 ) + sizeof( U32 ) == message->hdr.payloadLen )
+        {
+            U08 *msgPayload = &message->payload[0];
+            U32 power;
+            U32 state;
+
+            memcpy( &state, msgPayload, sizeof(U32) );
+            msgPayload += sizeof( U32 );
+            memcpy( &power, msgPayload, sizeof( U32 ) );
+
+            if ( power <= AIR_PUMP_MOTOR_MAX_PWM )
+            {
+                setAirPumpState((AIR_PUMP_STATE_T)state, (U08)power );
+                result = TRUE;
+            }
+        }
+    }
+
+    return result;
+}
 /**@}*/
 
Index: firmware/App/Drivers/GLXferPump.c
===================================================================
diff -u -r3fe55376370dc82b5edcb20ac6026d8f079e401b -recd6cd89ced8a30e1865eb120c0b8d080cc3cab9
--- firmware/App/Drivers/GLXferPump.c	(.../GLXferPump.c)	(revision 3fe55376370dc82b5edcb20ac6026d8f079e401b)
+++ firmware/App/Drivers/GLXferPump.c	(.../GLXferPump.c)	(revision ecd6cd89ced8a30e1865eb120c0b8d080cc3cab9)
@@ -90,39 +90,5 @@
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
-
-/*********************************************************************//**
- * @brief
- * The testSetAirPump function sets the air pump to a given state (on/off).
- * @details \b Inputs: none
- * @details \b Outputs: currentAirPumpMotorPowerLevel
- * @param message set message from Dialin which includes the state to set
- * the air pump to.
- * @return TRUE if set request is successful, FALSE if not
- *************************************************************************/
-BOOL testSetAirPump( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // Verify tester has logged in with TD and override type is valid
-    if ( TRUE == isTestingActivated() )
-    {
-        // Verify payload length is valid
-        if ( sizeof( U32 ) == message->hdr.payloadLen )
-        {
-            U32 power;
-
-            memcpy( &power, message->payload, sizeof(U32) );
-            if ( power <= AIR_PUMP_MOTOR_MAX_PWM )
-            {
-                setAirPumpMotorPower( (U08)power );
-                result = TRUE;
-            }
-        }
-    }
-
-    return result;
-}
-
 /**@}*/
 
Index: firmware/App/Drivers/InternalADC.h
===================================================================
diff -u -r56100135135bb715d316b5fd002a4a4951b9334a -recd6cd89ced8a30e1865eb120c0b8d080cc3cab9
--- firmware/App/Drivers/InternalADC.h	(.../InternalADC.h)	(revision 56100135135bb715d316b5fd002a4a4951b9334a)
+++ firmware/App/Drivers/InternalADC.h	(.../InternalADC.h)	(revision ecd6cd89ced8a30e1865eb120c0b8d080cc3cab9)
@@ -55,7 +55,7 @@
     INT_ADC_PRIMARY_ALARM_CURRENT_LG,                   ///< Internal ADC channel for primary alarm audio current low gain
     INT_ADC_24V_ACTUATORS,                              ///< Internal ADC channel for 24V to actuators
     INT_ADC_BACKUP_V,                                   ///< Internal ADC channel for VBackup
-//    INT_ADC_DUMMY,                                      ///< Internal ADC channel - not used, needed to get even number of channels
+    INT_ADC_DUMMY,                                      ///< Internal ADC channel - not used, needed to get even number of channels
     NUM_OF_INT_ADC_CHANNELS                             ///< Number of used internal ADC channels.
 } INT_ADC_CHANNEL_T;