Update/add search translator tests. Fix EIDR.