Refactor and clean up testing for Windows
More Windows-related updates