Mostly working on LexEvsEntityQueryServiceTestIT, some small changes to
other related classes.