Unit Parsers fixes. Tests refinement.