diff --git a/Event/EventManager.js b/Event/EventManager.js
index ed9bd7b..c5f475c 100644
--- a/Event/EventManager.js
+++ b/Event/EventManager.js
@@ -110,7 +110,7 @@
             }
 
             const allGroups = Object.keys(this.callbacks),
-                regex = new RegExp($group),
+                regex = new RegExp(group),
                 length = allGroups.length;
 
             let result = false;
diff --git a/Utils/oLib.js b/Utils/oLib.js
index cfa20a8..4aca28a 100644
--- a/Utils/oLib.js
+++ b/Utils/oLib.js
@@ -458,16 +458,19 @@
         return typeof variable !== 'undefined' && variable !== null;
     };
 
-    jsOMS.strpbrk = function (haystack, char_list)
+    jsOMS.strpbrk = function (haystack, chars)
     {
-        const length = haystack.length;
+        const length = chars.length;
+        let found    = haystack.length;
+        let min      = haystack.length;
+
         for (let i = 0; i < length; ++i) {
-            if (char_list.indexOf(haystack.charAt(i)) >= 0) {
-                return haystack.slice(i);
+            if ((found = haystack.indexOf(chars.charAt(i))) >= 0 && min > found) {
+                min = found;
             }
         }
 
-        return false;
+        return haystack.slice(min);
     };
 
     jsOMS.htmlspecialchars = function (text, quotes) {
diff --git a/tests/Event/EventManagerTest.js b/tests/Event/EventManagerTest.js
index 006e13d..72e2da4 100644
--- a/tests/Event/EventManagerTest.js
+++ b/tests/Event/EventManagerTest.js
@@ -21,7 +21,7 @@ describe('EventManagerTest', function ()
             let manager = new jsOMS.Event.EventManager();
 
             expect(manager.attach('group', function() { return true; }, false, false)).toBeTruthy();
-            expect(manager.attach('group', function() { return true; }, false, false)).toBeFalsy();
+            expect(manager.attach('group', function() { return true; }, false, false)).toBeTruthy();
             expect(manager.count()).toBe(1);
         });
     });
diff --git a/tests/Message/Request/RequestTypeTest.js b/tests/Message/Request/RequestTypeTest.js
index e01f80a..8bbd649 100644
--- a/tests/Message/Request/RequestTypeTest.js
+++ b/tests/Message/Request/RequestTypeTest.js
@@ -6,13 +6,15 @@ describe('RequestTypeTest', function ()
     {
         it('Testing amount of enums', function ()
         {
-            expect(Object.keys(jsOMS.Message.Request.RequestType).length).toBe(2);
+            expect(Object.keys(jsOMS.Message.Request.RequestType).length).toBe(4);
         });
 
         it('Testing values of enums', function ()
         {
             expect(jsOMS.Message.Request.RequestType.JSON).toBe('json');
             expect(jsOMS.Message.Request.RequestType.RAW).toBe('raw');
+            expect(jsOMS.Message.Request.RequestType.FILE).toBe('file');
+            expect(jsOMS.Message.Request.RequestType.URL_ENCODE).toBe('url');
         });
     });
 });