a few changes to get some tests running on windows
Merge pull request #11 from Remo/win-testing

get tests running on windows