Fix a test failure.
Fix incorrect newline parsing.
Add a test for 2a41b1d.