diff --git a/Uri/UriFactory.js b/Uri/UriFactory.js
index b5c533f..6cfd4e1 100644
--- a/Uri/UriFactory.js
+++ b/Uri/UriFactory.js
@@ -45,7 +45,7 @@
          *
          * @param {string} key
          *
-         * @return {string}
+         * @return {null|string}
          *
          * @method
          *
@@ -53,11 +53,7 @@
          */
         static getQuery (key)
         {
-            if (!jsOMS.Uri.UriFactory.uri.hasOwnProperty(key)) {
-                return '';
-            }
-
-            return jsOMS.Uri.UriFactory.uri[key];
+            return jsOMS.Uri.UriFactory.uri.hasOwnProperty(key) ? jsOMS.Uri.UriFactory.uri[key] : null;
         };
 
         /**
diff --git a/tests/SpecRunner.html b/tests/SpecRunner.html
index 144f7b6..b06158e 100644
--- a/tests/SpecRunner.html
+++ b/tests/SpecRunner.html
@@ -4,25 +4,25 @@
     <meta charset="utf-8">
     <title>Framework Test Suit</title>
 
-    <link rel="shortcut icon" type="image/png" href="../jasmine/lib/jasmine-2.7.0/jasmine_favicon.png">
-    <link rel="stylesheet" href="../jasmine/lib/jasmine-2.7.0/jasmine.css">
+    <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-3.1.0/jasmine_favicon.png">
+    <link rel="stylesheet" href="jasmine/lib/jasmine-3.1.0/jasmine.css">
 
     <!-- jasmine -->
-    <script src="../jasmine/lib/jasmine-2.7.0/jasmine.js"></script>
-    <script src="../jasmine/lib/jasmine-2.7.0/jasmine-html.js"></script>
-    <script src="../jasmine/lib/jasmine-2.7.0/boot.js"></script>
+    <script src="jasmine/lib/jasmine-3.1.0/jasmine.js"></script>
+    <script src="jasmine/lib/jasmine-3.1.0/jasmine-html.js"></script>
+    <script src="jasmine/lib/jasmine-3.1.0/boot.js"></script>
 
     <!-- include source files here... -->
-    <script src="../../../jsOMS/Utils/oLib.js"></script>
+    <script src="../Utils/oLib.js"></script>
 
     <!-- include source files here... -->
-    <script src="../../../jsOMS/Asset/AssetManager.js"></script>
-    <script src="../../../jsOMS/Autoloader.js"></script>
+    <script src="../Asset/AssetManager.js"></script>
+    <script src="../Autoloader.js"></script>
 
-    <script src="../../../jsOMS/Uri/Http.js"></script>
-    <script src="../../../jsOMS/Uri/UriFactory.js"></script>
+    <script src="../Uri/Http.js"></script>
+    <script src="../Uri/UriFactory.js"></script>
 
-    <script src="../../../jsOMS/Views/FormView.js"></script>
+    <script src="../Views/FormView.js"></script>
 
     <!-- include spec files here... -->
     <script src="Uri/HttpTest.js"></script>
diff --git a/tests/Uri/UriFactoryTest.js b/tests/Uri/UriFactoryTest.js
index 01b01a7..504c16a 100644
--- a/tests/Uri/UriFactoryTest.js
+++ b/tests/Uri/UriFactoryTest.js
@@ -41,6 +41,11 @@ describe('UriFactoryTest', function ()
     {
         it('Testing query clearing', function ()
         {
+            jsOMS.Uri.UriFactory.setQuery('Valid', 'query1');
+            jsOMS.Uri.UriFactory.setQuery('Valid', 'query2', true);
+            jsOMS.Uri.UriFactory.setQuery('Valid', 'query3', false);
+            jsOMS.Uri.UriFactory.setQuery('/valid2', 'query4');
+
             expect(jsOMS.Uri.UriFactory.clear('Valid')).toBeTruthy();
             expect(jsOMS.Uri.UriFactory.clear('Valid')).toBeFalsy();
             expect(jsOMS.Uri.UriFactory.getQuery('Valid')).toBe(null);