A part of the tests that wew failing on Windows fixed.
A new portion of fixed tests for Windows
Just 3 failing tests left
Bad code indents refactoring reverted.