Integration test, websocket adaptor & bug fixes