Fixing the testsuite for Windows
Merge pull request #51 from leobuettiker/develop

Fixing the testsuite for Windows