Change badgeselector test to use the new EntityStore

Change-Id: I2aabbec0e8480589b9057feff1ee81e87f304120
Merge "Change badgeselector test to use the new EntityStore"