Improvements to DataItemTest

Change-Id: I2d62592ac8183c6417ed4247b38fc33e471105a8