Add test for Entity type
Make entity tests pass