Cleanup EntityChange related tests

Follow-up for smaller mistakes found in
Ia92135ae35edc53691c7f420d67445c9baf8e925.

Change-Id: I9caf5468db0d3b2de00aeedf28cdcf49a86933b8
Merge "Cleanup EntityChange related tests"