Fixed broken build on windows + added new test case