Fix failing tests and windows link dependencies

d86678778aMartin Wickham committed on 9/22/2021, 7:39:02 PMparent4782bed
3 files changedLine totals unavailable