Clean up entityChangers tests

Main reason for this patch are the somewhat confusing strings in
the tests that look like class names.

Change-Id: I9251b4bf6a85133fcb264ad3528002d958e15d2c
Merge "Clean up entityChangers tests"