Adapt test for Windows carriage returns.  Now it shouldn't matter if the test are expecting `\r\n` or `\n`.