Refracotred Client's Tests.
Removed Blocking Queue inside client implementation