Kind of fixed few tests failing on windows