close #22
Parser unit tests implemented.
Refactoring.