Some sanity changes in EditEntityTest

Change-Id: Idba0262edd22a63955f4331371fec6dec45407f7
Merge "Some sanity changes in EditEntityTest"