Refactor EntityTestBase

Split all messy entity stuff into a helper
No tests using entitys care what the id number is
No tests should conflict with each other
Run order no longer matters
Bug: 51681
Change-Id: I9152e3bc2f701d3d90d1eb11e6473364bd80814e
Merge "Refactor EntityTestBase"