AID-833 Spec now checks values passed to find_by_domain.