Refactor some assertions in ModifyEntityTestBase

Change-Id: Ie38b1ccfd7bec1f2cd49164bfc23f627d3f6b812
This makes reading tests easier as well as removing
some uplicate assertions that are not needed
Merge "Refactor some assertions in ModifyEntityTestBase"