Adds tests + Fixes one use case

As promised.

Do you think a new release could be possible to fix the name predicate bug?

Cheers,