Hi,
Building for Windows environment with swift build or swift test will fail due to missing imports. The changed files are old, from a time when modern and simple APIs were not yet available. Now everything is buildable with Foundation. I thought these small changes were worth it to fix the build for Windows, so I've made a PR.
Let me know what you think