Fix remaining test failures
Merge pull request #11 from spring-projects/win_tests_fixes

Fix remaining test failures