Fixed typos and tests on Windows