Nit: In most files you have put the `skip-if` after the bug comment and `xfail`.