Added fixes for tests when running on Windows, these are mostly fixes to line endings
Fixed another failure that appears only on windows
Returned previous changes so that command line version of tests works 100%
this breaks PyCharm UnitTests but is less of a problem in the long run
Merge branch 'testfixes' into friendlyBuilderName
Fixed unit tests
Merge branch 'friendlyBuilderName' into staging