--- a/server/src/tests/Controllers/DiscourseControllerTest.php	Wed Nov 09 15:05:41 2016 +0100
+++ b/server/src/tests/Controllers/DiscourseControllerTest.php	Wed Nov 09 23:41:15 2016 +0100
@@ -7,21 +7,21 @@
  */
 class DiscourseControllerTest extends TestCase {
 
-    const ES_QUERY = [
-        'index' => 'corpus',
-        'body' => [
-            "size" => 0,
-            "query" => [ "match_all" => [] ],
-            "aggs" => [
-                "discourses" => [
-                    "terms" => [ "field" => "discourse_types", "order" => [ "_count" => "desc" ], "size" => 0 ]
+    private $ES_QUERY;
+
+    public function setUp() {
+        $this->ES_QUERY = [
+            'index' => 'corpus',
+            'body' => [
+                "size" => 0,
+                "query" => [ "match_all" => (object) null ],
+                "aggs" => [
+                    "discourses" => [
+                        "terms" => [ "field" => "discourse_types", "order" => [ "_count" => "desc" ], "size" => 2147483647 ]
+                    ]
                 ]
             ]
-        ]
-    ];
-
-    public function setUp() {
-
+        ];
         parent::setup();
 
     }
@@ -35,7 +35,7 @@
 
         Es::shouldReceive('search')
                 ->once()
-                ->with(self::ES_QUERY)
+                ->with($this->ES_QUERY)
                 ->andReturn(json_decode('{
   "took" : 116,
   "timed_out" : false,
@@ -80,7 +80,7 @@
     public function testIndexQuery() {
         Es::shouldReceive('search')
                 ->once()
-                ->with(self::ES_QUERY)
+                ->with($this->ES_QUERY)
                 ->andReturn(json_decode('{
   "took" : 116,
   "timed_out" : false,