Fixup unit tests on Windows - All unit tests now pass!