Breaking up activity and search tests into nd cell