Fix UT (line endings issue)
More tests