Make entityselector tests actually test user input

Change-Id: I7ad54a503242b8cb8df1e0f11a358abab463e578
Merge "Make entityselector tests actually test user input"