Fix/annotate a variety of xfail'd tests