Fix support for findBy* and findAllBy*

Included tests