Regrouped search tests in one