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