Fix for tests.
Refactored websocket code into it's own specific namespace