diff --git a/src/Client.php b/src/Client.php
index 388fb53..350fbc8 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -4,15 +4,16 @@
 
 use GuzzleHttp\Client as HttpClient;
 
-class Client {
-
+class Client
+{
     private $answersApiBaseURL;
     private $apiKey;
     private $endpoint;
     private $http;
     private $collector;
 
-    public function __construct($endpoint, $apiKey, $answersApiBaseURL = null) {
+    public function __construct($endpoint, $apiKey, $answersApiBaseURL = null)
+    {
         $this->apiKey = $apiKey;
         $this->endpoint = $endpoint;
         $this->answersApiBaseURL = $answersApiBaseURL;
@@ -20,9 +21,10 @@ public function __construct($endpoint, $apiKey, $answersApiBaseURL = null) {
         $this->http = new HttpClient();
     }
 
-    public function search(Query $query) {
+    public function search(Query $query)
+    {
         $endpoint = "{$this->endpoint}/search?api-key={$this->apiKey}";
-        
+
         $response = $this->http->request('POST', $endpoint, [
             'form_params' => [
                 'q' => $query->toJson()
diff --git a/src/Endpoints.php b/src/Endpoints.php
deleted file mode 100644
index 3fc5ced..0000000
--- a/src/Endpoints.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-namespace OramaCloud;
-
-class Endpoints
-{
-    const WEBHOOKS_BASE_URL = 'https://api.askorama.ai/api/v1/webhooks';
-
-    const DEPLOY = WEBHOOKS_BASE_URL . '/[indexID]/deploy';
-
-    const EMPTY = WEBHOOKS_BASE_URL . '/[indexID]/empty';
-
-    const HAS_DATA = WEBHOOKS_BASE_URL . '/[indexID]/has-data';
-
-    const NOTIFY = WEBHOOKS_BASE_URL . '/[indexID]/notify';
-
-    const SNAPSHOT = WEBHOOKS_BASE_URL . '/[indexID]/snapshot';    
-}
\ No newline at end of file
diff --git a/src/Manager/Endpoints.php b/src/Manager/Endpoints.php
new file mode 100644
index 0000000..651471f
--- /dev/null
+++ b/src/Manager/Endpoints.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace OramaCloud\Manager;
+
+class Endpoints
+{
+    const WEBHOOKS_BASE_URL = 'https://api.askorama.ai/api/v1/webhooks';
+
+    const DEPLOY = self::WEBHOOKS_BASE_URL . '/[indexID]/deploy';
+
+    const EMPTY = self::WEBHOOKS_BASE_URL . '/[indexID]/empty';
+
+    const HAS_DATA = self::WEBHOOKS_BASE_URL . '/[indexID]/has-data';
+
+    const NOTIFY = self::WEBHOOKS_BASE_URL . '/[indexID]/notify';
+
+    const SNAPSHOT = self::WEBHOOKS_BASE_URL . '/[indexID]/snapshot';
+}
diff --git a/tests/Feature/ClientTest.php b/tests/Feature/ClientTest.php
index f8ae005..837bc6f 100644
--- a/tests/Feature/ClientTest.php
+++ b/tests/Feature/ClientTest.php
@@ -8,17 +8,18 @@
 
 test('basic fulltext search', function () {
     $client = new Client(API_ENDPOINT, PUBLIC_API_KEY);
-    
+
     $result = $client->search(
         (new Query())
             ->term('red shoes')
             ->mode('fulltext')
             ->limit(10)
     );
-    
+
     $this->assertArrayHasKey('hits', $result);
     $this->assertArrayHasKey('elapsed', $result);
     $this->assertArrayHasKey('count', $result);
-    
+
     $this->assertTrue($result['count'] > 0);
+    $this->assertTrue(sizeof($result['hits']) <= 10);
 });