diff --git a/tests/RouterTest.php b/tests/RouterTest.php
index 8ed272e..f18eaba 100644
--- a/tests/RouterTest.php
+++ b/tests/RouterTest.php
@@ -208,6 +208,57 @@ class RouterTest extends TestCase
         $this->check('before/after');
     }
 
+    public function testUrlParametersWithRealSlash()
+    {
+        $this->router->map('/redirect/@id', function ($id) {
+            echo $id;
+        });
+        $this->request->url = '/redirect/before/after';
+
+        $this->check('404');
+    }
+
+    public function testUrlParametersWithJapanese()
+    {
+        $this->router->map('/わたしはひとです', function () {
+            echo 'はい';
+        });
+        $this->request->url = '/わたしはひとです';
+
+        $this->check('はい');
+    }
+
+    public function testUrlParametersWithJapaneseAndParam()
+    {
+        $this->router->map('/わたしはひとです/@name', function ($name) {
+            echo $name;
+        });
+        $this->request->url = '/'.urlencode('わたしはひとです').'/'.urlencode('ええ');
+
+        $this->check('ええ');
+    }
+
+    // Passing URL parameters matched with regular expression for a URL containing Cyrillic letters:
+    public function testRegExParametersCyrillic()
+    {
+        $this->router->map('/категория/@name:[абвгдеёжзийклмнопрстуфхцчшщъыьэюя]+', function ($name) {
+            echo $name;
+        });
+        $this->request->url = '/'.urlencode('категория').'/'.urlencode('цветя');
+
+        $this->check('цветя');
+    }
+
+    public function testRegExOnlyCyrillicUrl()
+    {
+        $this->router->map('/категория/цветя', function () {
+            echo 'цветя';
+        });
+        $this->request->url = '/категория/цветя';
+
+        $this->check('цветя');
+    }
+
     // Passing URL parameters matched with regular expression
     public function testRegExParameters()
     {
@@ -394,17 +445,6 @@ class RouterTest extends TestCase
         $this->check('404');
     }
 
-    // Passing URL parameters matched with regular expression for a URL containing Cyrillic letters:
-    public function testRegExParametersCyrillic()
-    {
-        $this->router->map('/категория/@name:[абвгдеёжзийклмнопрстуфхцчшщъыьэюя]+', function ($name) {
-            echo $name;
-        });
-        $this->request->url = '/' . urlencode('категория') . '/' . urlencode('цветя');
-
-        $this->check('цветя');
-    }
-
     public function testGetAndClearRoutes()
     {
         $this->router->map('/path1', [$this, 'ok']);
diff --git a/tests/server/LayoutMiddleware.php b/tests/server/LayoutMiddleware.php
index e0dacbc..b2e59bb 100644
--- a/tests/server/LayoutMiddleware.php
+++ b/tests/server/LayoutMiddleware.php
@@ -78,6 +78,9 @@ class LayoutMiddleware
 <li><a href="/redirect">Redirect</a></li>
 <li><a href="/streamResponse">Stream</a></li>
 <li><a href="/overwrite">Overwrite Body</a></li>
+<li><a href="/redirect/before%2Fafter">Slash in Param</a></li>
+<li><a href="/わたしはひとです">UTF8 URL</a></li>
+<li><a href="/わたしはひとです/ええ">UTF8 URL w/ Param</a></li>
 </ul>
 HTML;
         echo '<div id="container">';
diff --git a/tests/server/index.php b/tests/server/index.php
index 040cbfc..d88ac85 100644
--- a/tests/server/index.php
+++ b/tests/server/index.php
@@ -124,6 +124,21 @@ Flight::group('', function () {
     Flight::route('/overwrite', function () {
         echo '<span id="infotext">Route text:</span> This route status is that it <span style="color:red; font-weight: bold;">failed</span>';
     })->addMiddleware([new OverwriteBodyMiddleware()]);
+
+    // Test 15: UTF8 Chars in url
+    Flight::route('/わたしはひとです', function () {
+        echo '<span id="infotext">Route text:</span> This route status is that it <span style="color:green; font-weight: bold;">succeeded はい!!!</span>';
+    });
+
+    // Test 16: UTF8 Chars in url with utf8 params
+    Flight::route('/わたしはひとです/@name', function ($name) {
+        echo '<span id="infotext">Route text:</span> This route status is that it <span style="color:'.($name === 'ええ' ? 'green' : 'red').'; font-weight: bold;">'.($name === 'ええ' ? 'succeeded' : 'failed').' URL Param: '.$name.'</span>';
+    });
+
+    // Test 17: Slash in param
+    Flight::route('/redirect/@id', function ($id) {
+        echo '<span id="infotext">Route text:</span> This route status is that it <span style="color:'.($id === 'before/after' ? 'green' : 'red').'; font-weight: bold;">'.($id === 'before/after' ? 'succeeded' : 'failed').' URL Param: '.$id.'</span>';
+    });
 }, [ new LayoutMiddleware() ]);
 
 // Test 9: JSON output (should not output any other html)