Make messages more detailed in EntityContentTest

Change-Id: Id4243a0fcc2e43b33cbd30734c4b5ee6f4d2fe3b
Merge "Make messages more detailed in EntityContentTest"