EAGLESIX-2651: And: test phrasing, minor fix to code