xfail
tests-and-coverage
Don't be too afraid of the number of changes; most of them are just file moves.