diff --git a/routes/api.php b/routes/api.php
index 2abec02b6..1d93040ff 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,11 +1,17 @@
 <?php
 
+use Binaryk\LaravelRestify\Http\Controllers\GlobalSearchController;
 use Binaryk\LaravelRestify\Http\Controllers\RepositoryDestroyController;
 use Binaryk\LaravelRestify\Http\Controllers\RepositoryIndexController;
 use Binaryk\LaravelRestify\Http\Controllers\RepositoryShowController;
 use Binaryk\LaravelRestify\Http\Controllers\RepositoryStoreController;
 use Binaryk\LaravelRestify\Http\Controllers\RepositoryUpdateController;
+use Illuminate\Support\Facades\Route;
 
+// Global Search...
+Route::get('/search', '\\'.GlobalSearchController::class);
+
+// API CRUD
 Route::get('/{repository}', '\\'.RepositoryIndexController::class);
 Route::post('/{repository}', '\\'.RepositoryStoreController::class);
 Route::get('/{repository}/{repositoryId}', '\\'.RepositoryShowController::class);
diff --git a/src/Fields/Field.php b/src/Fields/Field.php
index 6564b619b..a5f143c79 100644
--- a/src/Fields/Field.php
+++ b/src/Fields/Field.php
@@ -435,7 +435,7 @@ protected function resolveDefaultValue(RestifyRequest $request)
      * @param callable $resolveCallback
      * @return $this
      */
-    public function resolveUsing(callable $resolveCallback)
+    public function resolveCallback(callable $resolveCallback)
     {
         $this->resolveCallback = $resolveCallback;
 
diff --git a/src/Http/Controllers/GlobalSearchController.php b/src/Http/Controllers/GlobalSearchController.php
new file mode 100644
index 000000000..b1591bdae
--- /dev/null
+++ b/src/Http/Controllers/GlobalSearchController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Binaryk\LaravelRestify\Http\Controllers;
+
+use Binaryk\LaravelRestify\Http\Requests\GlobalSearchRequest;
+use Binaryk\LaravelRestify\Restify;
+use Binaryk\LaravelRestify\Services\Search\GlobalSearch;
+
+class GlobalSearchController extends RepositoryController
+{
+    public function __invoke(GlobalSearchRequest $request)
+    {
+        $results = (new GlobalSearch(
+            $request, Restify::globallySearchableRepositories($request)
+        ))->get();
+
+        return $this->response()->data($results);
+    }
+}
diff --git a/src/Http/Requests/GlobalSearchRequest.php b/src/Http/Requests/GlobalSearchRequest.php
new file mode 100644
index 000000000..d35e9769a
--- /dev/null
+++ b/src/Http/Requests/GlobalSearchRequest.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Binaryk\LaravelRestify\Http\Requests;
+
+class GlobalSearchRequest extends RestifyRequest
+{
+}
diff --git a/src/Repositories/Repository.php b/src/Repositories/Repository.php
index a5c2f8bd0..e0ede5084 100644
--- a/src/Repositories/Repository.php
+++ b/src/Repositories/Repository.php
@@ -76,6 +76,27 @@ abstract class Repository implements RestifySearchable, JsonSerializable
      */
     public static $sort;
 
+    /**
+     * Attribute that should be used for displaying single model.
+     *
+     * @var string
+     */
+    public static $title = 'id';
+
+    /**
+     * Indicates if the repository should be globally searchable.
+     *
+     * @var bool
+     */
+    public static $globallySearchable = true;
+
+    /**
+     * The number of results to display in the global search.
+     *
+     * @var int
+     */
+    public static $globalSearchResults = 5;
+
     /**
      * Get the underlying model instance for the resource.
      *
@@ -106,6 +127,42 @@ public static function uriKey()
         return Str::plural($kebabWithoutRepository);
     }
 
+    /**
+     * Get the label for the resource.
+     *
+     * @return string
+     */
+    public static function label()
+    {
+        if (property_exists(static::class, 'label') && is_string(static::$label)) {
+            return static::$label;
+        }
+
+        $title = Str::title(Str::replaceLast('Repository', '', class_basename(get_called_class())));
+
+        return Str::plural($title);
+    }
+
+    /**
+     * Get the value that should be displayed to represent the repository.
+     *
+     * @return string
+     */
+    public function title()
+    {
+        return $this->{static::$title};
+    }
+
+    /**
+     * Get the search result subtitle for the repository.
+     *
+     * @return string|null
+     */
+    public function subtitle()
+    {
+        //
+    }
+
     /**
      * Get a fresh instance of the model represented by the resource.
      *
@@ -435,10 +492,8 @@ public function index(RestifyRequest $request)
          * Apply all of the query: search, match, sort, related.
          * @var AbstractPaginator $paginator
          */
-        $paginator = RepositorySearchService::instance()->search($request, $this)->tap(function ($query) use ($request) {
-            // Call the local definition of the query
-            static::indexQuery($request, $query);
-        })->paginate($request->perPage ?? (static::$defaultPerPage ?? RestifySearchable::DEFAULT_PER_PAGE));
+        $paginator = RepositorySearchService::instance()->search($request, $this)
+            ->paginate($request->perPage ?? (static::$defaultPerPage ?? RestifySearchable::DEFAULT_PER_PAGE));
 
         $items = $paginator->getCollection()->map(function ($value) {
             return static::resolveWith($value);
diff --git a/src/Restify.php b/src/Restify.php
index d603f5c52..b1f089609 100644
--- a/src/Restify.php
+++ b/src/Restify.php
@@ -4,6 +4,7 @@
 
 use Binaryk\LaravelRestify\Events\RestifyBeforeEach;
 use Binaryk\LaravelRestify\Events\RestifyStarting;
+use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
 use Binaryk\LaravelRestify\Traits\AuthorizesRequests;
 use Illuminate\Database\Eloquent\Model;
@@ -15,6 +16,7 @@
 class Restify
 {
     use AuthorizesRequests;
+
     /**
      * The registered repository names.
      *
@@ -39,7 +41,7 @@ class Restify
     /**
      * Get the repository class name for a given key.
      *
-     * @param  string  $key
+     * @param string $key
      * @return string
      */
     public static function repositoryForKey($key)
@@ -52,7 +54,7 @@ public static function repositoryForKey($key)
     /**
      * Get the repository class name for a given key.
      *
-     * @param  string  $model
+     * @param string $model
      * @return string
      */
     public static function repositoryForModel($model)
@@ -69,7 +71,7 @@ public static function repositoryForModel($model)
     /**
      * Register the given repositories.
      *
-     * @param  array  $repositories
+     * @param array $repositories
      * @return static
      */
     public static function repositories(array $repositories)
@@ -84,7 +86,7 @@ public static function repositories(array $repositories)
     /**
      * Register all of the repository classes in the given directory.
      *
-     * @param  string  $directory
+     * @param string $directory
      * @return void
      * @throws \ReflectionException
      */
@@ -114,7 +116,7 @@ public static function repositoriesFrom($directory)
     /**
      * Get the URI path prefix utilized by Restify.
      *
-     * @param  null  $plus
+     * @param null $plus
      * @return string
      */
     public static function path($plus = null)
@@ -131,7 +133,7 @@ public static function path($plus = null)
      *
      * This listener is added in the RestifyApplicationServiceProvider
      *
-     * @param  \Closure|string  $callback
+     * @param \Closure|string $callback
      * @return void
      */
     public static function starting($callback)
@@ -140,7 +142,7 @@ public static function starting($callback)
     }
 
     /**
-     * @param  \Closure|string  $callback
+     * @param \Closure|string $callback
      */
     public static function beforeEach($callback)
     {
@@ -150,10 +152,26 @@ public static function beforeEach($callback)
     /**
      * Set the callback used for intercepting any request exception.
      *
-     * @param  \Closure|string  $callback
+     * @param \Closure|string $callback
      */
     public static function exceptionHandler($callback)
     {
         static::$renderCallback = $callback;
     }
+
+    public static function globallySearchableRepositories(RestifyRequest $request)
+    {
+        return collect(static::$repositories)
+            ->filter(fn ($repository) => $repository::authorizedToUseRepository($request))
+            ->filter(fn ($repository) => $repository::$globallySearchable)
+            ->sortBy(static::sortResourcesWith())
+            ->all();
+    }
+
+    public static function sortResourcesWith()
+    {
+        return function ($resource) {
+            return $resource::label();
+        };
+    }
 }
diff --git a/src/Services/Search/GlobalSearch.php b/src/Services/Search/GlobalSearch.php
new file mode 100644
index 000000000..182e0312c
--- /dev/null
+++ b/src/Services/Search/GlobalSearch.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Binaryk\LaravelRestify\Services\Search;
+
+use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
+use Illuminate\Support\Collection;
+
+class GlobalSearch
+{
+    /**
+     * The request instance.
+     *
+     * @var RestifyRequest
+     */
+    public $request;
+
+    /**
+     * The repository class names that should be searched.
+     *
+     * @var Collection
+     */
+    public $repositories;
+
+    /**
+     * Create a new global search instance.
+     *
+     * @param RestifyRequest $request
+     * @param \Illuminate\Support\Collection repositories
+     * @return void
+     */
+    public function __construct(RestifyRequest $request, $repositories)
+    {
+        $this->request = $request;
+        $this->repositories = $repositories;
+    }
+
+    /**
+     * Get the matching repositories.
+     *
+     * @return array
+     */
+    public function get()
+    {
+        $formatted = [];
+
+        foreach ($this->getSearchResults() as $repository => $models) {
+            foreach ($models as $model) {
+                $instance = $repository::resolveWith($model);
+
+                $formatted[] = [
+                    'repositoryName' => $repository::uriKey(),
+                    'repositoryTitle' => $repository::label(),
+                    'title' => $instance->title(),
+                    'subTitle' => $instance->subtitle(),
+                    'repositoryId' => $model->getKey(),
+                ];
+            }
+        }
+
+        return $formatted;
+    }
+
+    /**
+     * Get the search results for the repositories.
+     *
+     * @return array
+     */
+    protected function getSearchResults()
+    {
+        $results = [];
+
+        foreach ($this->repositories as $repository) {
+            $query = RepositorySearchService::instance()->search($this->request, $repository::resolveWith($repository::newModel()));
+
+            if (count($models = $query->limit($repository::$globalSearchResults)->get()) > 0) {
+                $results[$repository] = $models;
+            }
+        }
+
+        return collect($results)->sortKeys()->all();
+    }
+}
diff --git a/src/Services/Search/RepositorySearchService.php b/src/Services/Search/RepositorySearchService.php
index b69deb0ff..1cbf6dbf1 100644
--- a/src/Services/Search/RepositorySearchService.php
+++ b/src/Services/Search/RepositorySearchService.php
@@ -17,7 +17,7 @@ public function search(RestifyRequest $request, Repository $repository)
 
         $query = $this->prepareMatchFields($request, $this->prepareSearchFields($request, $repository::query(), $this->fixedInput), $this->fixedInput);
 
-        return $this->prepareRelations($request, $this->prepareOrders($request, $query), $this->fixedInput);
+        return tap($this->prepareRelations($request, $this->prepareOrders($request, $query), $this->fixedInput), $this->applyIndexQuery($request, $repository));
     }
 
     public function prepareMatchFields(RestifyRequest $request, $query, $extra = [])
@@ -113,7 +113,7 @@ public function prepareSearchFields(RestifyRequest $request, $query, $extra = []
             $canSearchPrimaryKey = is_numeric($search) &&
                 in_array($query->getModel()->getKeyType(), ['int', 'integer']) &&
                 ($connectionType != 'pgsql' || $search <= PHP_INT_MAX) &&
-                in_array($query->getModel()->getKeyName(), $model::getSearchableFields());
+                in_array($query->getModel()->getKeyName(), $this->repository->getSearchableFields());
 
             if ($canSearchPrimaryKey) {
                 $query->orWhere($query->getModel()->getQualifiedKeyName(), $search);
@@ -170,4 +170,9 @@ public function setOrder($query, $param)
 
         return $query;
     }
+
+    protected function applyIndexQuery(RestifyRequest $request, Repository $repository)
+    {
+        return fn ($query) => $repository::indexQuery($request, $query);
+    }
 }
diff --git a/tests/Controllers/GlobalSearchControllerTest.php b/tests/Controllers/GlobalSearchControllerTest.php
new file mode 100644
index 000000000..a64be8eb3
--- /dev/null
+++ b/tests/Controllers/GlobalSearchControllerTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Binaryk\LaravelRestify\Tests\Controllers;
+
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\Post;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostPolicy;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Gate;
+
+class GlobalSearchControllerTest extends IntegrationTest
+{
+    use RefreshDatabase;
+
+    public function test_global_search_returns_matches()
+    {
+        factory(Post::class)->create(['title' => 'First post']);
+        factory(Post::class)->create(['title' => 'Second post']);
+        factory(User::class)->create(['name' => 'First user']);
+        factory(User::class)->create(['name' => 'Second user']);
+
+        $response = $this
+            ->withoutExceptionHandling()
+            ->getJson('/restify-api/search?search=Second');
+
+        $this->assertCount(2, $response->json('data'));
+        $this->assertEquals('users', $response->json('data.1.repositoryName'));
+        $this->assertEquals('Second post', $response->json('data.0.title'));
+    }
+
+    public function test_global_search_filter_out_unauthorized_repositories()
+    {
+        Gate::policy(Post::class, PostPolicy::class);
+
+        $_SERVER['restify.post.allowRestify'] = false;
+
+        factory(Post::class)->create();
+        factory(User::class)->create();
+
+        $response = $this
+            ->withoutExceptionHandling()
+            ->getJson('/restify-api/search?search=1');
+
+        $this->assertCount(1, $response->json('data'));
+
+        $_SERVER['restify.post.allowRestify'] = null;
+    }
+
+    public function test_global_search_filter_will_filter_with_index_query()
+    {
+        $_SERVER['restify.post.indexQueryCallback'] = function ($query) {
+            $query->where('id', 2);
+        };
+
+        factory(Post::class)->create(['title' => 'First post']);
+        factory(User::class)->create(['name' => 'First user']);
+
+        $response = $this
+            ->withoutExceptionHandling()
+            ->getJson('/restify-api/search?search=1');
+
+        $this->assertCount(1, $response->json('data'));
+
+        $_SERVER['restify.post.indexQueryCallback'] = null;
+    }
+}
diff --git a/tests/Controllers/IndexControllerTest.php b/tests/Controllers/IndexControllerTest.php
deleted file mode 100644
index 1bd3835f9..000000000
--- a/tests/Controllers/IndexControllerTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Controllers;
-
-use Binaryk\LaravelRestify\Controllers\RestController;
-use Binaryk\LaravelRestify\Tests\Fixtures\User;
-use Binaryk\LaravelRestify\Tests\IntegrationTest;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class IndexControllerTest extends IntegrationTest
-{
-    public function test_list_repository()
-    {
-        factory(User::class)->create();
-        factory(User::class)->create();
-        factory(User::class)->create();
-
-        $response = $this->withExceptionHandling()
-            ->getJson('/restify-api/users');
-
-        $response->assertJsonCount(3, 'data');
-    }
-
-    public function test_the_rest_controller_can_paginate()
-    {
-        $this->mockUsers(20);
-
-        $class = (new class extends RestController {
-            public function users()
-            {
-                return $this->response($this->search(User::class));
-            }
-        });
-
-        $response = $class->search(User::class, [
-            'match' => [
-                'id' => 1,
-            ],
-        ]);
-        $this->assertIsArray($class->search(User::class));
-        $this->assertCount(1, $response['data']);
-        $this->assertEquals(count($class->users()->getData()->data), User::$defaultPerPage);
-    }
-}
diff --git a/tests/Controllers/RepositoryDestroyControllerTest.php b/tests/Controllers/RepositoryDestroyControllerTest.php
index f229dab53..aa74711d7 100644
--- a/tests/Controllers/RepositoryDestroyControllerTest.php
+++ b/tests/Controllers/RepositoryDestroyControllerTest.php
@@ -3,8 +3,8 @@
 namespace Binaryk\LaravelRestify\Tests\Controllers;
 
 use Binaryk\LaravelRestify\Exceptions\RestifyHandler;
-use Binaryk\LaravelRestify\Tests\Fixtures\Post;
-use Binaryk\LaravelRestify\Tests\Fixtures\PostPolicy;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\Post;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostPolicy;
 use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Support\Facades\Gate;
diff --git a/tests/Controllers/RepositoryIndexControllerTest.php b/tests/Controllers/RepositoryIndexControllerTest.php
index 95839f70c..442dec760 100644
--- a/tests/Controllers/RepositoryIndexControllerTest.php
+++ b/tests/Controllers/RepositoryIndexControllerTest.php
@@ -3,13 +3,8 @@
 namespace Binaryk\LaravelRestify\Tests\Controllers;
 
 use Binaryk\LaravelRestify\Contracts\RestifySearchable;
-use Binaryk\LaravelRestify\Fields\Field;
-use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
-use Binaryk\LaravelRestify\Repositories\Mergeable;
-use Binaryk\LaravelRestify\Repositories\Repository;
-use Binaryk\LaravelRestify\Restify;
-use Binaryk\LaravelRestify\Tests\Fixtures\Apple;
-use Binaryk\LaravelRestify\Tests\Fixtures\AppleRepository;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\Post;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostRepository;
 use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
@@ -19,62 +14,60 @@ class RepositoryIndexControllerTest extends IntegrationTest
 
     public function test_repository_per_page()
     {
-        factory(Apple::class, 20)->create();
+        factory(Post::class, 20)->create();
 
-        AppleRepository::$defaultPerPage = 5;
+        PostRepository::$defaultPerPage = 5;
 
-        $response = $this->getJson('restify-api/apples')
-            ->assertStatus(200);
+        $response = $this->getJson('restify-api/posts');
 
         $this->assertCount(5, $response->json('data'));
 
-        $response = $this->getJson('restify-api/apples?perPage=10');
+        $response = $this->getJson('restify-api/posts?perPage=10');
 
         $this->assertCount(10, $response->json('data'));
     }
 
     public function test_repository_search_query_works()
     {
-        factory(Apple::class)->create([
-            'title' => 'Some title',
+        factory(Post::class)->create([
+            'title' => 'Title with code word',
         ]);
 
-        factory(Apple::class)->create([
-            'title' => 'Another one',
+        factory(Post::class)->create([
+            'title' => 'Another title with code inner',
         ]);
 
-        factory(Apple::class)->create([
-            'title' => 'foo another',
+        factory(Post::class)->create([
+            'title' => 'A title with no key word',
         ]);
 
-        factory(Apple::class)->create([
-            'title' => 'Third apple',
+        factory(Post::class)->create([
+            'title' => 'Lorem ipsum dolor',
         ]);
 
-        AppleRepository::$search = ['title'];
+        PostRepository::$search = ['title'];
 
-        $response = $this->getJson('restify-api/apples?search=another')
-            ->assertStatus(200);
+        $response = $this->getJson('restify-api/posts?search=code');
 
         $this->assertCount(2, $response->json('data'));
     }
 
     public function test_repository_filter_works()
     {
-        AppleRepository::$match = [
+        PostRepository::$match = [
             'title' => RestifySearchable::MATCH_TEXT,
         ];
 
-        factory(Apple::class)->create([
+        factory(Post::class)->create([
             'title' => 'Some title',
         ]);
 
-        factory(Apple::class)->create([
+        factory(Post::class)->create([
             'title' => 'Another one',
         ]);
 
         $response = $this
-            ->getJson('restify-api/apples?title=Another one')
+            ->getJson('restify-api/posts?title=Another one')
             ->assertStatus(200);
 
         $this->assertCount(1, $response->json('data'));
@@ -82,38 +75,38 @@ public function test_repository_filter_works()
 
     public function test_repository_order()
     {
-        AppleRepository::$sort = [
+        PostRepository::$sort = [
             'title',
         ];
 
-        factory(Apple::class)->create(['title' => 'aaa']);
+        factory(Post::class)->create(['title' => 'aaa']);
 
-        factory(Apple::class)->create(['title' => 'zzz']);
+        factory(Post::class)->create(['title' => 'zzz']);
 
         $response = $this
-            ->getJson('restify-api/apples?sort=-title')
+            ->getJson('restify-api/posts?sort=-title')
             ->assertStatus(200);
 
         $this->assertEquals('zzz', $response->json('data.0.attributes.title'));
         $this->assertEquals('aaa', $response->json('data.1.attributes.title'));
 
         $response = $this
-            ->getJson('restify-api/apples?order=-title')
+            ->getJson('restify-api/posts?order=-title')
             ->assertStatus(200);
 
         $this->assertEquals('zzz', $response->json('data.1.attributes.title'));
         $this->assertEquals('aaa', $response->json('data.0.attributes.title'));
     }
 
-    public function test_repsitory_with_relations()
+    public function test_repository_with_relations()
     {
-        AppleRepository::$related = ['user'];
+        PostRepository::$related = ['user'];
 
         $user = $this->mockUsers(1)->first();
 
-        factory(Apple::class)->create(['user_id' => $user->id]);
+        factory(Post::class)->create(['user_id' => $user->id]);
 
-        $response = $this->getJson('/restify-api/apples?related=user')
+        $response = $this->getJson('/restify-api/posts?related=user')
             ->assertStatus(200);
 
         $this->assertCount(1, $response->json('data.0.relationships.user'));
@@ -122,62 +115,37 @@ public function test_repsitory_with_relations()
 
     public function test_index_unmergeable_repository_containes_only_explicitly_defined_fields()
     {
-        Restify::repositories([
-            AppleTitleRepository::class,
-        ]);
-
-        factory(Apple::class)->create();
-
-        $response = $this->get('/restify-api/apples-title')
-            ->assertStatus(200);
-
-        $this->assertArrayHasKey('title', $response->json('data.0.attributes'));
-
-        $this->assertArrayNotHasKey('id', $response->json('data.0.attributes'));
-        $this->assertArrayNotHasKey('created_at', $response->json('data.0.attributes'));
+        factory(Post::class)->create();
+
+        $response = $this->get('/restify-api/posts')
+            ->assertStatus(200)
+            ->assertJsonStructure([
+                'data' => [[
+                    'attributes' => [
+                        'user_id',
+                        'title',
+                        'description',
+                    ],
+                ]],
+            ]);
+
+        $this->assertArrayNotHasKey('image', $response->json('data.0.attributes'));
     }
 
     public function test_index_mergeable_repository_containes_model_attributes_and_local_fields()
     {
-        Restify::repositories([
-            AppleMergeable::class,
-        ]);
-
-        factory(Apple::class)->create();
-
-        $response = $this->get('/restify-api/apples-title-mergeable')
-            ->assertStatus(200);
-
-        $this->assertArrayHasKey('title', $response->json('data.0.attributes'));
-        $this->assertArrayHasKey('id', $response->json('data.0.attributes'));
-        $this->assertArrayHasKey('created_at', $response->json('data.0.attributes'));
-    }
-}
-
-class AppleTitleRepository extends Repository
-{
-    public static $uriKey = 'apples-title';
-
-    public static $model = Apple::class;
-
-    public function fields(RestifyRequest $request)
-    {
-        return [
-            Field::make('title'),
-        ];
-    }
-}
-
-class AppleMergeable extends Repository implements Mergeable
-{
-    public static $uriKey = 'apples-title-mergeable';
-
-    public static $model = Apple::class;
-
-    public function fields(RestifyRequest $request)
-    {
-        return [
-            Field::make('title'),
-        ];
+        factory(Post::class)->create();
+
+        $this->get('/restify-api/posts-mergeable')
+            ->assertJsonStructure([
+                'data' => [[
+                    'attributes' => [
+                        'user_id',
+                        'title',
+                        'description',
+                        'image',
+                    ],
+                ]],
+            ]);
     }
 }
diff --git a/tests/Controllers/RepositoryShowControllerTest.php b/tests/Controllers/RepositoryShowControllerTest.php
index c6a27a044..84ad5b51a 100644
--- a/tests/Controllers/RepositoryShowControllerTest.php
+++ b/tests/Controllers/RepositoryShowControllerTest.php
@@ -2,13 +2,7 @@
 
 namespace Binaryk\LaravelRestify\Tests\Controllers;
 
-use Binaryk\LaravelRestify\Fields\Field;
-use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
-use Binaryk\LaravelRestify\Repositories\Mergeable;
-use Binaryk\LaravelRestify\Repositories\Repository;
-use Binaryk\LaravelRestify\Restify;
-use Binaryk\LaravelRestify\Tests\Fixtures\Apple;
-use Binaryk\LaravelRestify\Tests\Fixtures\Post;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\Post;
 use Binaryk\LaravelRestify\Tests\IntegrationTest;
 
 /**
@@ -39,51 +33,44 @@ public function test_basic_show()
 
     public function test_show_will_authorize_fields()
     {
-        factory(Apple::class)->create();
+        factory(Post::class)->create();
 
-        Restify::repositories([
-            AppleAuthorized::class,
-        ]);
-
-        $_SERVER['can.see.title'] = false;
-        $response = $this->getJson('/restify-api/apple-authorized/1');
+        $_SERVER['postAuthorize.can.see.title'] = false;
+        $response = $this->getJson('/restify-api/post-authorizes/1');
 
         $this->assertArrayNotHasKey('title', $response->json('data.attributes'));
 
-        $_SERVER['can.see.title'] = true;
-        $response = $this->getJson('/restify-api/apple-authorized/1');
+        $_SERVER['postAuthorize.can.see.title'] = true;
+        $response = $this->getJson('/restify-api/post-authorizes/1');
 
         $this->assertArrayHasKey('title', $response->json('data.attributes'));
     }
 
     public function test_show_will_take_into_consideration_show_callback()
     {
-        factory(Apple::class)->create([
-            'title' => 'Eduard',
-        ]);
+        $_SERVER['postAuthorize.can.see.title'] = true;
 
-        Restify::repositories([
-            AppleAuthorized::class,
-        ]);
+        factory(Post::class)->create(['title' => 'Eduard']);
 
-        $response = $this->getJson('/restify-api/apple-authorized/1');
+        $response = $this->getJson('/restify-api/post-authorizes/1');
 
         $this->assertSame('EDUARD', $response->json('data.attributes.title'));
     }
 
     public function test_show_unmergeable_repository_containes_only_explicitly_defined_fields()
     {
-        factory(Apple::class)->create([
-            'title' => 'Eduard',
-        ]);
-
-        Restify::repositories([
-            AppleAuthorized::class,
-        ]);
+        factory(Post::class)->create(['title' => 'Eduard']);
 
-        $response = $this->getJson('/restify-api/apple-authorized/1');
-
-        $this->assertArrayHasKey('title', $response->json('data.attributes'));
+        $response = $this->getJson('/restify-api/posts/1')
+            ->assertJsonStructure([
+                'data' => [
+                    'attributes' => [
+                        'user_id',
+                        'title',
+                        'description',
+                    ],
+                ],
+            ]);
 
         $this->assertArrayNotHasKey('id', $response->json('data.attributes'));
         $this->assertArrayNotHasKey('created_at', $response->json('data.attributes'));
@@ -91,38 +78,21 @@ public function test_show_unmergeable_repository_containes_only_explicitly_defin
 
     public function test_show_mergeable_repository_containes_model_attributes_and_local_fields()
     {
-        factory(Apple::class)->create([
-            'title' => 'Eduard',
-        ]);
-
-        Restify::repositories([
-            AppleAuthorizedMergeable::class,
-        ]);
-
-        $response = $this->getJson('/restify-api/apple-authorized-mergeable/1');
+        factory(Post::class)->create(['title' => 'Eduard']);
 
-        $this->assertArrayHasKey('title', $response->json('data.attributes'));
-        $this->assertArrayHasKey('id', $response->json('data.attributes'));
-        $this->assertArrayHasKey('created_at', $response->json('data.attributes'));
-    }
-}
-
-class AppleAuthorized extends Repository
-{
-    public static $uriKey = 'apple-authorized';
-
-    public static $model = Apple::class;
-
-    public function fields(RestifyRequest $request)
-    {
-        return [
-            Field::make('title')->canSee(fn () => $_SERVER['can.see.title'] ?? true)
-            ->showCallback(fn ($value) => strtoupper($value)),
-        ];
+        $this->getJson('/restify-api/posts-mergeable/1')
+            ->assertJsonStructure([
+                'data' => [
+                    'attributes' => [
+                        'id',
+                        'user_id',
+                        'title',
+                        'image',
+                        'description',
+                        'created_at',
+                        'updated_at',
+                    ],
+                ],
+            ]);
     }
 }
-
-class AppleAuthorizedMergeable extends AppleAuthorized implements Mergeable
-{
-    public static $uriKey = 'apple-authorized-mergeable';
-}
diff --git a/tests/Controllers/RepositoryStoreControllerTest.php b/tests/Controllers/RepositoryStoreControllerTest.php
index 685c97757..d84d270bd 100644
--- a/tests/Controllers/RepositoryStoreControllerTest.php
+++ b/tests/Controllers/RepositoryStoreControllerTest.php
@@ -2,8 +2,8 @@
 
 namespace Binaryk\LaravelRestify\Tests\Controllers;
 
-use Binaryk\LaravelRestify\Tests\Fixtures\Post;
-use Binaryk\LaravelRestify\Tests\Fixtures\PostPolicy;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\Post;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostPolicy;
 use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Support\Facades\Gate;
 
@@ -100,7 +100,6 @@ public function test_will_not_store_unauthorized_fields()
             'title' => 'Some post title',
             'description' => 'A very short description',
         ])
-            ->dump()
             ->assertStatus(201);
 
         $_SERVER['posts.description.authorized'] = false;
@@ -118,7 +117,6 @@ public function test_will_not_store_readonly_fields()
             'title' => 'Some post title',
             'description' => 'A very short description',
         ])
-            ->dump()
             ->assertStatus(201);
 
         $this->assertNull($r->json('data.attributes.image'));
diff --git a/tests/Controllers/RepositoryUpdateControllerTest.php b/tests/Controllers/RepositoryUpdateControllerTest.php
index 64b68bee1..af2db9316 100644
--- a/tests/Controllers/RepositoryUpdateControllerTest.php
+++ b/tests/Controllers/RepositoryUpdateControllerTest.php
@@ -3,14 +3,8 @@
 namespace Binaryk\LaravelRestify\Tests\Controllers;
 
 use Binaryk\LaravelRestify\Exceptions\RestifyHandler;
-use Binaryk\LaravelRestify\Fields\Field;
-use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
-use Binaryk\LaravelRestify\Repositories\Mergeable;
-use Binaryk\LaravelRestify\Repositories\Repository;
-use Binaryk\LaravelRestify\Restify;
-use Binaryk\LaravelRestify\Tests\Fixtures\Apple;
-use Binaryk\LaravelRestify\Tests\Fixtures\Post;
-use Binaryk\LaravelRestify\Tests\Fixtures\PostPolicy;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\Post;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostPolicy;
 use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Support\Facades\Gate;
@@ -75,13 +69,11 @@ public function test_unathorized_to_update()
 
     public function test_do_not_update_fields_without_permission()
     {
-        Restify::repositories([AppleUnauthorizedField::class]);
+        $post = factory(Post::class)->create(['user_id' => 1, 'title' => 'Title']);
 
-        $post = factory(Apple::class)->create(['user_id' => 1, 'title' => 'Title']);
+        $_SERVER['posts.authorizable.title'] = false;
 
-        $_SERVER['restify.apple.updateable'] = false;
-
-        $response = $this->putJson('/restify-api/apple-unauthorized-put/'.$post->id, [
+        $response = $this->putJson('/restify-api/post-with-unathorized-fields/'.$post->id, [
             'title' => 'Updated title',
             'user_id' => 2,
         ])->assertStatus(200);
@@ -92,23 +84,16 @@ public function test_do_not_update_fields_without_permission()
 
     public function test_update_fillable_fields_for_mergeable_repository()
     {
-        Restify::repositories([
-            AppleUpdateMergeable::class,
-        ]);
-
-        $apple = factory(Apple::class)->create(['user_id' => 1, 'title' => 'Title', 'color' => 'red']);
+        $post = factory(Post::class)->create(['user_id' => 1, 'title' => 'Title', 'image' => 'red.png']);
 
-        $response = $this->putJson('/restify-api/apple-update-extra/'.$apple->id, [
+        $response = $this->putJson('/restify-api/posts-mergeable/'.$post->id, [
             'title' => 'Updated title',
-            'color' => 'blue',
-            'user_id' => 2,
+            'image' => 'image.png', // via mergeable
         ])
-            ->dump()
             ->assertStatus(200);
 
-        $this->assertEquals('Updated title', $response->json('data.attributes.title')); // via extra
-        $this->assertEquals('blue', $response->json('data.attributes.color')); // via extra
-        $this->assertEquals(2, $response->json('data.attributes.user_id')); // via field
+        $this->assertEquals('Updated title', $response->json('data.attributes.title'));
+        $this->assertEquals('image.png', $response->json('data.attributes.image')); // via extra
     }
 
     public function test_will_not_update_readonly_fields()
@@ -123,41 +108,8 @@ public function test_will_not_update_readonly_fields()
             'title' => 'Some post title',
             'description' => 'A very short description',
         ])
-            ->dump()
             ->assertStatus(200);
 
         $this->assertNull($r->json('data.attributes.image'));
     }
 }
-
-class AppleUnauthorizedField extends Repository
-{
-    public static $uriKey = 'apple-unauthorized-put';
-
-    public static $model = Apple::class;
-
-    public function fields(RestifyRequest $request)
-    {
-        return [
-            Field::make('title')->canUpdate(fn ($value) => $_SERVER['restify.apple.updateable']),
-
-            Field::make('user_id')->canUpdate(fn ($value) => true),
-        ];
-    }
-}
-
-class AppleUpdateMergeable extends Repository implements Mergeable
-{
-    public static $uriKey = 'apple-update-extra';
-
-    public static $model = Apple::class;
-
-    public function fields(RestifyRequest $request)
-    {
-        return [
-            Field::make('title')->canUpdate(fn ($value) => true),
-
-            Field::make('user_id')->canUpdate(fn ($value) => true),
-        ];
-    }
-}
diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php
deleted file mode 100644
index 7f920570f..000000000
--- a/tests/ExampleTest.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests;
-
-use PHPUnit\Framework\TestCase;
-
-class ExampleTest extends TestCase
-{
-    /** @test */
-    public function true_is_true()
-    {
-        $this->assertTrue(true);
-    }
-}
diff --git a/tests/Factories/AppleFactory.php b/tests/Factories/AppleFactory.php
deleted file mode 100644
index 8a0683d02..000000000
--- a/tests/Factories/AppleFactory.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-use Binaryk\LaravelRestify\Tests\Fixtures\Apple;
-use Faker\Generator as Faker;
-
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| This directory should contain each of the model factory definitions for
-| your application. Factories provide a convenient way to generate new
-| model instances for testing / seeding your application's database.
-|
-*/
-
-$factory->define(Apple::class, function (Faker $faker) {
-    return [
-        'title' => $faker->text(50),
-    ];
-});
diff --git a/tests/Factories/BookFactory.php b/tests/Factories/BookFactory.php
deleted file mode 100644
index 9835c02c2..000000000
--- a/tests/Factories/BookFactory.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-use Faker\Generator as Faker;
-
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| This directory should contain each of the model factory definitions for
-| your application. Factories provide a convenient way to generate new
-| model instances for testing / seeding your application's database.
-|
-*/
-
-$factory->define(Binaryk\LaravelRestify\Tests\Fixtures\Book::class, function (Faker $faker) {
-    return [
-        'title' => $faker->text(30),
-        'description' => $faker->text,
-        'author' => $faker->name,
-        'price' => $faker->randomFloat(),
-        'stock' => $faker->numberBetween(0, 100),
-    ];
-});
diff --git a/tests/Factories/PostFactory.php b/tests/Factories/PostFactory.php
index 61fd7cebf..c9e4d745b 100644
--- a/tests/Factories/PostFactory.php
+++ b/tests/Factories/PostFactory.php
@@ -1,5 +1,6 @@
 <?php
 
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\Post;
 use Faker\Generator as Faker;
 
 /*
@@ -13,7 +14,7 @@
 |
 */
 
-$factory->define(Binaryk\LaravelRestify\Tests\Fixtures\Post::class, function (Faker $faker) {
+$factory->define(Post::class, function (Faker $faker) {
     return [
         'user_id' => 1,
         'image' => $faker->imageUrl(),
diff --git a/tests/Factories/UserFactory.php b/tests/Factories/UserFactory.php
index d1f70b1d4..701a30777 100644
--- a/tests/Factories/UserFactory.php
+++ b/tests/Factories/UserFactory.php
@@ -1,5 +1,6 @@
 <?php
 
+use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
 use Faker\Generator as Faker;
 use Illuminate\Support\Str;
 
@@ -14,7 +15,7 @@
 |
 */
 
-$factory->define(Binaryk\LaravelRestify\Tests\Fixtures\User::class, function (Faker $faker) {
+$factory->define(User::class, function (Faker $faker) {
     return [
         'name' => $faker->name,
         'email' => $faker->unique()->safeEmail,
diff --git a/tests/AuthServiceForgotPasswordTest.php b/tests/Feature/Authentication/AuthServiceForgotPasswordTest.php
similarity index 96%
rename from tests/AuthServiceForgotPasswordTest.php
rename to tests/Feature/Authentication/AuthServiceForgotPasswordTest.php
index 26281602b..763ea23f3 100644
--- a/tests/AuthServiceForgotPasswordTest.php
+++ b/tests/Feature/Authentication/AuthServiceForgotPasswordTest.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
 
 use Binaryk\LaravelRestify\Events\UserLoggedIn;
 use Binaryk\LaravelRestify\Exceptions\Eloquent\EntityNotFoundException;
 use Binaryk\LaravelRestify\Exceptions\PasswordResetInvalidTokenException;
 use Binaryk\LaravelRestify\Services\AuthService;
 use Binaryk\LaravelRestify\Tests\Fixtures\MailTracking;
-use Binaryk\LaravelRestify\Tests\Fixtures\User;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Auth\Events\PasswordReset;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithContainer;
diff --git a/tests/AuthServiceLoginTest.php b/tests/Feature/Authentication/AuthServiceLoginTest.php
similarity index 95%
rename from tests/AuthServiceLoginTest.php
rename to tests/Feature/Authentication/AuthServiceLoginTest.php
index 820d94747..568247ed5 100644
--- a/tests/AuthServiceLoginTest.php
+++ b/tests/Feature/Authentication/AuthServiceLoginTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
 
 use Binaryk\LaravelRestify\Contracts\Passportable;
 use Binaryk\LaravelRestify\Events\UserLoggedIn;
@@ -11,7 +11,8 @@
 use Binaryk\LaravelRestify\Exceptions\PassportUserException;
 use Binaryk\LaravelRestify\Exceptions\UnverifiedUser;
 use Binaryk\LaravelRestify\Services\AuthService;
-use Binaryk\LaravelRestify\Tests\Fixtures\SimpleUser as User;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\SimpleUser as User;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Carbon\Carbon;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Contracts\Auth\PasswordBroker;
@@ -153,7 +154,7 @@ public function test_logout_success()
         Event::fake();
         $this->app['config']->set('restify.auth.provider', 'passport');
 
-        $user = (new class extends \Binaryk\LaravelRestify\Tests\Fixtures\User {
+        $user = (new class extends \ Binaryk\LaravelRestify\Tests\Fixtures\User\User {
             public function tokens()
             {
                 $builder = \Mockery::mock(Builder::class);
diff --git a/tests/AuthServiceRegisterTest.php b/tests/Feature/Authentication/AuthServiceRegisterTest.php
similarity index 93%
rename from tests/AuthServiceRegisterTest.php
rename to tests/Feature/Authentication/AuthServiceRegisterTest.php
index 1f00a55b4..c2e292843 100644
--- a/tests/AuthServiceRegisterTest.php
+++ b/tests/Feature/Authentication/AuthServiceRegisterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
 
 use Binaryk\LaravelRestify\Contracts\Passportable;
 use Binaryk\LaravelRestify\Exceptions\AuthenticatableUserException;
@@ -8,8 +8,9 @@
 use Binaryk\LaravelRestify\Http\Requests\RestifyRegisterRequest;
 use Binaryk\LaravelRestify\Models\LaravelRestifyModel;
 use Binaryk\LaravelRestify\Services\AuthService;
-use Binaryk\LaravelRestify\Tests\Fixtures\SimpleUser;
-use Binaryk\LaravelRestify\Tests\Fixtures\User;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\SimpleUser;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Events\Verified;
@@ -87,7 +88,7 @@ public function test_register_successfully()
         Event::assertDispatched(Registered::class, function ($e) use ($user) {
             $this->assertEquals($e->user->email, $user['email']);
 
-            return $e->user instanceof \Binaryk\LaravelRestify\Tests\Fixtures\User;
+            return $e->user instanceof \ Binaryk\LaravelRestify\Tests\Fixtures\User\User;
         });
 
         $lastUser = User::query()->get()->last();
@@ -145,7 +146,7 @@ public function test_verify_user_successfully()
         Event::assertDispatched(Verified::class, function ($e) use ($user) {
             $this->assertEquals($e->user->email, $user['email']);
 
-            return $e->user instanceof \Binaryk\LaravelRestify\Tests\Fixtures\User;
+            return $e->user instanceof \ Binaryk\LaravelRestify\Tests\Fixtures\User\User;
         });
     }
 
diff --git a/tests/ResetPasswordRequestTest.php b/tests/Feature/Authentication/ResetPasswordRequestTest.php
similarity index 86%
rename from tests/ResetPasswordRequestTest.php
rename to tests/Feature/Authentication/ResetPasswordRequestTest.php
index 7c428537c..38e08b3fc 100644
--- a/tests/ResetPasswordRequestTest.php
+++ b/tests/Feature/Authentication/ResetPasswordRequestTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
 
 use Binaryk\LaravelRestify\Http\Requests\ResetPasswordRequest;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 
 /**
  * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
diff --git a/tests/RestifyLoginRequestTest.php b/tests/Feature/Authentication/RestifyLoginRequestTest.php
similarity index 86%
rename from tests/RestifyLoginRequestTest.php
rename to tests/Feature/Authentication/RestifyLoginRequestTest.php
index 730db81d3..bae708760 100644
--- a/tests/RestifyLoginRequestTest.php
+++ b/tests/Feature/Authentication/RestifyLoginRequestTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
 
 use Binaryk\LaravelRestify\Http\Requests\RestifyLoginRequest;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 
 /**
  * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
diff --git a/tests/RestifyPasswordEmailRequestTest.php b/tests/Feature/Authentication/RestifyPasswordEmailRequestTest.php
similarity index 85%
rename from tests/RestifyPasswordEmailRequestTest.php
rename to tests/Feature/Authentication/RestifyPasswordEmailRequestTest.php
index 2cf416e84..c530e0ecc 100644
--- a/tests/RestifyPasswordEmailRequestTest.php
+++ b/tests/Feature/Authentication/RestifyPasswordEmailRequestTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
 
 use Binaryk\LaravelRestify\Http\Requests\RestifyPasswordEmailRequest;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 
 /**
  * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
diff --git a/tests/RestifyRegisterRequestTest.php b/tests/Feature/Authentication/RestifyRegisterRequestTest.php
similarity index 87%
rename from tests/RestifyRegisterRequestTest.php
rename to tests/Feature/Authentication/RestifyRegisterRequestTest.php
index 253c29cec..2d96e305e 100644
--- a/tests/RestifyRegisterRequestTest.php
+++ b/tests/Feature/Authentication/RestifyRegisterRequestTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Feature\Authentication;
 
 use Binaryk\LaravelRestify\Http\Requests\RestifyRegisterRequest;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 
 /**
  * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
diff --git a/tests/HandlerTest.php b/tests/Feature/REST/HandlerTest.php
similarity index 98%
rename from tests/HandlerTest.php
rename to tests/Feature/REST/HandlerTest.php
index 03150c29c..ed43818d5 100644
--- a/tests/HandlerTest.php
+++ b/tests/Feature/REST/HandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Feature\REST;
 
 use Binaryk\LaravelRestify\Exceptions\Eloquent\EntityNotFoundException as EntityNotFoundExceptionEloquent;
 use Binaryk\LaravelRestify\Exceptions\Guard\EntityNotFoundException;
@@ -8,6 +8,7 @@
 use Binaryk\LaravelRestify\Exceptions\RestifyHandler;
 use Binaryk\LaravelRestify\Exceptions\UnauthenticateException;
 use Binaryk\LaravelRestify\Restify;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithContainer;
diff --git a/tests/RestControllerTest.php b/tests/Feature/REST/RestControllerTest.php
similarity index 94%
rename from tests/RestControllerTest.php
rename to tests/Feature/REST/RestControllerTest.php
index c3673301d..09c0ebd02 100644
--- a/tests/RestControllerTest.php
+++ b/tests/Feature/REST/RestControllerTest.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Feature\REST;
 
 use Binaryk\LaravelRestify\Controllers\RestResponse;
 use Binaryk\LaravelRestify\Exceptions\Guard\EntityNotFoundException;
 use Binaryk\LaravelRestify\Exceptions\Guard\GatePolicy;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
-use Binaryk\LaravelRestify\Tests\Fixtures\User;
-use Binaryk\LaravelRestify\Tests\Fixtures\UserController;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\UserController;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Auth\Passwords\PasswordBroker;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/tests/SearchServiceTest.php b/tests/Feature/SearchServiceTest.php
similarity index 98%
rename from tests/SearchServiceTest.php
rename to tests/Feature/SearchServiceTest.php
index 7042d7769..5f2d528a2 100644
--- a/tests/SearchServiceTest.php
+++ b/tests/Feature/SearchServiceTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Feature;
 
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Services\Search\SearchService;
-use Binaryk\LaravelRestify\Tests\Fixtures\User;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Closure;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
diff --git a/tests/FieldResolversTest.php b/tests/FieldResolversTest.php
deleted file mode 100644
index 9eedb6fef..000000000
--- a/tests/FieldResolversTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests;
-
-use Binaryk\LaravelRestify\Fields\Field;
-use Binaryk\LaravelRestify\Tests\Fixtures\Book;
-use Binaryk\LaravelRestify\Tests\Fixtures\BookRepository;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class FieldResolversTest extends IntegrationTest
-{
-    public function test_show_callback_change_details_value()
-    {
-        tap($this->basicField(), function (Field $field) {
-            $book = factory(Book::class)->create();
-            $repository = $this->basicRepository();
-            $repository->resource = $book;
-
-            $field->showCallback(function ($value, $repo) use ($book, $repository) {
-                $this->assertInstanceOf(get_class($repository), $repo);
-                $this->assertSame($value, $book->title); //assert that the value is read from the database
-                return 'something else';
-            });
-
-            $this->assertSame($field->resolveForShow($repository)->value, 'something else');
-        });
-    }
-
-    public function basicField()
-    {
-        return Field::make('title');
-    }
-
-    public function basicRepository()
-    {
-        return new class extends BookRepository {
-        };
-    }
-}
diff --git a/tests/Fixtures/Apple.php b/tests/Fixtures/Apple.php
deleted file mode 100644
index f7c4c0164..000000000
--- a/tests/Fixtures/Apple.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Apple extends Model
-{
-    protected $guarded = ['id'];
-
-    protected $fillable = [
-        'title',
-        'color',
-        'user_id',
-    ];
-
-    public function user()
-    {
-        return $this->belongsTo(User::class);
-    }
-
-    public function toArray()
-    {
-        return parent::toArray();
-    }
-}
diff --git a/tests/Fixtures/AppleRepository.php b/tests/Fixtures/AppleRepository.php
deleted file mode 100644
index dc87a8e25..000000000
--- a/tests/Fixtures/AppleRepository.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
-
-use Binaryk\LaravelRestify\Fields\Field;
-use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
-use Binaryk\LaravelRestify\Repositories\Repository;
-
-class AppleRepository extends Repository
-{
-    public static $model = Apple::class;
-
-    public function fields(RestifyRequest $request)
-    {
-        return [
-            Field::make('id'),
-
-            Field::make('title'),
-        ];
-    }
-}
diff --git a/tests/Fixtures/Book.php b/tests/Fixtures/Book.php
deleted file mode 100644
index 14ff16277..000000000
--- a/tests/Fixtures/Book.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
-
-use Binaryk\LaravelRestify\Contracts\RestifySearchable;
-use Binaryk\LaravelRestify\Traits\InteractWithSearch;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class Book extends Model implements RestifySearchable
-{
-    use InteractWithSearch;
-
-    protected $fillable = [
-        'id',
-        'title',
-        'description',
-        'author',
-        'price',
-        'stock',
-    ];
-}
diff --git a/tests/Fixtures/BookPolicy.php b/tests/Fixtures/BookPolicy.php
deleted file mode 100644
index 255a5665b..000000000
--- a/tests/Fixtures/BookPolicy.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class BookPolicy
-{
-    /**
-     * Determine if the given user can view resources.
-     */
-    public function viewAny($user)
-    {
-        return $_SERVER['restify.book.viewAnyable'] ?? true;
-    }
-
-    /**
-     * Determine if users can be created.
-     */
-    public function store($user)
-    {
-        return $_SERVER['restify.book.storable'] ?? true;
-    }
-
-    /**
-     * Determine if books can be updated.
-     */
-    public function update($user, $book)
-    {
-        return $_SERVER['restify.book.updateable'] ?? true;
-    }
-
-    /**
-     * Determine if book can be shown.
-     */
-    public function show($user, $book)
-    {
-        return $_SERVER['restify.book.showable'] ?? true;
-    }
-
-    /**
-     * Determine if books can be deleted.
-     */
-    public function destroy($user)
-    {
-        return $_SERVER['restify.book.destroyable'] ?? true;
-    }
-}
diff --git a/tests/Fixtures/BookRepository.php b/tests/Fixtures/BookRepository.php
deleted file mode 100644
index ef0db02e9..000000000
--- a/tests/Fixtures/BookRepository.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
-
-use Binaryk\LaravelRestify\Fields\Field;
-use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
-use Binaryk\LaravelRestify\Repositories\Repository;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-class BookRepository extends Repository
-{
-    public static $model = Book::class;
-
-    /**
-     * Get the URI key for the resource.
-     *
-     * @return string
-     */
-    public static function uriKey()
-    {
-        return 'books';
-    }
-
-    /**
-     * @param  RestifyRequest  $request
-     * @return array
-     */
-    public function fields(RestifyRequest $request)
-    {
-        return [
-            Field::make('title')->storingRules('required')->messages([
-                'required' => 'This field is required',
-            ]),
-        ];
-    }
-}
diff --git a/tests/Fixtures/Post.php b/tests/Fixtures/Post/Post.php
similarity index 69%
rename from tests/Fixtures/Post.php
rename to tests/Fixtures/Post/Post.php
index 7bce7006b..ffb7ce6c1 100644
--- a/tests/Fixtures/Post.php
+++ b/tests/Fixtures/Post/Post.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
+namespace Binaryk\LaravelRestify\Tests\Fixtures\Post;
 
 use Binaryk\LaravelRestify\Contracts\RestifySearchable;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
 use Binaryk\LaravelRestify\Traits\InteractWithSearch;
 use Illuminate\Database\Eloquent\Model;
 
@@ -20,4 +21,9 @@ class Post extends Model implements RestifySearchable
         'title',
         'description',
     ];
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
 }
diff --git a/tests/Fixtures/Post/PostAuthorizeRepository.php b/tests/Fixtures/Post/PostAuthorizeRepository.php
new file mode 100644
index 000000000..69a6c8183
--- /dev/null
+++ b/tests/Fixtures/Post/PostAuthorizeRepository.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Binaryk\LaravelRestify\Tests\Fixtures\Post;
+
+use Binaryk\LaravelRestify\Fields\Field;
+use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
+use Binaryk\LaravelRestify\Repositories\Repository;
+
+class PostAuthorizeRepository extends Repository
+{
+    public static $model = Post::class;
+
+    public static $globallySearchable = false;
+
+    public function fields(RestifyRequest $request)
+    {
+        return [
+            Field::new('user_id'),
+
+            Field::new('title')
+                ->canSee(fn () => $_SERVER['postAuthorize.can.see.title'])
+                ->showCallback(fn ($value) => strtoupper($value)),
+
+            Field::new('description')->storingRules('required')->messages([
+                'required' => 'Description field is required',
+            ]),
+        ];
+    }
+}
diff --git a/tests/Fixtures/PostMergeableRepository.php b/tests/Fixtures/Post/PostMergeableRepository.php
similarity index 77%
rename from tests/Fixtures/PostMergeableRepository.php
rename to tests/Fixtures/Post/PostMergeableRepository.php
index a5111c3cc..2a6a1eaf8 100644
--- a/tests/Fixtures/PostMergeableRepository.php
+++ b/tests/Fixtures/Post/PostMergeableRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
+namespace Binaryk\LaravelRestify\Tests\Fixtures\Post;
 
 use Binaryk\LaravelRestify\Fields\Field;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
@@ -14,15 +14,9 @@ class PostMergeableRepository extends Repository implements Mergeable
 {
     public static $model = Post::class;
 
-    /**
-     * Get the URI key for the resource.
-     *
-     * @return string
-     */
-    public static function uriKey()
-    {
-        return 'posts-mergeable';
-    }
+    public static $uriKey = 'posts-mergeable';
+
+    public static $globallySearchable = false;
 
     /**
      * @param  RestifyRequest  $request
diff --git a/tests/Fixtures/PostPolicy.php b/tests/Fixtures/Post/PostPolicy.php
similarity index 75%
rename from tests/Fixtures/PostPolicy.php
rename to tests/Fixtures/Post/PostPolicy.php
index 161b1a02e..ed4fda98d 100644
--- a/tests/Fixtures/PostPolicy.php
+++ b/tests/Fixtures/Post/PostPolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
+namespace Binaryk\LaravelRestify\Tests\Fixtures\Post;
 
 /**
  * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
@@ -9,10 +9,12 @@ class PostPolicy
 {
     /**
      * Determine if the given user can view resources.
+     *
+     * @return bool|mixed
      */
-    public function viewAny($user)
+    public function allowRestify()
     {
-        return $_SERVER['restify.post.viewAnyable'] ?? true;
+        return $_SERVER['restify.post.allowRestify'] ?? true;
     }
 
     /**
diff --git a/tests/Fixtures/PostRepository.php b/tests/Fixtures/Post/PostRepository.php
similarity index 67%
rename from tests/Fixtures/PostRepository.php
rename to tests/Fixtures/Post/PostRepository.php
index efe2dc225..6f34543aa 100644
--- a/tests/Fixtures/PostRepository.php
+++ b/tests/Fixtures/Post/PostRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
+namespace Binaryk\LaravelRestify\Tests\Fixtures\Post;
 
 use Binaryk\LaravelRestify\Fields\Field;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
@@ -10,6 +10,20 @@ class PostRepository extends Repository
 {
     public static $model = Post::class;
 
+    public static $title = 'title';
+
+    public static $search = [
+        'id',
+        'title',
+    ];
+
+    public static function indexQuery(RestifyRequest $request, $query)
+    {
+        if (isset($_SERVER['restify.post.indexQueryCallback']) && is_callable($_SERVER['restify.post.indexQueryCallback'])) {
+            call_user_func($_SERVER['restify.post.indexQueryCallback'], $query);
+        }
+    }
+
     public function fields(RestifyRequest $request)
     {
         return [
diff --git a/tests/Fixtures/PostUnauthorizedFieldRepository.php b/tests/Fixtures/Post/PostUnauthorizedFieldRepository.php
similarity index 90%
rename from tests/Fixtures/PostUnauthorizedFieldRepository.php
rename to tests/Fixtures/Post/PostUnauthorizedFieldRepository.php
index 8ab92ff21..67a6259f5 100644
--- a/tests/Fixtures/PostUnauthorizedFieldRepository.php
+++ b/tests/Fixtures/Post/PostUnauthorizedFieldRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
+namespace Binaryk\LaravelRestify\Tests\Fixtures\Post;
 
 use Binaryk\LaravelRestify\Fields\Field;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
@@ -14,6 +14,8 @@ class PostUnauthorizedFieldRepository extends Repository implements Mergeable
 {
     public static $model = Post::class;
 
+    public static $globallySearchable = false;
+
     /**
      * Get the URI key for the resource.
      *
diff --git a/tests/Fixtures/Post/PostWithUnauthorizedFieldsRepository.php b/tests/Fixtures/Post/PostWithUnauthorizedFieldsRepository.php
new file mode 100644
index 000000000..80db10f9d
--- /dev/null
+++ b/tests/Fixtures/Post/PostWithUnauthorizedFieldsRepository.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Binaryk\LaravelRestify\Tests\Fixtures\Post;
+
+use Binaryk\LaravelRestify\Fields\Field;
+use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
+use Binaryk\LaravelRestify\Repositories\Repository;
+
+class PostWithUnauthorizedFieldsRepository extends Repository
+{
+    public static $model = Post::class;
+
+    public static $uriKey = 'post-with-unathorized-fields';
+
+    public static $globallySearchable = false;
+
+    public function fields(RestifyRequest $request)
+    {
+        return [
+            Field::new('user_id'),
+
+            Field::new('title')->canUpdate(fn () => $_SERVER['posts.authorizable.title']),
+        ];
+    }
+}
diff --git a/tests/Fixtures/SimpleUser.php b/tests/Fixtures/User/SimpleUser.php
similarity index 91%
rename from tests/Fixtures/SimpleUser.php
rename to tests/Fixtures/User/SimpleUser.php
index 41cc12682..cf9964e48 100644
--- a/tests/Fixtures/SimpleUser.php
+++ b/tests/Fixtures/User/SimpleUser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
+namespace Binaryk\LaravelRestify\Tests\Fixtures\User;
 
 use Binaryk\LaravelRestify\Models\LaravelRestifyModel;
 use Illuminate\Database\Query\Builder;
diff --git a/tests/Fixtures/User.php b/tests/Fixtures/User/User.php
similarity index 95%
rename from tests/Fixtures/User.php
rename to tests/Fixtures/User/User.php
index 5f91a7aca..828b01778 100644
--- a/tests/Fixtures/User.php
+++ b/tests/Fixtures/User/User.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
+namespace Binaryk\LaravelRestify\Tests\Fixtures\User;
 
 use Binaryk\LaravelRestify\Contracts\Passportable;
 use Binaryk\LaravelRestify\Contracts\RestifySearchable;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\Post;
 use Binaryk\LaravelRestify\Traits\InteractWithSearch;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Query\Builder;
diff --git a/tests/Fixtures/UserController.php b/tests/Fixtures/User/UserController.php
similarity index 97%
rename from tests/Fixtures/UserController.php
rename to tests/Fixtures/User/UserController.php
index a69c739a8..f4cd38758 100644
--- a/tests/Fixtures/UserController.php
+++ b/tests/Fixtures/User/UserController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
+namespace Binaryk\LaravelRestify\Tests\Fixtures\User;
 
 use Binaryk\LaravelRestify\Controllers\RestController;
 use Binaryk\LaravelRestify\Exceptions\Guard\EntityNotFoundException;
diff --git a/tests/Fixtures/UserRepository.php b/tests/Fixtures/User/UserRepository.php
similarity index 74%
rename from tests/Fixtures/UserRepository.php
rename to tests/Fixtures/User/UserRepository.php
index d6c309d7e..dd6949d89 100644
--- a/tests/Fixtures/UserRepository.php
+++ b/tests/Fixtures/User/UserRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests\Fixtures;
+namespace Binaryk\LaravelRestify\Tests\Fixtures\User;
 
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
@@ -12,6 +12,11 @@ class UserRepository extends Repository
 {
     public static $model = User::class;
 
+    public static $search = [
+        'id',
+        'name',
+    ];
+
     public function fields(RestifyRequest $request)
     {
         return [
diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php
index a931e986a..c61a275a9 100644
--- a/tests/IntegrationTest.php
+++ b/tests/IntegrationTest.php
@@ -5,13 +5,14 @@
 use Binaryk\LaravelRestify\Exceptions\RestifyHandler;
 use Binaryk\LaravelRestify\LaravelRestifyServiceProvider;
 use Binaryk\LaravelRestify\Restify;
-use Binaryk\LaravelRestify\Tests\Fixtures\AppleRepository;
-use Binaryk\LaravelRestify\Tests\Fixtures\BookRepository;
-use Binaryk\LaravelRestify\Tests\Fixtures\PostMergeableRepository;
-use Binaryk\LaravelRestify\Tests\Fixtures\PostRepository;
-use Binaryk\LaravelRestify\Tests\Fixtures\PostUnauthorizedFieldRepository;
-use Binaryk\LaravelRestify\Tests\Fixtures\User;
-use Binaryk\LaravelRestify\Tests\Fixtures\UserRepository;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\Post;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostAuthorizeRepository;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostMergeableRepository;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostRepository;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostUnauthorizedFieldRepository;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostWithUnauthorizedFieldsRepository;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
+use Binaryk\LaravelRestify\Tests\Fixtures\User\UserRepository;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Contracts\Translation\Translator;
@@ -26,8 +27,6 @@
  */
 abstract class IntegrationTest extends TestCase
 {
-    use InteractWithModels;
-
     /**
      * @var mixed
      */
@@ -180,9 +179,9 @@ public function loadRepositories()
             UserRepository::class,
             PostRepository::class,
             PostMergeableRepository::class,
+            PostAuthorizeRepository::class,
+            PostWithUnauthorizedFieldsRepository::class,
             PostUnauthorizedFieldRepository::class,
-            BookRepository::class,
-            AppleRepository::class,
         ]);
     }
 
@@ -198,4 +197,46 @@ protected function authenticate()
 
         return $this;
     }
+
+    /**
+     * @param  int  $count
+     * @param  array  $predefinedEmails
+     * @return \Illuminate\Support\Collection
+     */
+    public function mockUsers($count = 1, $predefinedEmails = [])
+    {
+        $users = collect([]);
+        $i = 0;
+        while ($i < $count) {
+            $users->push(factory(User::class)->create());
+            $i++;
+        }
+
+        foreach ($predefinedEmails as $email) {
+            $users->push(factory(User::class)->create([
+                'email' => $email,
+            ]));
+        }
+
+        return $users->shuffle(); // randomly shuffles the items in the collection
+    }
+
+    /**
+     * @param $userId
+     * @param  int  $count
+     * @return \Illuminate\Support\Collection
+     */
+    public function mockPosts($userId, $count = 1)
+    {
+        $users = collect([]);
+        $i = 0;
+        while ($i < $count) {
+            $users->push(factory(Post::class)->create(
+                ['user_id' => $userId]
+            ));
+            $i++;
+        }
+
+        return $users->shuffle(); // randomly shuffles the items in the collection
+    }
 }
diff --git a/tests/InteractWithModels.php b/tests/InteractWithModels.php
deleted file mode 100644
index 7aa7e5be0..000000000
--- a/tests/InteractWithModels.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Binaryk\LaravelRestify\Tests;
-
-use Binaryk\LaravelRestify\Tests\Fixtures\Post;
-use Binaryk\LaravelRestify\Tests\Fixtures\User;
-
-/**
- * @author Eduard Lupacescu <eduard.lupacescu@binarcode.com>
- */
-trait InteractWithModels
-{
-    /**
-     * @param  int  $count
-     * @param  array  $predefinedEmails
-     * @return \Illuminate\Support\Collection
-     */
-    public function mockUsers($count = 1, $predefinedEmails = [])
-    {
-        $users = collect([]);
-        $i = 0;
-        while ($i < $count) {
-            $users->push(factory(User::class)->create());
-            $i++;
-        }
-
-        foreach ($predefinedEmails as $email) {
-            $users->push(factory(User::class)->create([
-                'email' => $email,
-            ]));
-        }
-
-        return $users->shuffle(); // randomly shuffles the items in the collection
-    }
-
-    /**
-     * @param $userId
-     * @param  int  $count
-     * @return \Illuminate\Support\Collection
-     */
-    public function mockPosts($userId, $count = 1)
-    {
-        $users = collect([]);
-        $i = 0;
-        while ($i < $count) {
-            $users->push(factory(Post::class)->create(
-                ['user_id' => $userId]
-            ));
-            $i++;
-        }
-
-        return $users->shuffle(); // randomly shuffles the items in the collection
-    }
-}
diff --git a/tests/Migrations/2019_12_22_000006_create_books_table.php b/tests/Migrations/2019_12_22_000006_create_books_table.php
deleted file mode 100644
index 4c97e6f47..000000000
--- a/tests/Migrations/2019_12_22_000006_create_books_table.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateBooksTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('books', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('title');
-            $table->longText('description')->nullable();
-            $table->string('author')->nullable();
-            $table->float('price')->default(0);
-            $table->integer('stock')->nullable();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('books');
-    }
-}
diff --git a/tests/Migrations/2020_05_04_000006_create_apples_table.php b/tests/Migrations/2020_05_04_000006_create_apples_table.php
deleted file mode 100644
index 8524a932d..000000000
--- a/tests/Migrations/2020_05_04_000006_create_apples_table.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateApplesTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('apples', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('title');
-            $table->string('color')->nullable();
-            $table->unsignedBigInteger('user_id')->nullable();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('apples');
-    }
-}
diff --git a/tests/Unit/FieldTest.php b/tests/Unit/FieldTest.php
index e21a3460b..0c915010a 100644
--- a/tests/Unit/FieldTest.php
+++ b/tests/Unit/FieldTest.php
@@ -5,7 +5,7 @@
 use Binaryk\LaravelRestify\Fields\Field;
 use Binaryk\LaravelRestify\Http\Requests\RepositoryStoreRequest;
 use Binaryk\LaravelRestify\Http\Requests\RepositoryUpdateRequest;
-use Binaryk\LaravelRestify\Tests\Fixtures\PostRepository;
+use Binaryk\LaravelRestify\Tests\Fixtures\Post\PostRepository;
 use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Routing\Route;
@@ -40,13 +40,13 @@ public function test_fields_can_have_custom_show_callback()
 
     public function test_fields_can_have_custom_resolver_callback_even_if_field_is_missing()
     {
-        $field = Field::make('Name')->showCallback(function ($value, $model, $attribute) {
-            return strtoupper('default');
+        $field = Field::make('Name')->resolveCallback(function ($value, $model, $attribute) {
+            return strtoupper($value);
         });
 
-        $field->resolveForShow((object) ['name' => 'Binaryk'], 'email');
+        $field->resolve((object) ['name' => 'Eduard'], 'name');
 
-        $this->assertEquals('DEFAULT', $field->value);
+        $this->assertEquals('EDUARD', $field->value);
     }
 
     public function test_computed_fields_resolve()
diff --git a/tests/RepositoryWithRoutesTest.php b/tests/Unit/RepositoryWithRoutesTest.php
similarity index 96%
rename from tests/RepositoryWithRoutesTest.php
rename to tests/Unit/RepositoryWithRoutesTest.php
index b433df6ae..abd78c7e4 100644
--- a/tests/RepositoryWithRoutesTest.php
+++ b/tests/Unit/RepositoryWithRoutesTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Binaryk\LaravelRestify\Tests;
+namespace Binaryk\LaravelRestify\Tests\Unit;
 
 use Binaryk\LaravelRestify\Controllers\RestController;
 use Binaryk\LaravelRestify\Repositories\Repository;
 use Binaryk\LaravelRestify\Restify;
+use Binaryk\LaravelRestify\Tests\IntegrationTest;
 use Illuminate\Routing\Router;
 
 /**
@@ -146,7 +147,7 @@ class WithCustomNamespace extends RepositoryWithRoutes
 {
     public static function routes(Router $router, $options, $wrap = false)
     {
-        $options['namespace'] = 'Binaryk\LaravelRestify\Tests';
+        $options['namespace'] = 'Binaryk\LaravelRestify\Tests\Unit';
 
         $router->group($options, function ($router) {
             $router->get('custom-namespace', 'HandleController@sayHello')->name('namespace.route');