Fix associations tests
Keep old version of find_by_email, it's working with live tests