Revert "Refactor GetEntities Test"

This reverts commit 553b32c6419c9868f7f05dda77c683be60e9593f.

Change-Id: I3687b6f2d75620badae31dee1d3705f3eba05fb0
Merge "Revert "Refactor GetEntities Test""