Change xfails and remove unneeded skips