fixed windows build and tests