Issue 546: Tests cannot be run on Windows

Allows the tests to be run on Windows (using git bash or cmd) and does not affect running the tests on *nix.