Make EditEntityTest a little more sane

Change-Id: I1679b7638b7f5caa14ae5afe2ecd03556b891bfb
Merge "Make EditEntityTest a little more sane"