Resource resolution and message escaping tests pass on Windows again