Windows test fixes

Much more to come, but this is a start.

Edited by Matt Harbison

Merge request reports

Loading