These changes should finish getting tests to pass on Windows