provideEntityHandels into the class that uses it

If only one Testset uses it there is no point in it
being in the base. Also this will spliting the
current base into a helper easier
Change-Id: Ic1a90d3dd339e6e8e9ca61e664fdca4d8f7fe05c
Merge "provideEntityHandels into the class that uses it"