Added expected exceptions
Added websocket support