diff --git a/plugins/elasticsearch/Gemfile b/plugins/elasticsearch/Gemfile
index fb6db74..6b6aa79 100644
--- a/plugins/elasticsearch/Gemfile
+++ b/plugins/elasticsearch/Gemfile
@@ -2,4 +2,3 @@ source 'https://rubygems.org'
 
 gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
-gem 'elasticsearch-extensions'
diff --git a/plugins/elasticsearch/test/unit/controllers/elasticsearch_plugin_controller_test.rb b/plugins/elasticsearch/test/unit/controllers/elasticsearch_plugin_controller_test.rb
index a5dd047..dad4091 100644
--- a/plugins/elasticsearch/test/unit/controllers/elasticsearch_plugin_controller_test.rb
+++ b/plugins/elasticsearch/test/unit/controllers/elasticsearch_plugin_controller_test.rb
@@ -5,21 +5,47 @@ class ElasticsearchPluginControllerTest < ActionController::TestCase
   def setup
     @environment = Environment.default
     @environment.enable_plugin(ElasticsearchPlugin)
-    create_user('John Silva').person
-    create_user('John Silvio').person
+
     community = fast_create(Community)
     community.name = "I like organic"
     community.created_at = Time.now
     community.save
-    Community.import
-    sleep 1
+    create_instances
+    import_instancies
+  end
+
+  def teardown
+    Person.__elasticsearch__.client.indices.delete index: Person.index_name
+    Community.__elasticsearch__.client.indices.delete index: Community.index_name
+  end
 
+  def import_instancies
     #TODO: fix this, when update or create a new person
     # the Elasticsearch::Model can update the
     # indexes models
+    Person.__elasticsearch__.create_index!
+    Community.__elasticsearch__.create_index!
+
     Person.import
-    sleep 1
+    Community.import
+    sleep 2
+  end
+
+  def create_instances
+    create_people
+    create_communities
+  end
+
+  def create_people
+    5.times do | index |
+      create_user "person_#{index}"
+    end
+  end
 
+  def create_communities
+    10.times do | index |
+      fast_create Community, name: "community_#{index}", created_at: Date.new
+    end
   end
 
   should 'work and uses control filter variables' do
@@ -31,16 +57,68 @@ class ElasticsearchPluginControllerTest < ActionController::TestCase
     assert_not_nil assigns(:selected_filter_field)
   end
 
-  should 'return all results if selected_type is nil' do
-    get :index, {'selected_type' => :person, :query => 'John'}
+  should 'return 10 results if selected_type is nil and query is nil' do
+    get :index
+    assert_response :success
+    assert_select ".search-item" , 10
+  end
+
+  should 'render pagination if results has more than 10' do
+    get :index
+    assert_response :success
+    assert_select ".pagination", 1
+  end
+
+  should 'return results filtered by selected_type' do
+    get :index, { 'selected_type' => :person}
     assert_response :success
-    assert_select ".search-item" , 2
+    assert_select ".search-item", 5
   end
 
-  should 'render index' do
-    get :index, {'selected_type' => :person, :query => 'Silva'}
+  should 'return results filtered by query' do
+    get :index, { 'query' => "person_"}
+    assert_response :success
+    assert_select ".search-item", 5
+  end
+
+  should 'return results filtered by query with uppercase' do
+    get :index, {'query' => "PERSON_1"}
+    assert_response :success
+    assert_select ".search-item", 1
+  end
+
+  should 'return results filtered by query with downcase' do
+    get :index, {'query' => "person_1"}
+    assert_response :success
+    assert_select ".search-item", 1
+  end
+
+  should 'return new person indexed' do
+    get :index, { "selected_type" => :person}
+    assert_response :success
+    assert_select ".search-item", 5
+
+    object = create_user "New Person"
+    Person.import
+    sleep 1
+
+    get :index, { "selected_type" => :person}
+    assert_response :success
+    assert_select ".search-item", 6
+  end
+
+  should 'not return person deleted' do
+    get :index, { "selected_type" => :person}
+    assert_response :success
+    assert_select ".search-item", 5
+
+    Person.first.delete
+    Person.import
+    sleep 1
+
+    get :index, { "selected_type" => :person}
     assert_response :success
-    assert_select ".search-item" , 1
+    assert_select ".search-item", 4
   end
 
   should 'redirect to elasticsearch plugin when request are send to core' do
--
libgit2 0.21.2