Merge "Move status check to client for "messaging" tests"