parser and tests added