This commit fixes running the test suite on Windows for CI at least by fixing up a few minor edge cases to ensure that everything runs consistently.