Fix up search tests