Fixes 2 of the remaining 4 fails on the MK fails on Windows platform
Merge pull request #295 from AlinT/fix_fails_again

Fixes 2 of the remaining 4 fails on the MK fails on Windows platform