SI-8205 Don't include CR in line

More penance. Extend the unit test and don't include CR
in the line text.

This is obvious, which shows how dangerous it is to refactor
without unit tests.

My very favorite bugs are off-by-one and EOL handling, followed
closely by off-by-Int.MaxValue.
Merge pull request #3429 from som-snytt/issue/8205

SI-8205 Don't include CR in line