Fixed #985 : Unittest failed with MinGWx64. And few small improvement were done while looking for mistakes.

Problem was because of Windows uses backslashes '\', not Unix '/'