Remove silly code from EntityTestHelper

Change-Id: Ied47d02944c5b42ccc80e37b18c9cc65040ee67f
Merge "Remove silly code from EntityTestHelper"