Test fixes for Windows.