Added a graceful attempt for the client to connect to the WS server
Returns with an error after numerous attempts
Ran formatter, fixed the client side bug i introduced and altered test to reflect
changes