fix broken tests

Fixes tests for Windows, and failing assertions
Merge pull request #171 from sstok/fix-tests

Fix broken tests