Fixed Windows test failure and checkstyle failure