Added fixes for Windows tests again