Tweaking the unit tests so they're easier to run on Windows