Improvements to EntityPerPageBuilderTest.

Change-Id: Ie97b7bbf0fa212041629473d01f1bfb97b140d7c
Merge "Improvements to EntityPerPageBuilderTest."