Changed xfail implementation