updated parser and tests