Partial refactoring of the EntityServletTestHelper to repeat less code.
Finished up changes to entity servlet test helper.
Another chunk of refactoring.