Merge "Fix failing Windows tests"