fix test errors (on windows) for commit r251287