Fix broken tests

                      
|Q            |A     |
|---          |---   |
|Bug Fix?     |y     |
|New Feature? |n     |
|BC Breaks?   |n     |
|Deprecations?|n     |
|Tests Pass?  |y     |
|Fixed Tickets|GH-167|
|License      |MIT   |
|Doc PR       |      |
                      

Fixes broken tests, and tests for windows
 Sent using [Gush](https://github.com/gushphp/gush)