Two windows fixes for tests