Tweaks after testing on Windows
unit test tweaks