Merge branch 'feature/xz' into develop
Fix various tests to work correctly on Windows platforms (or at least Win7)

Closes issue #45
Merge pull request #46 from cdombroski/feature/winfixes

Fixed tests for Windows