(bug5197) Make S2 test suite work.

Missing .out files, DOS line endings, OH MY!