more unit test touch-ups for Windows