Added test to make data access more robust.
p4#: 20403