Applied ncbray comments to websocket test and patch