Clean some of the insanity in EntityChangeTest

Change-Id: Iba2f30d6047a4f0982073180204d3f8135f32397
Merge "Clean some of the insanity in EntityChangeTest"