Fix datastore tests so that they pass in live mode

Change-Id: If8fa4a5bcaea0f274e4c25dc61822c75723db31d
Partial-Bug: #1311383
Merge "Fix datastore tests so that they pass in live mode"