mypy

investigate and change a couple of -skips to -xfails

#20889

Open