Deal with test data line endings
Added missing encodings