Fix test naming, and fix tests on windows.

This is a bugfix against my fix for #40133 (closed), which has not yet appeared in 0.3.5.

Part of #40365 (closed).