Merge "Extend BaseParsing test coverage"