Fixed ws_parser and its tests.
Started integration of ws_parser to ws_handler