Created a temporary fix to work more correctly with the WebSocket transport server.

- This covers all test case passes however there are edge cases having
to do with network disconnect that still need to be fixed

#1254