parse: Update parser and unit test for it