windows tweaks to unicode tests again