test fixes for running tests on Windows
Merge branch 'fsharp_31' of https://github.com/fsharp/fsharp into fsharp_31