tests failing on windows platform

...because of different line endings.
Imports also sorted