don't add secondary packages on windows
fix tests
Merge pull request #3555 from devoncarew/devoncarew_windows_packages

don't add secondary packages on windows