Messaging tests updated to handle timeout