Un xfail tests

master -> merge
v1-train -> no merge