This fixes the issues with DS on different OS.
Fix failing tests for Utility classes in windows
revert whitespace
Fix tests around paths for windows.
cs
Merge pull request #3212 from dereuromark/3.0-path-tests

Fix failing tests around DS on different OS