+ Update parser and parser test