Some cleanup in EditEntityTest

Change-Id: I44da01b2bccedffae760abf2a72c131d1e2199fa
Merge "Some cleanup in EditEntityTest"