Refactored parser some more; added unit tests