switched to using "xfail" most places