Remove/fix skipped and xfailed test (or keep in if related to future development).
Remove/fix skipped and xfailed test (or keep in if related to future development).