fix windows tests, include improvements from 0.10.1