diff --git a/tests/unit/Grav/Common/AssetsTest.php b/tests/unit/Grav/Common/AssetsTest.php
index 353835f2b..65ead94d8 100644
--- a/tests/unit/Grav/Common/AssetsTest.php
+++ b/tests/unit/Grav/Common/AssetsTest.php
@@ -31,60 +31,60 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->add('test.css');
 
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.css',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'group'    => 'head'
-        ]);
+        ], reset($array));
 
         $this->assets->add('test.js');
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getCss();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.css',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'group'    => 'head'
-        ]);
+        ], reset($array));
 
         //test addCss(). Test adding asset to a separate group
         $this->assets->reset();
         $this->assets->addCSS('test.css');
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.css',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'group'    => 'head'
-        ]);
+        ], reset($array));
 
         //test addJs()
         $this->assets->reset();
         $this->assets->addJs('test.js');
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.js',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'loading'  => '',
             'group'    => 'head'
-        ]);
+        ], reset($array));
 
         //Test CSS Groups
         $this->assets->reset();
@@ -92,16 +92,16 @@ class AssetsTest extends \Codeception\TestCase\Test
         $css = $this->assets->css();
         $this->assertEmpty($css);
         $css = $this->assets->css('footer');
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.css',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'group'    => 'footer'
-        ]);
+        ], reset($array));
 
         //Test JS Groups
         $this->assets->reset();
@@ -109,48 +109,48 @@ class AssetsTest extends \Codeception\TestCase\Test
         $js = $this->assets->js();
         $this->assertEmpty($js);
         $js = $this->assets->js('footer');
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.js',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'loading'  => '',
             'group'    => 'footer'
-        ]);
+        ], reset($array));
 
         //Test async / defer
         $this->assets->reset();
         $this->assets->addJs('test.js', null, true, 'async', null);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.js',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'loading'  => 'async',
             'group'    => 'head'
-        ]);
+        ], reset($array));
 
         $this->assets->reset();
         $this->assets->addJs('test.js', null, true, 'defer', null);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" defer></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" defer></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.js',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'loading'  => 'defer',
             'group'    => 'head'
-        ]);
+        ], reset($array));
     }
 
     public function testAddingAssetPropertiesWithArray()
@@ -159,7 +159,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addJs('test.js', ['loading' => 'async']);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL, $js);
         $this->assets->reset();
 
     }
@@ -170,26 +170,24 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addJs('jquery', ['loading' => 'async']);
         $js = $this->assets->js();
-        $this->assertSame($js,
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL, $js);
 
         //Test priority too
         $this->assets->reset();
         $this->assets->addJs('jquery', ['loading' => 'async', 'priority' => 1]);
         $this->assets->addJs('test.js', ['loading' => 'async', 'priority' => 2]);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL .
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL .
+            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL, $js);
 
         //Test multiple groups
         $this->assets->reset();
         $this->assets->addJs('jquery', ['loading' => 'async', 'priority' => 1, 'group' => 'footer']);
         $this->assets->addJs('test.js', ['loading' => 'async', 'priority' => 2]);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL, $js);
         $js = $this->assets->js('footer');
-        $this->assertSame($js,
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL, $js);
 
         //Test adding array of assets
         //Test priority too
@@ -197,9 +195,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->addJs(['jquery', 'test.js'], ['loading' => 'async']);
         $js = $this->assets->js();
 
-        $this->assertSame($js,
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL .
-            '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL .
+            '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL, $js);
     }
 
     public function testAddingCSSAssetPropertiesWithArrayFromCollection()
@@ -211,25 +208,25 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->addCss('test', ['priority' => 1]);
         $this->assets->addCss('test.css', ['priority' => 2]);
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
-            '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
+            '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         //Test multiple groups
         $this->assets->reset();
         $this->assets->addCss('test', ['priority' => 1, 'group' => 'footer']);
         $this->assets->addCss('test.css', ['priority' => 2]);
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
         $css = $this->assets->css('footer');
-        $this->assertSame($css, '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         //Test adding array of assets
         //Test priority too
         $this->assets->reset();
         $this->assets->addCss(['test', 'test.css'], ['loading' => 'async']);
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
-            '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
+            '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
     }
 
     public function testPriorityOfAssets()
@@ -239,8 +236,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->add('test-after.css');
 
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
-            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
+            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         //----------------
         $this->assets->reset();
@@ -248,8 +245,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->add('test.css', 2);
 
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
-            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
+            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         //----------------
         $this->assets->reset();
@@ -258,9 +255,9 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->add('test-before.css', 3);
 
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test-before.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
+        $this->assertSame('<link href="/test-before.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
             '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
-            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
     }
 
     public function testPipeline()
@@ -271,7 +268,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->add('test.css', null, true);
         $this->assets->setCssPipeline(true);
         $css = $this->assets->css();
-        $this->assertSame($css, '');
+        $this->assertSame('', $css);
 
         //Add a core Grav CSS file, which is found. Pipeline will now return a file
         $this->assets->add('/system/assets/debugger.css', null, true);
@@ -285,8 +282,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addAsyncJs('jquery');
         $js = $this->assets->js();
-        $this->assertSame($js,
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL, $js);
     }
 
     public function testAddDeferJs()
@@ -294,8 +290,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addDeferJs('jquery');
         $js = $this->assets->js();
-        $this->assertSame($js,
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" defer></script>' . PHP_EOL);
+        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" defer></script>' . PHP_EOL, $js);
     }
 
     public function testAddInlineCss()
@@ -303,8 +298,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addInlineCss('body { color: black }');
         $css = $this->assets->css();
-        $this->assertSame($css,
-            PHP_EOL . '<style>' . PHP_EOL . 'body { color: black }' . PHP_EOL . PHP_EOL . '</style>' . PHP_EOL);
+        $this->assertSame(PHP_EOL . '<style>' . PHP_EOL . 'body { color: black }' . PHP_EOL . PHP_EOL . '</style>' . PHP_EOL, $css);
     }
 
     public function testAddInlineJs()
@@ -312,8 +306,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addInlineJs('alert("test")');
         $js = $this->assets->js();
-        $this->assertSame($js,
-            PHP_EOL . '<script>' . PHP_EOL . 'alert("test")' . PHP_EOL . PHP_EOL . '</script>' . PHP_EOL);
+        $this->assertSame(PHP_EOL . '<script>' . PHP_EOL . 'alert("test")' . PHP_EOL . PHP_EOL . '</script>' . PHP_EOL, $js);
     }
 
     public function testGetCollections()
diff --git a/tests/unit/Grav/Common/Page/PagesTest.php b/tests/unit/Grav/Common/Page/PagesTest.php
index 98e2bcc03..97049a42e 100644
--- a/tests/unit/Grav/Common/Page/PagesTest.php
+++ b/tests/unit/Grav/Common/Page/PagesTest.php
@@ -49,7 +49,7 @@ class PagesTest extends \Codeception\TestCase\Test
     {
         $list = $this->pages->getList();
         $this->assertTrue(is_array($list));
-        $this->assertSame($list['/'], 'Home');
-        $this->assertSame($list['/blog'], 'Blog');
+        $this->assertSame('Home', $list['/']);
+        $this->assertSame('Blog', $list['/blog']);
     }
 }
diff --git a/tests/unit/Grav/Common/UriTest.php b/tests/unit/Grav/Common/UriTest.php
index 1236ceba5..0a9989328 100644
--- a/tests/unit/Grav/Common/UriTest.php
+++ b/tests/unit/Grav/Common/UriTest.php
@@ -73,167 +73,167 @@ class UriTest extends \Codeception\TestCase\Test
     public function testPaths()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->paths(), ['grav', 'it', 'ueper']);
+        $this->assertSame(['grav', 'it', 'ueper'], $this->uri->paths());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->paths(), ['grav', 'it']);
+        $this->assertSame(['grav', 'it'], $this->uri->paths());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->paths(), ['grav', 'it', 'ueper']);
+        $this->assertSame(['grav', 'it', 'ueper'], $this->uri->paths());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->paths(), ['a', 'b', 'c', 'd']);
+        $this->assertSame(['a', 'b', 'c', 'd'], $this->uri->paths());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->paths(),
-            ['a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f']);
+        $this->assertSame(['a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f'],
+            $this->uri->paths());
     }
 
     public function testRoute()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->route(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->route());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->route(), '/grav/it');
+        $this->assertSame('/grav/it', $this->uri->route());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->route(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->route());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->route(), '/a/b/c/d');
+        $this->assertSame('/a/b/c/d', $this->uri->route());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->route(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
+        $this->assertSame('/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f', $this->uri->route());
     }
 
     public function testQuery()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->query(), '');
+        $this->assertSame('', $this->uri->query());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->query(), '');
-        $this->assertSame($this->uri->query('id'), null);
+        $this->assertSame('', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->query(), 'test=x');
-        $this->assertSame($this->uri->query('id'), null);
-        $this->assertSame($this->uri->query('test'), 'x');
+        $this->assertSame('test=x', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
+        $this->assertSame('x', $this->uri->query('test'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($this->uri->query(), 'test=x&test2=y');
-        $this->assertSame($this->uri->query('id'), null);
-        $this->assertSame($this->uri->query('test'), 'x');
-        $this->assertSame($this->uri->query('test2'), 'y');
+        $this->assertSame('test=x&test2=y', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
+        $this->assertSame('x', $this->uri->query('test'));
+        $this->assertSame('y', $this->uri->query('test2'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($this->uri->query(), 'test=x&test2=y&test3=x&test4=y');
-        $this->assertSame($this->uri->query('id'), null);
-        $this->assertSame($this->uri->query('test'), 'x');
-        $this->assertSame($this->uri->query('test2'), 'y');
-        $this->assertSame($this->uri->query('test4'), 'y');
+        $this->assertSame('test=x&test2=y&test3=x&test4=y', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
+        $this->assertSame('x', $this->uri->query('test'));
+        $this->assertSame('y', $this->uri->query('test2'));
+        $this->assertSame('y', $this->uri->query('test4'));
         //Test all after the ? is encoded in the query
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($this->uri->query(), 'test=x&test2=y&test3=x&test4=y%2Ftest');
-        $this->assertSame($this->uri->query('id'), null);
-        $this->assertSame($this->uri->query('test'), 'x');
-        $this->assertSame($this->uri->query('test2'), 'y');
-        $this->assertSame($this->uri->query('test4'), 'y/test');
+        $this->assertSame('test=x&test2=y&test3=x&test4=y%2Ftest', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
+        $this->assertSame('x', $this->uri->query('test'));
+        $this->assertSame('y', $this->uri->query('test2'));
+        $this->assertSame('y/test', $this->uri->query('test4'));
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->query(), '');
-        $this->assertSame($this->uri->query('id'), null);
+        $this->assertSame('', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->query(), '');
-        $this->assertSame($this->uri->query('id'), null);
+        $this->assertSame('', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
     }
 
     public function testParams()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->params(), null);
+        $this->assertSame(null, $this->uri->params());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->params(), '/ueper:xxx');
-        $this->assertSame($this->uri->params('ueper'), '/ueper:xxx');
+        $this->assertSame('/ueper:xxx', $this->uri->params());
+        $this->assertSame('/ueper:xxx', $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($this->uri->params(), '/ueper:xxx/test:yyy');
-        $this->assertSame($this->uri->params('ueper'), '/ueper:xxx');
-        $this->assertSame($this->uri->params('test'), '/test:yyy');
+        $this->assertSame('/ueper:xxx/test:yyy', $this->uri->params());
+        $this->assertSame('/ueper:xxx', $this->uri->params('ueper'));
+        $this->assertSame('/test:yyy', $this->uri->params('test'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
     }
 
     public function testParam()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->param('ueper'), 'xxx');
+        $this->assertSame('xxx', $this->uri->param('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($this->uri->param('ueper'), 'xxx');
-        $this->assertSame($this->uri->param('test'), 'yyy');
+        $this->assertSame('xxx', $this->uri->param('ueper'));
+        $this->assertSame('yyy', $this->uri->param('test'));
     }
 
     public function testUrl()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->url(), '/grav/it');
+        $this->assertSame('/grav/it', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($this->uri->url(), '/grav/it');
+        $this->assertSame('/grav/it', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->url(), '/a/b/c/d');
+        $this->assertSame('/a/b/c/d', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->url(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
+        $this->assertSame('/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f', $this->uri->url());
     }
 
     public function testPath()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->path(), '/grav/it');
+        $this->assertSame('/grav/it', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($this->uri->path(), '/grav/it');
+        $this->assertSame('/grav/it', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->path(), '/a/b/c/d');
+        $this->assertSame('/a/b/c/d', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->path(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
+        $this->assertSame('/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost/')->init();
-        $this->assertSame($this->uri->path(), '/');
+        $this->assertSame('/', $this->uri->path());
     }
 
     public function testExtension()
     {
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->extension(), null);
+        $this->assertSame(null, $this->uri->extension());
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->extension('x'), 'x');
+        $this->assertSame('x', $this->uri->extension('x'));
         $this->uri->initializeWithURL('http://localhost/a-page.html')->init();
-        $this->assertSame($this->uri->extension(), 'html');
+        $this->assertSame('html', $this->uri->extension());
         $this->uri->initializeWithURL('http://localhost/a-page.xml')->init();
-        $this->assertSame($this->uri->extension(), 'xml');
+        $this->assertSame('xml', $this->uri->extension());
         $this->uri->initializeWithURL('http://localhost/a-page.foo')->init();
-        $this->assertSame($this->uri->extension(), 'foo');
+        $this->assertSame('foo', $this->uri->extension());
     }
 
     public function testHost()
@@ -244,24 +244,24 @@ class UriTest extends \Codeception\TestCase\Test
         }
 
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->host(), $address);
+        $this->assertSame($address, $this->uri->host());
         $this->uri->initializeWithURL('http://localhost/')->init();
-        $this->assertSame($this->uri->host(), $address);
+        $this->assertSame($address, $this->uri->host());
         //Host is set to localhost when running from local
         $this->uri->initializeWithURL('http://google.com/')->init();
-        $this->assertSame($this->uri->host(), $address);
+        $this->assertSame($address, $this->uri->host());
     }
 
     public function testPort()
     {
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->port(), '80');
+        $this->assertSame('80', $this->uri->port());
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($this->uri->port(), 8080);
+        $this->assertSame(8080, $this->uri->port());
         $this->uri->initializeWithURL('http://localhost:443/a-page')->init();
-        $this->assertSame($this->uri->port(), 443);
+        $this->assertSame(443, $this->uri->port());
         $this->uri->initializeWithURL('https://localhost/a-page')->init();
-        $this->assertSame($this->uri->port(), '80');
+        $this->assertSame('80', $this->uri->port());
     }
 
     public function testEnvironment()
@@ -272,51 +272,51 @@ class UriTest extends \Codeception\TestCase\Test
         }
 
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->environment(), $address);
+        $this->assertSame($address, $this->uri->environment());
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($this->uri->environment(), $address);
+        $this->assertSame($address, $this->uri->environment());
         $this->uri->initializeWithURL('http://foobar.it:443/a-page')->init();
-        $this->assertSame($this->uri->environment(), $address);
+        $this->assertSame($address, $this->uri->environment());
         $this->uri->initializeWithURL('https://google.com/a-page')->init();
-        $this->assertSame($this->uri->environment(), $address);
+        $this->assertSame($address, $this->uri->environment());
     }
 
     public function testBasename()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->assertSame('ueper', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->basename(), 'it');
+        $this->assertSame('it', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($this->uri->basename(), 'it');
+        $this->assertSame('it', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->assertSame('ueper', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->assertSame('ueper', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->assertSame('ueper', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->assertSame('ueper', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->basename(), 'd');
+        $this->assertSame('d', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->basename(), 'f');
+        $this->assertSame('f', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost/')->init();
-        $this->assertSame($this->uri->basename(), '');
+        $this->assertSame('', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost/test.xml')->init();
-        $this->assertSame($this->uri->basename(), 'test.xml');
+        $this->assertSame('test.xml', $this->uri->basename());
     }
 
     public function testBase()
     {
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->base(), 'http://localhost');
+        $this->assertSame('http://localhost', $this->uri->base());
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($this->uri->base(), 'http://localhost:8080');
+        $this->assertSame('http://localhost:8080', $this->uri->base());
         $this->uri->initializeWithURL('http://foobar.it:80/a-page')->init();
-        $this->assertSame($this->uri->base(), 'http://foobar.it');
+        $this->assertSame('http://foobar.it', $this->uri->base());
         $this->uri->initializeWithURL('https://google.com/a-page')->init();
-        $this->assertSame($this->uri->base(), 'http://google.com');
+        $this->assertSame('http://google.com', $this->uri->base());
     }
 
     public function testRootUrl()
@@ -324,45 +324,45 @@ class UriTest extends \Codeception\TestCase\Test
         //Without explicitly adding the root path via `initializeWithUrlAndRootPath`,
         //tests always default to the base empty root path
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->rootUrl(true), 'http://localhost');
+        $this->assertSame('http://localhost', $this->uri->rootUrl(true));
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($this->uri->rootUrl(true), 'http://localhost:8080');
+        $this->assertSame('http://localhost:8080', $this->uri->rootUrl(true));
         $this->uri->initializeWithURL('http://foobar.it:80/a-page')->init();
-        $this->assertSame($this->uri->rootUrl(true), 'http://foobar.it');
+        $this->assertSame('http://foobar.it', $this->uri->rootUrl(true));
         $this->uri->initializeWithURL('https://google.com/a-page/xxx')->init();
-        $this->assertSame($this->uri->rootUrl(true), 'http://google.com');
+        $this->assertSame('http://google.com', $this->uri->rootUrl(true));
 
         $this->uri->initializeWithUrlAndRootPath('https://localhost/grav/page-foo', '/grav')->init();
-        $this->assertSame($this->uri->rootUrl(), '/grav');
-        $this->assertSame($this->uri->rootUrl(true), 'http://localhost/grav');
+        $this->assertSame('/grav', $this->uri->rootUrl());
+        $this->assertSame('http://localhost/grav', $this->uri->rootUrl(true));
     }
 
     public function testCurrentPage()
     {
         $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame($this->uri->currentPage(), 'test');
+        $this->assertSame('test', $this->uri->currentPage());
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($this->uri->currentPage(), 1);
+        $this->assertSame(1, $this->uri->currentPage());
         $this->uri->initializeWithURL('http://localhost:8080/a-page/page:2')->init();
-        $this->assertSame($this->uri->currentPage(), '2');
+        $this->assertSame('2', $this->uri->currentPage());
         $this->uri->initializeWithURL('http://localhost:8080/a-page/page:x')->init();
-        $this->assertSame($this->uri->currentPage(), 'x');
+        $this->assertSame('x', $this->uri->currentPage());
         $this->uri->initializeWithURL('http://localhost:8080/a-page/page:')->init();
-        $this->assertSame($this->uri->currentPage(), '');
+        $this->assertSame('', $this->uri->currentPage());
     }
 
     public function testReferrer()
     {
         $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame($this->uri->referrer(), '/foo');
+        $this->assertSame('/foo', $this->uri->referrer());
         $this->uri->initializeWithURL('http://localhost/foo/bar/page:test')->init();
-        $this->assertSame($this->uri->referrer(), '/foo/bar');
+        $this->assertSame('/foo/bar', $this->uri->referrer());
     }
 
     public function testIp()
     {
         $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame($this->uri->ip(), 'UNKNOWN');
+        $this->assertSame('UNKNOWN', $this->uri->ip());
     }
 
     public function testIsExternal()
@@ -382,7 +382,7 @@ class UriTest extends \Codeception\TestCase\Test
             'port'   => '8080',
         ];
 
-        $this->assertSame(Uri::buildUrl($parsed_url), 'http://localhost:8080');
+        $this->assertSame('http://localhost:8080', Uri::buildUrl($parsed_url));
 
         $parsed_url = [
             'scheme'   => 'http',
@@ -395,7 +395,7 @@ class UriTest extends \Codeception\TestCase\Test
             'fragment' => 'xxx',
         ];
 
-        $this->assertSame(Uri::buildUrl($parsed_url), 'http://foo:bar@localhost:8080/test?x=2#xxx');
+        $this->assertSame('http://foo:bar@localhost:8080/test?x=2#xxx', Uri::buildUrl($parsed_url));
     }
 
     public function testConvertUrl()
@@ -411,7 +411,7 @@ class UriTest extends \Codeception\TestCase\Test
 
         $this->uri->initializeWithURL(Uri::addNonce($url, 'test-action'))->init();
         $this->assertTrue(is_string($this->uri->param('nonce')));
-        $this->assertSame($this->uri->param('nonce'), Utils::getNonce('test-action'));
+        $this->assertSame(Utils::getNonce('test-action'), $this->uri->param('nonce'));
     }
 }
 
diff --git a/tests/unit/Grav/Common/UtilsTest.php b/tests/unit/Grav/Common/UtilsTest.php
index c6dbec24e..96761282e 100644
--- a/tests/unit/Grav/Common/UtilsTest.php
+++ b/tests/unit/Grav/Common/UtilsTest.php
@@ -215,8 +215,8 @@ class UtilsTest extends \Codeception\TestCase\Test
     public function testDate2timestamp()
     {
         $timestamp = strtotime('10 September 2000');
-        $this->assertSame(Utils::date2timestamp('10 September 2000'), $timestamp);
-        $this->assertSame(Utils::date2timestamp('2000-09-10 00:00:00'), $timestamp);
+        $this->assertSame($timestamp, Utils::date2timestamp('10 September 2000'));
+        $this->assertSame($timestamp, Utils::date2timestamp('2000-09-10 00:00:00'));
     }
 
     public function testResolve()