Rewrite completely broken EntityView tests

Change-Id: Ibc373a9017c25cc2bdacbabeea2b97d283e31b00
Merge "Rewrite completely broken EntityView tests"