Fix util-test on Windows, take 2