add websocket tests using jetty; some clean up in websocket and ws