Remove some clutter from EntityDataRequestHandlerTest

Change-Id: I7fd6fe3f099550d8c5df5fbf92cefdd7ea2f51bd