Improved findBy* test