Make a second attempt at preserving carriage returns in test data.