Proper tests
Merge pull request #12 from hybridgroup/windows-test

More tests!