Add more test cases to EntityInfoBuilderTest

This is a follow-up to my comments in I4fb12ed.

Change-Id: Ic7ced2d85d7e68480629954d59b1f4d3ca13789c