Remove repetition of entity IDs in tests

There were several places where the key and entity id
didn't match up.