Merge pull request #562 from pkriens/master

Windows failed tests fixed
[windows] Make the test pass on windows that uses another file sep. character
[windows] More feeble attempts trying to figure out why windows fails these tests

Signed-off-by: Peter Kriens <peter.kriens@aqute.biz>