Changes to make unit tests working in win