Reduce inheritance in EntityContentTest

Especially the redirect stuff is only needed in ItemContentTest.

Change-Id: If76715ff5275c7ecb381413dd4f073aef0603b4e
Merge "Reduce inheritance in EntityContentTest"