Fix test failures on windows & cleanup pom