Windows testing fixes