Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r552a7de419344b43a3307c61141c99bfbbee7345 -rf1d812de6fbaf4943d05bbee2271bcb61138325a
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 552a7de419344b43a3307c61141c99bfbbee7345)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f1d812de6fbaf4943d05bbee2271bcb61138325a)
@@ -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,
@@ -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() )
     {