Add extra tests for EntityId

Change-Id: I3aa8898bea102ed2d0390031e4ab49f0e9cb3ea5