Cleanup in EntityInserterTest

Change-Id: Ieadad478234a755895059ec68c3a3c77c6f62b83
Further implementation in EntityInserter

Change-Id: I6119bf7444b98c5359b810ac5e56822afd3fb1df