Fixed test failures on windows caused by CR & LF incompatibilities.