Add support for windows and test