Resolve conflicts and fix up search tests