diff --git a/FlasherSweetAlertServiceProvider.php b/FlasherSweetAlertServiceProvider.php
index e08952e8..c08246bc 100644
--- a/FlasherSweetAlertServiceProvider.php
+++ b/FlasherSweetAlertServiceProvider.php
@@ -2,7 +2,7 @@
 
 namespace Flasher\SweetAlert\Laravel;
 
-use Illuminate\Contracts\Support\DeferrableProvider;
+use Illuminate\Container\Container;
 use Illuminate\Support\ServiceProvider;
 use Flasher\SweetAlert\Laravel\ServiceProvider\ServiceProviderManager;
 
@@ -37,7 +37,7 @@ final class FlasherSweetAlertServiceProvider extends ServiceProvider
     }
 
     /**
-     * @return \Illuminate\Container\Container
+     * @return Container
      */
     public function getApplication()
     {
diff --git a/ServiceProvider/Providers/Laravel.php b/ServiceProvider/Providers/Laravel.php
index 57ed86f8..b2cbc7a4 100644
--- a/ServiceProvider/Providers/Laravel.php
+++ b/ServiceProvider/Providers/Laravel.php
@@ -26,7 +26,7 @@ class Laravel implements ServiceProviderInterface
 
     public function publishConfig(FlasherSweetAlertServiceProvider $provider)
     {
-        $source = realpath($raw = __DIR__.'/../../../resources/config/config.php') ?: $raw;
+        $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw;
 
         $provider->publishes(array($source => config_path('flasher_sweet_alert.php')), 'config');
 
diff --git a/ServiceProvider/Providers/Laravel4.php b/ServiceProvider/Providers/Laravel4.php
index 455b0364..6e950f83 100644
--- a/ServiceProvider/Providers/Laravel4.php
+++ b/ServiceProvider/Providers/Laravel4.php
@@ -14,7 +14,7 @@ final class Laravel4 extends Laravel
 
     public function publishConfig(FlasherSweetAlertServiceProvider $provider)
     {
-        $provider->package('php-flasher/flasher-laravel-sweet_alert', 'flasher_sweet_alert', __DIR__.'/../../../resources');
+        $provider->package('php-flasher/flasher-laravel-sweet_alert', 'flasher_sweet_alert', __DIR__.'/../../Resources');
     }
 
     public function mergeConfigFromSweetAlert()
diff --git a/ServiceProvider/Providers/Lumen.php b/ServiceProvider/Providers/Lumen.php
index ed9edda2..49527245 100644
--- a/ServiceProvider/Providers/Lumen.php
+++ b/ServiceProvider/Providers/Lumen.php
@@ -14,7 +14,7 @@ final class Lumen extends Laravel
 
     public function publishConfig(FlasherSweetAlertServiceProvider $provider)
     {
-        $source = realpath($raw = __DIR__.'/../../../resources/config/config.php') ?: $raw;
+        $source = realpath($raw = __DIR__.'/../../Resources/config/config.php') ?: $raw;
 
         $this->app->configure('flasher_sweet_alert');
 
diff --git a/Tests/NotifySweetAlertServiceProviderTest.php b/Tests/FlasherSweetAlertServiceProviderTest.php
similarity index 61%
rename from Tests/NotifySweetAlertServiceProviderTest.php
rename to Tests/FlasherSweetAlertServiceProviderTest.php
index 6a418ffc..1664385a 100644
--- a/Tests/NotifySweetAlertServiceProviderTest.php
+++ b/Tests/FlasherSweetAlertServiceProviderTest.php
@@ -2,37 +2,37 @@
 
 namespace Flasher\SweetAlert\Laravel\Tests;
 
-class NotifySweetAlertServiceProviderTest extends TestCase
+class FlasherSweetAlertServiceProviderTest extends TestCase
 {
     public function testContainerContainNotifyServices()
     {
-        $this->assertTrue($this->app->bound('flasher.factory'));
+        $this->assertTrue($this->app->bound('flasher'));
         $this->assertTrue($this->app->bound('flasher.factory.sweet_alert'));
     }
 
     public function testNotifyFactoryIsAddedToExtensionsArray()
     {
-        $manager = $this->app->make('flasher.factory');
+        $flasher = $this->app->make('flasher');
 
-        $reflection = new \ReflectionClass($manager);
+        $reflection = new \ReflectionClass($flasher);
         $property = $reflection->getProperty('drivers');
         $property->setAccessible(true);
 
-        $extensions = $property->getValue($manager);
+        $extensions = $property->getValue($flasher);
 
         $this->assertCount(1, $extensions);
-        $this->assertInstanceOf('Flasher\Prime\FlasherInterface', $extensions['sweet_alert']);
+        $this->assertInstanceOf('Flasher\Prime\Factory\FlasherFactoryInterface', $extensions[0]);
     }
 
     public function testConfigSweetAlertInjectedInGlobalNotifyConfig()
     {
-        $manager = $this->app->make('flasher.factory');
+        $flasher = $this->app->make('flasher');
 
-        $reflection = new \ReflectionClass($manager);
+        $reflection = new \ReflectionClass($flasher);
         $property = $reflection->getProperty('config');
         $property->setAccessible(true);
 
-        $config = $property->getValue($manager);
+        $config = $property->getValue($flasher);
 
         $this->assertArrayHasKey('sweet_alert', $config->get('adapters'));
 
diff --git a/Tests/TestCase.php b/Tests/TestCase.php
index d3e2f115..34711e4c 100644
--- a/Tests/TestCase.php
+++ b/Tests/TestCase.php
@@ -12,28 +12,27 @@ use Orchestra\Testbench\TestCase as Orchestra;
 class TestCase extends Orchestra
 {
     /**
-     * @param \Illuminate\Foundation\Application $app
+     * @param Application $app
      *
      * @return array
      */
     protected function getPackageProviders($app = null)
     {
         return array(
-            'Flasher\LaravelFlasher\PrimeServiceProvider',
-            'Flasher\SweetAlert\LaravelFlasher\PrimeSweetAlertServiceProvider',
+            'Flasher\Laravel\FlasherServiceProvider',
+            'Flasher\SweetAlert\Laravel\FlasherSweetAlertServiceProvider',
         );
     }
 
     /**
-     * @param \Illuminate\Foundation\Application $app
+     * @param Application $app
      */
     protected function getEnvironmentSetUp($app)
     {
         $separator = $this->isLaravel4() ? '::config' : '';
 
         $app['config']->set('session'.$separator.'.driver', 'array');
-        $app['config']->set('notify'.$separator.'.stamps_middlewares', array());
-        $app['config']->set('notify'.$separator.'.adapters', array(
+        $app['config']->set('flasher'.$separator.'.adapters', array(
             'sweet_alert' => array('scripts' => array('jquery.js'), 'styles' => array('styles.css'), 'options' => array()),
         ));
     }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2621c486..1e1af721 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,7 +16,7 @@
     </testsuites>
     <filter>
         <whitelist>
-            <directory suffix=".php">src/</directory>
+            <directory suffix=".php">./</directory>
         </whitelist>
     </filter>
 </phpunit>