Many new unit tests added for the parsing mechanism.
Parsing logic edited. New unit tests.