Fixed minor issues with windows unittest