Fix integration tests

Change to `Entity member` to remove ambiguity?