Address parse/resolve section refactoring. Once again.
Updated unit tests