What does this implement/fix? Explain your changes.

Originally from PR #1402. The underlying bug is now fixed, but the tests
are still applicable.

Does this close any currently open issues?

Possibly #1371 (it may have been fixed already by another PR)

Checklist

Check all those that are applicable and complete.

• Make sure to include one or more tests for your change
• If an enhancement PR, please create docs and at best an example
• Ensure you have signed the .NET Foundation CLA
• Add yourself to AUTHORS
• Updated the CHANGELOG