Added a unit test for websocket_client functionality, other small fixes