Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r56100135135bb715d316b5fd002a4a4951b9334a -rf1d812de6fbaf4943d05bbee2271bcb61138325a
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 56100135135bb715d316b5fd002a4a4951b9334a)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f1d812de6fbaf4943d05bbee2271bcb61138325a)
@@ -34,7 +34,7 @@
 #include "Switches.h"
 #include "SystemCommTD.h"
 #include "Utilities.h"
-#include "Valve2Way.h"
+#include "Valve3Way.h"
 #include "Valves.h"
 #include "Voltages.h"
 #include "WatchdogMgmt.h"
@@ -104,7 +104,7 @@
     MSG_ID_TD_AIR_TRAP_LEVEL_OVERRIDE_REQUEST,
     MSG_ID_TD_AIR_TRAP_LEVEL_RAW_OVERRIDE_REQUEST,
     MSG_ID_TD_AIR_TRAP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
-    MSG_ID_TD_2_WAY_VALVE_SET_STATE_REQUEST,
+    MSG_ID_TD_3_WAY_VALVE_SET_STATE_REQUEST,
     MSG_ID_TD_ROTARY_PINCH_VALVE_SET_POS_REQUEST,
     MSG_ID_TD_ROTARY_PINCH_VALVE_STATUS_OVERRIDE_REQUEST,
     MSG_ID_TD_ROTARY_PINCH_VALVE_POSITION_OVERRIDE_REQUEST,
@@ -151,7 +151,7 @@
     &testLevelSensorOverride,
     &testRawLevelSensorOverride,
     &testAirTrapDataPublishIntervalOverride,
-    &testSet2WayValve,
+    &testSet3WayValve,
     &testSetValve,
     &testValveStatusOverride,
     &testValveEncoderPositionOverride,
@@ -218,6 +218,10 @@
     U08 crc;
     U08 data[ MAX_ACK_MSG_SIZE ];  // Byte array to populate with message data
 
+#ifdef TEST_AIR_TRAP_ALPHA_TESTING
+    return 0;
+#endif
+
     // Check to see if tester has requested this message not be transmited
     if ( TRUE == isTestingActivated() )
     {