diff --git a/composer.json b/composer.json
index 045aded..61c3778 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,12 @@
     "name": "netsells/laravel-geoscope",
     "description": "An easy to use trait that can be added to models to allow distance based scopes to be applied",
     "type": "library",
+    "keywords": [
+        "laravel",
+        "latitude",
+        "longitude",
+        "distance"
+    ],
     "license": "MIT",
     "authors": [
         {
diff --git a/tests/Integration/Database/Factories/TestFactory.php b/tests/Integration/Database/Factories/TestFactory.php
index fd1e6f4..1465b74 100644
--- a/tests/Integration/Database/Factories/TestFactory.php
+++ b/tests/Integration/Database/Factories/TestFactory.php
@@ -1,8 +1,7 @@
 <?php
 
 use Faker\Generator as Faker;
-use Netsells\GeoScope\Tests\Test;
-use \Netsells\GeoScope\Tests\Test2;
+use Netsells\GeoScope\Tests\Integration\Database\Models\Test;
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
 $factory->define(
diff --git a/tests/Integration/Database/Models/Test.php b/tests/Integration/Database/Models/Test.php
index 77e94b1..fe22851 100644
--- a/tests/Integration/Database/Models/Test.php
+++ b/tests/Integration/Database/Models/Test.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Netsells\GeoScope\Tests;
+namespace Netsells\GeoScope\Tests\Integration\Database\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Netsells\GeoScope\Traits\GeoScopeTrait;
diff --git a/tests/Integration/Database/Models/Test2.php b/tests/Integration/Database/Models/Test2.php
index f9cb8c0..aa8b6fa 100644
--- a/tests/Integration/Database/Models/Test2.php
+++ b/tests/Integration/Database/Models/Test2.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Netsells\GeoScope\Tests;
+namespace Netsells\GeoScope\Integration\Database\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Netsells\GeoScope\Traits\GeoScopeTrait;
diff --git a/tests/Integration/ScopeDrivers/BaseScopeDriverTest.php b/tests/Integration/ScopeDrivers/BaseScopeDriverTest.php
index 5be323c..5fa7314 100644
--- a/tests/Integration/ScopeDrivers/BaseScopeDriverTest.php
+++ b/tests/Integration/ScopeDrivers/BaseScopeDriverTest.php
@@ -4,8 +4,7 @@
 
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Collection;
-use Netsells\GeoScope\Tests\Test;
-use Netsells\GeoScope\Tests\Test2;
+use Netsells\GeoScope\Tests\Integration\Database\Models\Test;
 
 abstract class BaseScopeDriverTest extends ScopeDriverTestCase
 {
diff --git a/tests/Integration/ScopeDrivers/ScopeDriverTestCase.php b/tests/Integration/ScopeDrivers/ScopeDriverTestCase.php
index d77e8bc..8088dec 100644
--- a/tests/Integration/ScopeDrivers/ScopeDriverTestCase.php
+++ b/tests/Integration/ScopeDrivers/ScopeDriverTestCase.php
@@ -5,7 +5,7 @@
 use Netsells\GeoScope\BuilderScopes\EloquentBuilderScope;
 use Netsells\GeoScope\ScopeDriverFactory;
 use Netsells\GeoScope\Tests\Integration\IntegrationTestCase;
-use Netsells\GeoScope\Tests\Test;
+use Netsells\GeoScope\Tests\Integration\Database\Models\Test;
 
 abstract class ScopeDriverTestCase extends IntegrationTestCase
 {
diff --git a/tests/Integration/ScopeDrivers/Traits/ScopeDriverDBBuilderTests.php b/tests/Integration/ScopeDrivers/Traits/ScopeDriverDBBuilderTests.php
index ea3235d..4addaf9 100644
--- a/tests/Integration/ScopeDrivers/Traits/ScopeDriverDBBuilderTests.php
+++ b/tests/Integration/ScopeDrivers/Traits/ScopeDriverDBBuilderTests.php
@@ -2,9 +2,8 @@
 
 namespace Netsells\GeoScope\Tests\Integration\ScopeDrivers\Traits;
 
-use Netsells\GeoScope\Tests\Test;
+use Netsells\GeoScope\Tests\Integration\Database\Models\Test;
 use Illuminate\Support\Facades\DB;
-use Netsells\GeoScope\Tests\Test2;
 use Netsells\GeoScope\Exceptions\InvalidDistanceFieldNameException;
 
 trait ScopeDriverDBBuilderTests
diff --git a/tests/Integration/ScopeDrivers/Traits/ScopeDriverEloquentBuilderTests.php b/tests/Integration/ScopeDrivers/Traits/ScopeDriverEloquentBuilderTests.php
index 11cc91d..d6b667e 100644
--- a/tests/Integration/ScopeDrivers/Traits/ScopeDriverEloquentBuilderTests.php
+++ b/tests/Integration/ScopeDrivers/Traits/ScopeDriverEloquentBuilderTests.php
@@ -5,7 +5,7 @@
 use Netsells\GeoScope\Exceptions\InvalidConfigException;
 use Netsells\GeoScope\Exceptions\InvalidDistanceFieldNameException;
 use Netsells\GeoScope\Exceptions\ScopeDriverNotFoundException;
-use Netsells\GeoScope\Tests\Test;
+use Netsells\GeoScope\Tests\Integration\Database\Models\Test;
 
 trait ScopeDriverEloquentBuilderTests
 {