Windows test changes and bug fixes
Merge branch 'changes'