Refactor GetEntities Test

Change-Id: I8660112f8aae634e835d614a148fb40c52284556
Merge "Refactor GetEntities Test"