Merge pull request #642 from bcwaldon/fix-functional

functional: clean up after jonboulle
unit: move multivalue line check into parse func
unit: add tests for parseMultivalueLine