Tests: Rename tests with the same name

These two tests are confusing because they have the same class name in
different packages.  This results in accidentally looking at the wrong
file when trying to open the test by class name. They are also
not "simple"..

src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java → src/test/java/org/elasticsearch/count/query/CountQueryTests.java

@@ -43,7 +43,7 @@
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
-public class SimpleQueryTests extends ElasticsearchIntegrationTest {
+public class CountQueryTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void passQueryAsStringTest() throws Exception {

src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java → src/test/java/org/elasticsearch/search/query/SearchQueryTests.java

@@ -62,7 +62,7 @@
 import static org.hamcrest.Matchers.*;
 
 
-public class SimpleQueryTests extends ElasticsearchIntegrationTest {
+public class SearchQueryTests extends ElasticsearchIntegrationTest {
 
     @Override
     protected int maximumNumberOfShards() {