Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r21a1f9847f1ccf22ec8b906bcdadea47ec7b5dc9 -r3afb9f74631d80a7c8ef99e000d33c3f0552b7f8
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 21a1f9847f1ccf22ec8b906bcdadea47ec7b5dc9)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 3afb9f74631d80a7c8ef99e000d33c3f0552b7f8)
@@ -118,7 +118,7 @@
     { MSG_ID_UI_PRESSURE_LIMIT_WIDEN_REQUEST,                           &pressureLimitHandleWidenRequest },
     { MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST,                                &bloodPrimeHandleCmdRequest },
     { MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST,          &bloodPrimeHandleBloodFlowChangeRequest },
-    { MSG_ID_TD_TUBE_SET_AUTHENTICATION_ACK_RESPONSE,                   &drySelfTestHandleTubingSetAuthResponse },
+    { MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE,                   &drySelfTestHandleTubingSetAuthResponse },
     { MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST,                     &handleAutoLoadRequest },
     { MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST,             &handleAutoEjectRequest },
     { MSG_ID_TD_SOFTWARE_RESET_REQUEST,                                 &testTDSoftwareResetRequest },
Index: firmware/App/Services/StateServices/DrySelfTests.c
===================================================================
diff -u -redc719dbcce02d17d2693ab81712615c617527a0 -r3afb9f74631d80a7c8ef99e000d33c3f0552b7f8
--- firmware/App/Services/StateServices/DrySelfTests.c	(.../DrySelfTests.c)	(revision edc719dbcce02d17d2693ab81712615c617527a0)
+++ firmware/App/Services/StateServices/DrySelfTests.c	(.../DrySelfTests.c)	(revision 3afb9f74631d80a7c8ef99e000d33c3f0552b7f8)
@@ -395,7 +395,7 @@
     if ( STATE_CLOSED == door )
     {
         doorClosedRequired( TRUE );
-        state = DRY_SELF_TESTS_USED_TUBING_SET_CHECK_STATE;
+        state = DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE;
     }
 
     return state;
@@ -506,7 +506,7 @@
         {
             //tubingSetChecksCompleted = TRUE;
             pressureSelfTestPreNormalStartTime = getMSTimerCount();
-            state = DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE;
+//            state = DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE;
         }
     }
 
@@ -873,6 +873,7 @@
         authResponseModalityAccepted   = (BOOL)payload.modalityMatch;
         authResponseReceived           = TRUE;
         result                         = TRUE;
+        barcodeScanResponseReceived    = authResponseValidTubingSet && authResponseModalityAccepted;
     }
 
     return result;