diff --git a/.travis.yml b/.travis.yml
index 988b4a8..ecabd94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,15 @@
 language: php
 php:
-  - 7.1
+  - 8.0
+env:
+  global:
+    - XDEBUG_MODE=coverage
 install:
-  - /home/travis/.phpenv/versions/7.1/bin/composer install
+  - /home/travis/.phpenv/versions/8.0/bin/composer install
   - phpenv rehash
 before_script:
   - mkdir -p build/logs
 script:
   - vendor/bin/phpcs
-  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+  - XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover build/logs/clover.xml
   - php vendor/bin/php-coveralls -v
diff --git a/phpcs.xml b/phpcs.xml
index 607100f..cbff808 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,11 +1,32 @@
 <?xml version="1.0"?>
 <ruleset name="PHP_CodeSniffer">
-    <description>The coding standard for PHP_CodeSniffer itself.</description>
+  <description>The coding standard for PHP_CodeSniffer itself.</description>
 
-    <file>src</file>
+  <file>src</file>
 
-    <arg name="report" value="full"/>
-    <arg value="np"/>
+  <arg name="report" value="full"/>
+  <arg value="np"/>
+  <arg name="tab-width" value="2"/>
 
-    <rule ref="PSR2"/>
-</ruleset>
\ No newline at end of file
+  <rule ref="PSR2"/>
+  <rule ref="Generic.WhiteSpace.ScopeIndent">
+    <properties>
+      <property name="indent" value="2"/>
+    </properties>
+  </rule>
+  <rule ref="Squiz.Functions.MultiLineFunctionDeclaration">
+    <properties>
+      <property name="indent" value="2" />
+    </properties>
+  </rule>
+  <rule ref="PSR2.Methods.FunctionCallSignature">
+    <properties>
+      <property name="indent" value="2" />
+    </properties>
+  </rule>
+  <rule ref="PSR2.ControlStructures.SwitchDeclaration">
+    <properties>
+      <property name="indent" value="2" />
+    </properties>
+  </rule>
+</ruleset>
diff --git a/phpunit.xml b/phpunit.xml
index 32a187b..5928b2c 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -116,7 +116,7 @@
     </testsuite>
   </testsuites>
 
-  <coverage>
+  <coverage processUncoveredFiles="false" pathCoverage="true">
     <include>
       <directory suffix=".php">./src</directory>
     </include>
diff --git a/src/OAuth/AbstractOAuth1.php b/src/OAuth/AbstractOAuth1.php
index 98acf0d..484923a 100644
--- a/src/OAuth/AbstractOAuth1.php
+++ b/src/OAuth/AbstractOAuth1.php
@@ -574,12 +574,16 @@ protected function getSignature(array $query = []): string
   {
     switch ($this->signature) {
       case self::HMAC_SHA1:
-        return $this->getHmacSha1Signature($query);
+        $signature = $this->getHmacSha1Signature($query);
+        break;
       case self::RSA_SHA1:
       case self::PLAIN_TEXT:
       default:
-        return $this->getHmacPlainTextSignature();
+        $signature = $this->getHmacPlainTextSignature();
+        break;
     }
+
+    return $signature;
   }
 
   /**
diff --git a/src/Package/PackageTrait.php b/src/Package/PackageTrait.php
index 88a5b41..2d07139 100644
--- a/src/Package/PackageTrait.php
+++ b/src/Package/PackageTrait.php
@@ -93,8 +93,7 @@ public function register(
     string $vendor,
     ?string $root = null,
     ?string $bootstrap = null
-  )
-  {
+  ) {
     //if no bootstrap file name defined and theres a getBootstrapFileName method
     if (is_null($bootstrap) && method_exists($this, 'getBootstrapFileName')) {
       //use that
diff --git a/test/Data/CloneTrait.php b/test/Data/CloneTrait.php
index ea132a4..281c164 100644
--- a/test/Data/CloneTrait.php
+++ b/test/Data/CloneTrait.php
@@ -33,7 +33,6 @@ protected function tearDown(): void
 
   /**
    * @covers UGComponents\Data\CloneTrait::clone
-   * @covers UGComponents\Data\CloneTrait::__clone
    */
   public function testClone()
   {
diff --git a/test/Data/Collection.php b/test/Data/Collection.php
index 9957067..2a99487 100644
--- a/test/Data/Collection.php
+++ b/test/Data/Collection.php
@@ -433,7 +433,7 @@ public function testSetEventEmitter()
   }
 
   /**
-   * @covers UGComponents\Data\Collection::trigger
+   * @covers UGComponents\Data\Collection::emit
    */
   public function testTrigger()
   {
diff --git a/test/Data/Model.php b/test/Data/Model.php
index 48b1293..15cc205 100644
--- a/test/Data/Model.php
+++ b/test/Data/Model.php
@@ -362,7 +362,7 @@ public function testSetEventEmitter()
   }
 
   /**
-   * @covers UGComponents\Data\Model::trigger
+   * @covers UGComponents\Data\Model::emit
    */
   public function testTrigger()
   {
diff --git a/test/Data/Registry.php b/test/Data/Registry.php
index c0efad6..9c04254 100644
--- a/test/Data/Registry.php
+++ b/test/Data/Registry.php
@@ -387,7 +387,7 @@ public function testSetEventEmitter()
   }
 
   /**
-   * @covers UGComponents\Data\Registry::trigger
+   * @covers UGComponents\Data\Registry::emit
    */
   public function testTrigger()
   {
diff --git a/test/Event/EventEmitter.php b/test/Event/EventEmitter.php
index e68d6fd..8cb07ea 100644
--- a/test/Event/EventEmitter.php
+++ b/test/Event/EventEmitter.php
@@ -124,7 +124,7 @@ public function testOn()
   }
 
   /**
-   * @covers UGComponents\Event\EventEmitter::trigger
+   * @covers UGComponents\Event\EventEmitter::emit
    */
   public function testTrigger()
   {
diff --git a/test/Event/EventTrait.php b/test/Event/EventTrait.php
index 6fbc7ef..95cc9dc 100644
--- a/test/Event/EventTrait.php
+++ b/test/Event/EventTrait.php
@@ -118,7 +118,7 @@ public function testSetEventEmitter()
   }
 
   /**
-   * @covers UGComponents\Event\EventTrait::trigger
+   * @covers UGComponents\Event\EventTrait::emit
    */
   public function testEmit()
   {
diff --git a/test/Http/Router/RouterTrait.php b/test/Http/Router/RouterTrait.php
index d03cd55..439c2f3 100644
--- a/test/Http/Router/RouterTrait.php
+++ b/test/Http/Router/RouterTrait.php
@@ -105,7 +105,7 @@ public function testSetRouter()
   }
 
   /**
-   * covers UGComponents\Http\RouterTrait::triggerRoute
+   * covers UGComponents\Http\RouterTrait::routeTo
    */
   public function testRouteTo()
   {
diff --git a/test/I18n/Language.php b/test/I18n/Language.php
index 7a9284c..19ca7f1 100644
--- a/test/I18n/Language.php
+++ b/test/I18n/Language.php
@@ -330,7 +330,7 @@ public function testSetEventEmitter()
   }
 
   /**
-   * @covers UGComponents\I18n\Language::trigger
+   * @covers UGComponents\I18n\Language::emit
    */
   public function testTrigger()
   {