Improved Windows Test Coverage

Okay. That ought to be reliable information, and this seems like a legitimate use of it.