Improve EntityIdTest

Change-Id: I4ef087d6f3f4bb65d1276c0803275cc0dcda6d08
Merge "Improve EntityIdTest"