Xfail Issue: 1098 Investigate and fix tests failing because of Cell Data

Master -> merge
v1-train -> no merge