A few fixes to tests for Windows port.