(bug 62491) make API tests not use EntityContent

Change-Id: Iffd97f0a7ae0a9f1e260a6d38340292a83db013e
Merge "(bug 62491) make API tests not use EntityContent"