Patch by Jon Dufresne.
I have compared output between pre- and post-patch runs of these tests to make sure there's nothing missing and nothing broken, on both Windows and Linux. The only differences I found were actually tests that were previously *not* run.
Patch by Mark Mc Mahon.