diff --git a/.jshintrc b/.jshintrc
index 6308c85..df914bc 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,14 +1,15 @@
 {
   "globals": {
-    "urlParser": true,
-    "getTime": true,
-    "assertURLTestPairs": true,
-    "QUnit": true
+    "urlParser":     true,
+    "getTime":       true,
+    "assertUrlTest": true,
+    "QUnit":         true,
+    "cloneObject":   true
   },
+  "newcap":    false,
   "boss":      true,
   "node":      true,
   "strict":    true,
-  "newcap":    false,
   "undef":     true,
   "unused":    true,
   "onecase":   true,
diff --git a/bower.json b/bower.json
index 23d768a..e2dbf34 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jsVideoUrlParser",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "homepage": "https://github.com/Zod-/jsVideoUrlParser",
   "authors": [{
     "name": "Julian Hangstörfer",
diff --git a/dist/jsVideoUrlParser.js b/dist/jsVideoUrlParser.js
index 95cd80f..b843521 100644
--- a/dist/jsVideoUrlParser.js
+++ b/dist/jsVideoUrlParser.js
@@ -101,14 +101,14 @@ urlParser.bind({
     "use strict";
     var vi = op.videoInfo;
     if (vi.startTime) {
-      return 'https://www.dailymotion.com/video/' + vi.id + '?start=' + vi.startTime;
+      return 'https://dailymotion.com/video/' + vi.id + '?start=' + vi.startTime;
     }
 
     if (op.format === 'short') {
       return 'https://dai.ly/' + vi.id;
     }
 
-    return 'https://www.dailymotion.com/video/' + vi.id;
+    return 'https://dailymotion.com/video/' + vi.id;
   }
 });
 
@@ -228,19 +228,19 @@ urlParser.bind({
     var url,
       vi = op.videoInfo;
     if (vi.mediaType === 'playlist') {
-      return 'https://www.youtube.com/playlist?feature=share&list=' + vi.playlistId;
+      return 'https://youtube.com/playlist?feature=share&list=' + vi.playlistId;
     }
 
     if (vi.playlistId) {
-      url = 'https://www.youtube.com/watch?v=' + vi.id + '&list=' + vi.playlistId;
+      url = 'https://youtube.com/watch?v=' + vi.id + '&list=' + vi.playlistId;
       if (vi.playlistIndex) {
-        url += '&index={0}'.format(vi.playlistIndex);
+        url += '&index=' + vi.playlistIndex;
       }
     } else {
       if (op.format === 'short') {
         url = 'https://youtu.be/' + vi.id;
       } else {
-        url = 'https://www.youtube.com/watch?v=' + vi.id;
+        url = 'https://youtube.com/watch?v=' + vi.id;
       }
     }
 
diff --git a/dist/jsVideoUrlParser.min.js b/dist/jsVideoUrlParser.min.js
index 32cf5d7..7715223 100644
--- a/dist/jsVideoUrlParser.min.js
+++ b/dist/jsVideoUrlParser.min.js
@@ -1 +1 @@
-function URLParser(){"use strict";this.plugins={}}function getTime(a){"use strict";var b,c=0,d={s:1,m:60,h:3600,d:86400,w:604800};if(!a.match(/^(\d+[smhdw]?)+$/))return 0;a=a.replace(/([smhdw])/g," $1 ").trim(),b=a.split(" ");for(var e=0;e<b.length;e+=2)c+=parseInt(b[e],10)*d[b[e+1]||"s"];return c}URLParser.prototype.parse=function(a){"use strict";var b,c=this,d=a.match(/(?:https?:\/\/)?(?:[^\.]+\.)?(\w+)\./i),e=d?d[1]:void 0;return d&&e&&c.plugins[e]&&(b=c.plugins[e].parse.call(this,a))?(b.provider=c.plugins[e].provider,b):void 0},URLParser.prototype.bind=function(a){"use strict";var b=this;if(b.plugins[a.provider]=a,a.alternatives){var c;for(c=0;c<a.alternatives.length;c+=1)b.plugins[a.alternatives[c]]=a}},URLParser.prototype.create=function(a){"use strict";var b=this,c=a.videoInfo;return a.format=a.format||"short",b.plugins[c.provider].create?b.plugins[c.provider].create.call(this,a):void 0};var urlParser=new URLParser;urlParser.bind({provider:"dailymotion",alternatives:["dai"],parse:function(a){"use strict";var b,c,d,e={};return b=a.match(/(?:\/video|ly)\/([A-Za-z0-9]+)/i),c=b?b[1]:void 0,b=a.match(/[#\?&]start=([A-Za-z0-9]+)/i),d=b?getTime(b[1]):void 0,c?(e.mediaType="video",e.id=c,d&&(e.startTime=d),e):void 0},create:function(a){"use strict";var b=a.videoInfo;return b.startTime?"https://www.dailymotion.com/video/"+b.id+"?start="+b.startTime:"short"===a.format?"https://dai.ly/"+b.id:"https://www.dailymotion.com/video/"+b.id}}),urlParser.bind({provider:"twitch",parse:function(a){"use strict";var b,c,d,e,f={};return b=a.match(/twitch\.tv\/(\w+)(?:\/(.)\/(\d+))?/i),d=b?b[1]:void 0,e=b?b[2]:void 0,c=b?b[3]:void 0,b=a.match(/(?:\?channel|\&utm_content)=(\w+)/i),(d=b?b[1]:d)?(c?(f.mediaType="video",f.id=c,f.idPrefix=e):f.mediaType="stream",f.channel=d,f):void 0},create:function(a){"use strict";var b=a.videoInfo;return"stream"===b.mediaType?"https://twitch.tv/"+b.channel:"https://twitch.tv/"+b.channel+"/"+b.idPrefix+"/"+b.id}}),urlParser.bind({provider:"vimeo",alternatives:["vimeopro"],parse:function(a){"use strict";var b,c;return b=a.match(/(?:\/(?:channels\/[\w]+|(?:album\/\d+\/)?videos?))?\/(\d+)/i),c=b?b[1]:void 0,c?{mediaType:"video",id:c}:void 0},create:function(a){"use strict";return"https://vimeo.com/"+a.videoInfo.id}}),urlParser.bind({provider:"youtube",alternatives:["youtu"],parse:function(a){"use strict";var b,c,d,e,f,g={};if(b=a.match(/(?:(?:v|be|videos)\/|v=)([\w\-]{11})/i),c=b?b[1]:void 0,b=a.match(/list=([\w\-]+)/i),d=b?b[1]:void 0,b=a.match(/index=(\d+)/i),e=b?Number(b[1]):void 0,b=a.match(/[#\?&](?:star)?t=([A-Za-z0-9]+)/i),f=b?getTime(b[1]):void 0,c)g.mediaType="video",g.id=c,d&&(g.playlistId=d,e&&(g.playlistIndex=e)),f&&(g.startTime=f);else{if(!d)return void 0;g.mediaType="playlist",g.playlistId=d}return g},create:function(a){"use strict";var b,c=a.videoInfo;return"playlist"===c.mediaType?"https://www.youtube.com/playlist?feature=share&list="+c.playlistId:(c.playlistId?(b="https://www.youtube.com/watch?v="+c.id+"&list="+c.playlistId,c.playlistIndex&&(b+="&index={0}".format(c.playlistIndex))):b="short"===a.format?"https://youtu.be/"+c.id:"https://www.youtube.com/watch?v="+c.id,c.startTime&&(b+="#t="+c.startTime),b)}});
\ No newline at end of file
+function URLParser(){"use strict";this.plugins={}}function getTime(a){"use strict";var b,c=0,d={s:1,m:60,h:3600,d:86400,w:604800};if(!a.match(/^(\d+[smhdw]?)+$/))return 0;a=a.replace(/([smhdw])/g," $1 ").trim(),b=a.split(" ");for(var e=0;e<b.length;e+=2)c+=parseInt(b[e],10)*d[b[e+1]||"s"];return c}URLParser.prototype.parse=function(a){"use strict";var b,c=this,d=a.match(/(?:https?:\/\/)?(?:[^\.]+\.)?(\w+)\./i),e=d?d[1]:void 0;return d&&e&&c.plugins[e]&&(b=c.plugins[e].parse.call(this,a))?(b.provider=c.plugins[e].provider,b):void 0},URLParser.prototype.bind=function(a){"use strict";var b=this;if(b.plugins[a.provider]=a,a.alternatives){var c;for(c=0;c<a.alternatives.length;c+=1)b.plugins[a.alternatives[c]]=a}},URLParser.prototype.create=function(a){"use strict";var b=this,c=a.videoInfo;return a.format=a.format||"short",b.plugins[c.provider].create?b.plugins[c.provider].create.call(this,a):void 0};var urlParser=new URLParser;urlParser.bind({provider:"dailymotion",alternatives:["dai"],parse:function(a){"use strict";var b,c,d,e={};return b=a.match(/(?:\/video|ly)\/([A-Za-z0-9]+)/i),c=b?b[1]:void 0,b=a.match(/[#\?&]start=([A-Za-z0-9]+)/i),d=b?getTime(b[1]):void 0,c?(e.mediaType="video",e.id=c,d&&(e.startTime=d),e):void 0},create:function(a){"use strict";var b=a.videoInfo;return b.startTime?"https://dailymotion.com/video/"+b.id+"?start="+b.startTime:"short"===a.format?"https://dai.ly/"+b.id:"https://dailymotion.com/video/"+b.id}}),urlParser.bind({provider:"twitch",parse:function(a){"use strict";var b,c,d,e,f={};return b=a.match(/twitch\.tv\/(\w+)(?:\/(.)\/(\d+))?/i),d=b?b[1]:void 0,e=b?b[2]:void 0,c=b?b[3]:void 0,b=a.match(/(?:\?channel|\&utm_content)=(\w+)/i),(d=b?b[1]:d)?(c?(f.mediaType="video",f.id=c,f.idPrefix=e):f.mediaType="stream",f.channel=d,f):void 0},create:function(a){"use strict";var b=a.videoInfo;return"stream"===b.mediaType?"https://twitch.tv/"+b.channel:"https://twitch.tv/"+b.channel+"/"+b.idPrefix+"/"+b.id}}),urlParser.bind({provider:"vimeo",alternatives:["vimeopro"],parse:function(a){"use strict";var b,c;return b=a.match(/(?:\/(?:channels\/[\w]+|(?:album\/\d+\/)?videos?))?\/(\d+)/i),c=b?b[1]:void 0,c?{mediaType:"video",id:c}:void 0},create:function(a){"use strict";return"https://vimeo.com/"+a.videoInfo.id}}),urlParser.bind({provider:"youtube",alternatives:["youtu"],parse:function(a){"use strict";var b,c,d,e,f,g={};if(b=a.match(/(?:(?:v|be|videos)\/|v=)([\w\-]{11})/i),c=b?b[1]:void 0,b=a.match(/list=([\w\-]+)/i),d=b?b[1]:void 0,b=a.match(/index=(\d+)/i),e=b?Number(b[1]):void 0,b=a.match(/[#\?&](?:star)?t=([A-Za-z0-9]+)/i),f=b?getTime(b[1]):void 0,c)g.mediaType="video",g.id=c,d&&(g.playlistId=d,e&&(g.playlistIndex=e)),f&&(g.startTime=f);else{if(!d)return void 0;g.mediaType="playlist",g.playlistId=d}return g},create:function(a){"use strict";var b,c=a.videoInfo;return"playlist"===c.mediaType?"https://youtube.com/playlist?feature=share&list="+c.playlistId:(c.playlistId?(b="https://youtube.com/watch?v="+c.id+"&list="+c.playlistId,c.playlistIndex&&(b+="&index="+c.playlistIndex)):b="short"===a.format?"https://youtu.be/"+c.id:"https://youtube.com/watch?v="+c.id,c.startTime&&(b+="#t="+c.startTime),b)}});
\ No newline at end of file
diff --git a/package.json b/package.json
index 7110e87..607da49 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "videoUrlParser",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A parser to extract provider, video id, starttime and others from YouTube, Vimeo, ... urls",
   "main": "Gruntfile.js",
   "repository": {
diff --git a/src/plugins/provider/Dailymotion.js b/src/plugins/provider/Dailymotion.js
index f173887..20af5c9 100644
--- a/src/plugins/provider/Dailymotion.js
+++ b/src/plugins/provider/Dailymotion.js
@@ -28,13 +28,13 @@ urlParser.bind({
     "use strict";
     var vi = op.videoInfo;
     if (vi.startTime) {
-      return 'https://www.dailymotion.com/video/' + vi.id + '?start=' + vi.startTime;
+      return 'https://dailymotion.com/video/' + vi.id + '?start=' + vi.startTime;
     }
 
     if (op.format === 'short') {
       return 'https://dai.ly/' + vi.id;
     }
 
-    return 'https://www.dailymotion.com/video/' + vi.id;
+    return 'https://dailymotion.com/video/' + vi.id;
   }
 });
diff --git a/src/plugins/provider/YouTube.js b/src/plugins/provider/YouTube.js
index a47c4b3..597ceed 100644
--- a/src/plugins/provider/YouTube.js
+++ b/src/plugins/provider/YouTube.js
@@ -48,19 +48,19 @@ urlParser.bind({
     var url,
       vi = op.videoInfo;
     if (vi.mediaType === 'playlist') {
-      return 'https://www.youtube.com/playlist?feature=share&list=' + vi.playlistId;
+      return 'https://youtube.com/playlist?feature=share&list=' + vi.playlistId;
     }
 
     if (vi.playlistId) {
-      url = 'https://www.youtube.com/watch?v=' + vi.id + '&list=' + vi.playlistId;
+      url = 'https://youtube.com/watch?v=' + vi.id + '&list=' + vi.playlistId;
       if (vi.playlistIndex) {
-        url += '&index={0}'.format(vi.playlistIndex);
+        url += '&index=' + vi.playlistIndex;
       }
     } else {
       if (op.format === 'short') {
         url = 'https://youtu.be/' + vi.id;
       } else {
-        url = 'https://www.youtube.com/watch?v=' + vi.id;
+        url = 'https://youtube.com/watch?v=' + vi.id;
       }
     }
 
diff --git a/tests/src/assertPair.js b/tests/src/assertPair.js
deleted file mode 100644
index a6472b4..0000000
--- a/tests/src/assertPair.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*jshint unused:false */
-function assertURLTestPairs(assert, testPairs) {
-/*jshint unused:true */
-  "use strict";
-  for (var url in testPairs) {
-    if (testPairs.hasOwnProperty(url)) {
-      assert.deepEqual(urlParser.parse(url), testPairs[url], url);
-    }
-  }
-}
diff --git a/tests/src/assertUrlTest.js b/tests/src/assertUrlTest.js
new file mode 100644
index 0000000..c903329
--- /dev/null
+++ b/tests/src/assertUrlTest.js
@@ -0,0 +1,38 @@
+/*jshint unused:false */
+function cloneObject(obj) {
+  /*jshint unused:true */
+  "use strict";
+  if (obj === null || typeof obj !== 'object') {
+    return obj;
+  }
+
+  var temp = obj.constructor(); // give temp the original obj's constructor
+  for (var key in obj) {
+    temp[key] = cloneObject(obj[key]);
+  }
+
+  return temp;
+}
+
+/*jshint unused:false */
+function assertUrlTest(assert, tests) {
+  /*jshint unused:true */
+  "use strict";
+  tests.forEach(function (test) {
+    test.urls.forEach(function (url) {
+      assert.deepEqual(urlParser.parse(url), test.videoInfo, url);
+    });
+    
+    assert.equal(urlParser.create({
+      videoInfo: test.videoInfo,
+      format: 'long'
+    }), test.createdUrl, JSON.stringify(test.videoInfo));
+
+    if (test.hasOwnProperty('createdShortUrl')) {
+      assert.equal(urlParser.create({
+        videoInfo: test.videoInfo,
+        format: 'short'
+      }), test.createdShortUrl, JSON.stringify(test.videoInfo));
+    }
+  });
+}
diff --git a/tests/src/plugins/provider/Dailymotion.js b/tests/src/plugins/provider/Dailymotion.js
index fbf70c5..21c4cca 100644
--- a/tests/src/plugins/provider/Dailymotion.js
+++ b/tests/src/plugins/provider/Dailymotion.js
@@ -1,25 +1,28 @@
-QUnit.test("Dailymotion URLs", function(assert) {
+QUnit.test("Dailymotion URLs", function (assert) {
   "use strict";
-  var expected1 = {
+  var vi = {
       'provider': 'dailymotion',
       'id': 'x1e2b95',
       'mediaType': 'video'
     },
-    expected2 = {
-      'provider': 'dailymotion',
-      'id': 'x1e2b95',
-      'mediaType': 'video',
-      startTime: 10
-    },
-    testPairs = {
-      'http://www.dailymotion.com/video/x1e2b95_bruce-lee-nin-kayip-kedisi_animals': expected1,
-      'http://www.dailymotion.com/video/x1e2b95_bruce-lee-nin-kayip-kedisi_animals?start=10': expected2,
-      'http://www.dailymotion.com/video/x1e2b95': expected1,
-      'http://www.dailymotion.com/video/x1e2b95?start=10': expected2,
-      'http://dai.ly/x1e2b95': expected1,
-      'http://www.dailymotion.com/embed/video/x1e2b95': expected1,
-      'http://www.dailymotion.com/embed/video/x1e2b95?start=10': expected2
-    };
+    tests = [{
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://dailymotion.com/video/x1e2b95',
+      createdShortUrl: 'https://dai.ly/x1e2b95',
+      urls: ['http://www.dailymotion.com/video/x1e2b95_bruce-lee-nin-kayip-kedisi_animals',
+        'http://www.dailymotion.com/video/x1e2b95',
+        'http://dai.ly/x1e2b95',
+        'http://www.dailymotion.com/embed/video/x1e2b95'
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://dailymotion.com/video/x1e2b95?start=10',
+      urls: ['http://www.dailymotion.com/video/x1e2b95?start=10',
+        'http://www.dailymotion.com/video/x1e2b95_bruce-lee-nin-kayip-kedisi_animals?start=10',
+        'http://www.dailymotion.com/embed/video/x1e2b95?start=10'
+      ]
+    }];
+  tests[1].videoInfo.startTime = 10;
 
-  assertURLTestPairs(assert, testPairs);
+  assertUrlTest(assert, tests);
 });
diff --git a/tests/src/plugins/provider/Twitch.js b/tests/src/plugins/provider/Twitch.js
index 6870dcd..18c4b4e 100644
--- a/tests/src/plugins/provider/Twitch.js
+++ b/tests/src/plugins/provider/Twitch.js
@@ -1,23 +1,24 @@
-QUnit.test("Twitch Stream URLs", function(assert) {
+QUnit.test("Twitch Stream URLs", function (assert) {
   "use strict";
-  var expected1 = {
+  var vi = {
       'provider': 'twitch',
       'channel': 'tsm_wildturtle',
       'mediaType': 'stream'
     },
-    expected2 = {
-      'provider': 'twitch',
-      'channel': 'tsm_wildturtle',
-      'mediaType': 'video',
-      'id': '2724914',
-      "idPrefix": "c"
-    },
-    testPairs = {
-      'http://www.twitch.tv/tsm_wildturtle': expected1,
-      'http://www.twitch.tv/widgets/live_embed_player.swf?channel=tsm_wildturtle': expected1,
-      'http://twitch.tv/tsm_wildturtle/chat?popout=': expected1,
-      'http://www.twitch.tv/tsm_wildturtle/c/2724914': expected2
-    };
-
-  assertURLTestPairs(assert, testPairs);
+    tests = [{
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://twitch.tv/tsm_wildturtle',
+      urls: ['http://www.twitch.tv/tsm_wildturtle',
+        'http://www.twitch.tv/widgets/live_embed_player.swf?channel=tsm_wildturtle',
+        'http://twitch.tv/tsm_wildturtle/chat?popout='
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://twitch.tv/tsm_wildturtle/c/2724914',
+      urls: ['http://www.twitch.tv/tsm_wildturtle/c/2724914']
+    }];
+  tests[1].videoInfo.id = '2724914';
+  tests[1].videoInfo.idPrefix = 'c';
+  tests[1].videoInfo.mediaType = 'video';
+  assertUrlTest(assert, tests);
 });
diff --git a/tests/src/plugins/provider/Vimeo.js b/tests/src/plugins/provider/Vimeo.js
index cd6d67b..012f667 100644
--- a/tests/src/plugins/provider/Vimeo.js
+++ b/tests/src/plugins/provider/Vimeo.js
@@ -1,32 +1,32 @@
-QUnit.test("Vimeo URLs", function(assert) {
+QUnit.test("Vimeo URLs", function (assert) {
   "use strict";
-  var expected1 = {
+  var vi = {
       'provider': 'vimeo',
       'id': '97276391',
       'mediaType': 'video'
     },
-    expected2 = {
-      'provider': 'vimeo',
-      'id': '96186586',
-      'mediaType': 'video'
-    },
-    expected3 = {
-      'provider': 'vimeo',
-      'id': '97688625',
-      'mediaType': 'video'
-    },
-    expected4 = {
-      'provider': 'vimeo',
-      'id': '24069938',
-      'mediaType': 'video'
-    },
-    testPairs = {
-      'https://vimeo.com/97276391': expected1,
-      'https://vimeo.com/channels/staffpicks/97276391': expected1,
-      'https://vimeo.com/album/2903155/video/96186586': expected2,
-      'https://vimeo.com/groups/shortfilms/videos/97688625': expected3,
-      'http://vimeopro.com/staff/frame/video/24069938': expected4
-    };
+    tests = [{
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://vimeo.com/97276391',
+      urls: ['https://vimeo.com/97276391',
+        'https://vimeo.com/channels/staffpicks/97276391'
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://vimeo.com/96186586',
+      urls: ['https://vimeo.com/album/2903155/video/96186586']
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://vimeo.com/97688625',
+      urls: ['https://vimeo.com/groups/shortfilms/videos/97688625']
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://vimeo.com/24069938',
+      urls: ['http://vimeopro.com/staff/frame/video/24069938']
+    }];
 
-  assertURLTestPairs(assert, testPairs);
+  tests[1].videoInfo.id = '96186586';
+  tests[2].videoInfo.id = '97688625';
+  tests[3].videoInfo.id = '24069938';
+  assertUrlTest(assert, tests);
 });
diff --git a/tests/src/plugins/provider/YouTube.js b/tests/src/plugins/provider/YouTube.js
index cfc6bd8..016e2ec 100644
--- a/tests/src/plugins/provider/YouTube.js
+++ b/tests/src/plugins/provider/YouTube.js
@@ -1,95 +1,100 @@
-QUnit.test("Regular YouTube URLs", function(assert) {
+QUnit.test("Regular YouTube URLs", function (assert) {
   "use strict";
-  var expected1 = {
-      'provider': 'youtube',
-      'id': 'HRb7B9fPhfA',
-      'mediaType': 'video',
+  var vi = {
+      provider: 'youtube',
+      id: 'HRb7B9fPhfA',
+      mediaType: 'video',
       startTime: 30
     },
-    expected2 = {
-      'provider': 'youtube',
-      'id': 'HRb7B9fPhfA',
-      'mediaType': 'video'
-    },
-    testPairs = {
-      'http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA#t=30s': expected1,
-      'http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA&t=30s': expected1,
-      'http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA': expected2,
-      'http://youtu.be/HRb7B9fPhfA?t=30s': expected1,
-      'http://youtu.be/HRb7B9fPhfA#t=30s': expected1,
-      'http://youtu.be/HRb7B9fPhfA': expected2,
-      'https://m.youtube.com/details?v=HRb7B9fPhfA#t=30s': expected1,
-      'https://m.youtube.com/details?v=HRb7B9fPhfA': expected2
-    };
+    tests = [{
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=HRb7B9fPhfA#t=30',
+      createdShortUrl: 'https://youtu.be/HRb7B9fPhfA#t=30',
+      urls: ['http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA#t=30s',
+        'http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA&t=30s',
+        'https://m.youtube.com/details?v=HRb7B9fPhfA#t=30s',
+        'http://youtu.be/HRb7B9fPhfA?t=30s',
+        'http://youtu.be/HRb7B9fPhfA#t=30s'
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=HRb7B9fPhfA',
+      createdShortUrl: 'https://youtu.be/HRb7B9fPhfA',
+      urls: ['http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA',
+        'http://youtu.be/HRb7B9fPhfA',
+        'https://m.youtube.com/details?v=HRb7B9fPhfA'
+      ]
+    }];
+  delete tests[1].videoInfo.startTime;
 
-  assertURLTestPairs(assert, testPairs);
+  assertUrlTest(assert, tests);
 });
-QUnit.test("Playlist YouTube URLs", function(assert) {
+QUnit.test("Playlist YouTube URLs", function (assert) {
   "use strict";
-  //https://www.youtube.com/watch?v=AdQcd3sKGC8&list=PL46F0A159EC02DF82&index=9
-  var expected1A = {
-      'provider': 'youtube',
-      'id': 'yQaAGmHNn9s',
-      'playlistId': 'PL46F0A159EC02DF82',
-      'mediaType': 'video',
-      startTime: 100
-    },
-    expected1B = {
-      'provider': 'youtube',
-      'id': 'yQaAGmHNn9s',
-      'playlistId': 'PL46F0A159EC02DF82',
-      'mediaType': 'video'
-    },
-    expected1C = {
-      'provider': 'youtube',
-      'id': '6xLcSTDeB7A',
-      'playlistId': 'PL46F0A159EC02DF82',
-      'playlistIndex': 25,
-      'mediaType': 'video'
-    },
-    expected1D = {
-      'provider': 'youtube',
-      'id': '6xLcSTDeB7A',
-      'playlistId': 'PL46F0A159EC02DF82',
-      'playlistIndex': 25,
-      'mediaType': 'video',
+  var vi = {
+      provider: 'youtube',
+      id: 'yQaAGmHNn9s',
+      playlistId: 'PL46F0A159EC02DF82',
+      mediaType: 'video',
       startTime: 100
     },
+    tests = [{
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82#t=100',
+      urls: ['http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82#t=1m40',
+        'http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82&t=1m40',
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82',
+      urls: ['http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82']
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25',
+      urls: ['https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25',
+        'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82'
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25#t=100',
+      urls: ['https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25#t=1m40',
+        'https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25&t=1m40',
+        'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82&t=1m40',
+        'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82#t=1m40'
+      ]
+    }, {
+      videoInfo: {
+        provider: 'youtube',
+        playlistId: 'PL46F0A159EC02DF82',
+        mediaType: 'playlist'
+      },
+      createdUrl: 'https://youtube.com/playlist?feature=share&list=PL46F0A159EC02DF82',
+      urls: ['http://www.youtube.com/embed/videoseries?list=PL46F0A159EC02DF82',
+        'http://www.youtube.com/playlist?list=PL46F0A159EC02DF82'
+      ]
+    }];
 
-    expected2 = {
-      'provider': 'youtube',
-      'playlistId': 'PL46F0A159EC02DF82',
-      'mediaType': 'playlist'
-    },
-    testPairs = {
-      'http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82#t=1m40': expected1A,
-      'http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82&t=1m40': expected1A,
-      'http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82': expected1B,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25': expected1C,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82': expected1C,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25#t=1m40': expected1D,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25&t=1m40': expected1D,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82&t=1m40': expected1D,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82#t=1m40': expected1D,
-      'http://www.youtube.com/embed/videoseries?list=PL46F0A159EC02DF82': expected2,
-      'http://www.youtube.com/playlist?list=PL46F0A159EC02DF82': expected2,
-    };
-
-  assertURLTestPairs(assert, testPairs);
+  delete tests[1].videoInfo.startTime;
+  delete tests[2].videoInfo.startTime;
+  tests[2].videoInfo.playlistIndex = tests[3].videoInfo.playlistIndex = 25;
+  tests[2].videoInfo.id = tests[3].videoInfo.id = '6xLcSTDeB7A';
+  assertUrlTest(assert, tests);
 });
 
-QUnit.test("Feed YouTube URLs", function(assert) {
+QUnit.test("Feed YouTube URLs", function (assert) {
   "use strict";
-  var expected = {
+  var tests = [{
+    videoInfo: {
       'provider': 'youtube',
       'id': 'HRb7B9fPhfA',
       'mediaType': 'video'
     },
-    testPairs = {
-      'https://gdata.youtube.com/feeds/api/videos/HRb7B9fPhfA/related?v=2': expected,
-      'https://gdata.youtube.com/feeds/api/videos/HRb7B9fPhfA?v=2': expected,
-      'https://www.youtube.com/v/HRb7B9fPhfA?version=3&f=videos&app=youtube_gdata': expected
-    };
-
-  assertURLTestPairs(assert, testPairs);
+    createdUrl: 'https://youtube.com/watch?v=HRb7B9fPhfA',
+    createdShortUrl: 'https://youtu.be/HRb7B9fPhfA',
+    urls: ['https://gdata.youtube.com/feeds/api/videos/HRb7B9fPhfA/related?v=2',
+      'https://gdata.youtube.com/feeds/api/videos/HRb7B9fPhfA?v=2',
+      'https://www.youtube.com/v/HRb7B9fPhfA?version=3&f=videos&app=youtube_gdata'
+    ]
+  }];
+  assertUrlTest(assert, tests);
 });
diff --git a/tests/test.js b/tests/test.js
index 2b53429..0478a7a 100644
--- a/tests/test.js
+++ b/tests/test.js
@@ -1,12 +1,40 @@
 /*jshint unused:false */
-function assertURLTestPairs(assert, testPairs) {
-/*jshint unused:true */
+function cloneObject(obj) {
+  /*jshint unused:true */
   "use strict";
-  for (var url in testPairs) {
-    if (testPairs.hasOwnProperty(url)) {
-      assert.deepEqual(urlParser.parse(url), testPairs[url], url);
-    }
+  if (obj === null || typeof obj !== 'object') {
+    return obj;
+  }
+
+  var temp = obj.constructor(); // give temp the original obj's constructor
+  for (var key in obj) {
+    temp[key] = cloneObject(obj[key]);
   }
+
+  return temp;
+}
+
+/*jshint unused:false */
+function assertUrlTest(assert, tests) {
+  /*jshint unused:true */
+  "use strict";
+  tests.forEach(function (test) {
+    test.urls.forEach(function (url) {
+      assert.deepEqual(urlParser.parse(url), test.videoInfo, url);
+    });
+    
+    assert.equal(urlParser.create({
+      videoInfo: test.videoInfo,
+      format: 'long'
+    }), test.createdUrl, JSON.stringify(test.videoInfo));
+
+    if (test.hasOwnProperty('createdShortUrl')) {
+      assert.equal(urlParser.create({
+        videoInfo: test.videoInfo,
+        format: 'short'
+      }), test.createdShortUrl, JSON.stringify(test.videoInfo));
+    }
+  });
 }
 
 QUnit.test("TimeString Parser", function (assert) {
@@ -44,181 +72,190 @@ QUnit.test("TimeString Parser", function (assert) {
   }
 });
 
-QUnit.test("Dailymotion URLs", function(assert) {
+QUnit.test("Dailymotion URLs", function (assert) {
   "use strict";
-  var expected1 = {
+  var vi = {
       'provider': 'dailymotion',
       'id': 'x1e2b95',
       'mediaType': 'video'
     },
-    expected2 = {
-      'provider': 'dailymotion',
-      'id': 'x1e2b95',
-      'mediaType': 'video',
-      startTime: 10
-    },
-    testPairs = {
-      'http://www.dailymotion.com/video/x1e2b95_bruce-lee-nin-kayip-kedisi_animals': expected1,
-      'http://www.dailymotion.com/video/x1e2b95_bruce-lee-nin-kayip-kedisi_animals?start=10': expected2,
-      'http://www.dailymotion.com/video/x1e2b95': expected1,
-      'http://www.dailymotion.com/video/x1e2b95?start=10': expected2,
-      'http://dai.ly/x1e2b95': expected1,
-      'http://www.dailymotion.com/embed/video/x1e2b95': expected1,
-      'http://www.dailymotion.com/embed/video/x1e2b95?start=10': expected2
-    };
+    tests = [{
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://dailymotion.com/video/x1e2b95',
+      createdShortUrl: 'https://dai.ly/x1e2b95',
+      urls: ['http://www.dailymotion.com/video/x1e2b95_bruce-lee-nin-kayip-kedisi_animals',
+        'http://www.dailymotion.com/video/x1e2b95',
+        'http://dai.ly/x1e2b95',
+        'http://www.dailymotion.com/embed/video/x1e2b95'
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://dailymotion.com/video/x1e2b95?start=10',
+      urls: ['http://www.dailymotion.com/video/x1e2b95?start=10',
+        'http://www.dailymotion.com/video/x1e2b95_bruce-lee-nin-kayip-kedisi_animals?start=10',
+        'http://www.dailymotion.com/embed/video/x1e2b95?start=10'
+      ]
+    }];
+  tests[1].videoInfo.startTime = 10;
 
-  assertURLTestPairs(assert, testPairs);
+  assertUrlTest(assert, tests);
 });
 
-QUnit.test("Twitch Stream URLs", function(assert) {
+QUnit.test("Twitch Stream URLs", function (assert) {
   "use strict";
-  var expected1 = {
+  var vi = {
       'provider': 'twitch',
       'channel': 'tsm_wildturtle',
       'mediaType': 'stream'
     },
-    expected2 = {
-      'provider': 'twitch',
-      'channel': 'tsm_wildturtle',
-      'mediaType': 'video',
-      'id': '2724914',
-      "idPrefix": "c"
-    },
-    testPairs = {
-      'http://www.twitch.tv/tsm_wildturtle': expected1,
-      'http://www.twitch.tv/widgets/live_embed_player.swf?channel=tsm_wildturtle': expected1,
-      'http://twitch.tv/tsm_wildturtle/chat?popout=': expected1,
-      'http://www.twitch.tv/tsm_wildturtle/c/2724914': expected2
-    };
-
-  assertURLTestPairs(assert, testPairs);
+    tests = [{
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://twitch.tv/tsm_wildturtle',
+      urls: ['http://www.twitch.tv/tsm_wildturtle',
+        'http://www.twitch.tv/widgets/live_embed_player.swf?channel=tsm_wildturtle',
+        'http://twitch.tv/tsm_wildturtle/chat?popout='
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://twitch.tv/tsm_wildturtle/c/2724914',
+      urls: ['http://www.twitch.tv/tsm_wildturtle/c/2724914']
+    }];
+  tests[1].videoInfo.id = '2724914';
+  tests[1].videoInfo.idPrefix = 'c';
+  tests[1].videoInfo.mediaType = 'video';
+  assertUrlTest(assert, tests);
 });
 
-QUnit.test("Vimeo URLs", function(assert) {
+QUnit.test("Vimeo URLs", function (assert) {
   "use strict";
-  var expected1 = {
+  var vi = {
       'provider': 'vimeo',
       'id': '97276391',
       'mediaType': 'video'
     },
-    expected2 = {
-      'provider': 'vimeo',
-      'id': '96186586',
-      'mediaType': 'video'
-    },
-    expected3 = {
-      'provider': 'vimeo',
-      'id': '97688625',
-      'mediaType': 'video'
-    },
-    expected4 = {
-      'provider': 'vimeo',
-      'id': '24069938',
-      'mediaType': 'video'
-    },
-    testPairs = {
-      'https://vimeo.com/97276391': expected1,
-      'https://vimeo.com/channels/staffpicks/97276391': expected1,
-      'https://vimeo.com/album/2903155/video/96186586': expected2,
-      'https://vimeo.com/groups/shortfilms/videos/97688625': expected3,
-      'http://vimeopro.com/staff/frame/video/24069938': expected4
-    };
+    tests = [{
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://vimeo.com/97276391',
+      urls: ['https://vimeo.com/97276391',
+        'https://vimeo.com/channels/staffpicks/97276391'
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://vimeo.com/96186586',
+      urls: ['https://vimeo.com/album/2903155/video/96186586']
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://vimeo.com/97688625',
+      urls: ['https://vimeo.com/groups/shortfilms/videos/97688625']
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://vimeo.com/24069938',
+      urls: ['http://vimeopro.com/staff/frame/video/24069938']
+    }];
 
-  assertURLTestPairs(assert, testPairs);
+  tests[1].videoInfo.id = '96186586';
+  tests[2].videoInfo.id = '97688625';
+  tests[3].videoInfo.id = '24069938';
+  assertUrlTest(assert, tests);
 });
 
-QUnit.test("Regular YouTube URLs", function(assert) {
+QUnit.test("Regular YouTube URLs", function (assert) {
   "use strict";
-  var expected1 = {
-      'provider': 'youtube',
-      'id': 'HRb7B9fPhfA',
-      'mediaType': 'video',
+  var vi = {
+      provider: 'youtube',
+      id: 'HRb7B9fPhfA',
+      mediaType: 'video',
       startTime: 30
     },
-    expected2 = {
-      'provider': 'youtube',
-      'id': 'HRb7B9fPhfA',
-      'mediaType': 'video'
-    },
-    testPairs = {
-      'http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA#t=30s': expected1,
-      'http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA&t=30s': expected1,
-      'http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA': expected2,
-      'http://youtu.be/HRb7B9fPhfA?t=30s': expected1,
-      'http://youtu.be/HRb7B9fPhfA#t=30s': expected1,
-      'http://youtu.be/HRb7B9fPhfA': expected2,
-      'https://m.youtube.com/details?v=HRb7B9fPhfA#t=30s': expected1,
-      'https://m.youtube.com/details?v=HRb7B9fPhfA': expected2
-    };
+    tests = [{
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=HRb7B9fPhfA#t=30',
+      createdShortUrl: 'https://youtu.be/HRb7B9fPhfA#t=30',
+      urls: ['http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA#t=30s',
+        'http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA&t=30s',
+        'https://m.youtube.com/details?v=HRb7B9fPhfA#t=30s',
+        'http://youtu.be/HRb7B9fPhfA?t=30s',
+        'http://youtu.be/HRb7B9fPhfA#t=30s'
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=HRb7B9fPhfA',
+      createdShortUrl: 'https://youtu.be/HRb7B9fPhfA',
+      urls: ['http://www.youtube.com/watch?feature=player_embedded&v=HRb7B9fPhfA',
+        'http://youtu.be/HRb7B9fPhfA',
+        'https://m.youtube.com/details?v=HRb7B9fPhfA'
+      ]
+    }];
+  delete tests[1].videoInfo.startTime;
 
-  assertURLTestPairs(assert, testPairs);
+  assertUrlTest(assert, tests);
 });
-QUnit.test("Playlist YouTube URLs", function(assert) {
+QUnit.test("Playlist YouTube URLs", function (assert) {
   "use strict";
-  //https://www.youtube.com/watch?v=AdQcd3sKGC8&list=PL46F0A159EC02DF82&index=9
-  var expected1A = {
-      'provider': 'youtube',
-      'id': 'yQaAGmHNn9s',
-      'playlistId': 'PL46F0A159EC02DF82',
-      'mediaType': 'video',
+  var vi = {
+      provider: 'youtube',
+      id: 'yQaAGmHNn9s',
+      playlistId: 'PL46F0A159EC02DF82',
+      mediaType: 'video',
       startTime: 100
     },
-    expected1B = {
-      'provider': 'youtube',
-      'id': 'yQaAGmHNn9s',
-      'playlistId': 'PL46F0A159EC02DF82',
-      'mediaType': 'video'
-    },
-    expected1C = {
-      'provider': 'youtube',
-      'id': '6xLcSTDeB7A',
-      'playlistId': 'PL46F0A159EC02DF82',
-      'playlistIndex': 25,
-      'mediaType': 'video'
-    },
-    expected1D = {
-      'provider': 'youtube',
-      'id': '6xLcSTDeB7A',
-      'playlistId': 'PL46F0A159EC02DF82',
-      'playlistIndex': 25,
-      'mediaType': 'video',
-      startTime: 100
-    },
-
-    expected2 = {
-      'provider': 'youtube',
-      'playlistId': 'PL46F0A159EC02DF82',
-      'mediaType': 'playlist'
-    },
-    testPairs = {
-      'http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82#t=1m40': expected1A,
-      'http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82&t=1m40': expected1A,
-      'http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82': expected1B,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25': expected1C,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82': expected1C,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25#t=1m40': expected1D,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25&t=1m40': expected1D,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82&t=1m40': expected1D,
-      'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82#t=1m40': expected1D,
-      'http://www.youtube.com/embed/videoseries?list=PL46F0A159EC02DF82': expected2,
-      'http://www.youtube.com/playlist?list=PL46F0A159EC02DF82': expected2,
-    };
+    tests = [{
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82#t=100',
+      urls: ['http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82#t=1m40',
+        'http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82&t=1m40',
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82',
+      urls: ['http://www.youtube.com/watch?v=yQaAGmHNn9s&list=PL46F0A159EC02DF82']
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25',
+      urls: ['https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25',
+        'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82'
+      ]
+    }, {
+      videoInfo: cloneObject(vi),
+      createdUrl: 'https://youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25#t=100',
+      urls: ['https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25#t=1m40',
+        'https://www.youtube.com/watch?v=6xLcSTDeB7A&list=PL46F0A159EC02DF82&index=25&t=1m40',
+        'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82&t=1m40',
+        'https://www.youtube.com/watch?v=6xLcSTDeB7A&index=25&list=PL46F0A159EC02DF82#t=1m40'
+      ]
+    }, {
+      videoInfo: {
+        provider: 'youtube',
+        playlistId: 'PL46F0A159EC02DF82',
+        mediaType: 'playlist'
+      },
+      createdUrl: 'https://youtube.com/playlist?feature=share&list=PL46F0A159EC02DF82',
+      urls: ['http://www.youtube.com/embed/videoseries?list=PL46F0A159EC02DF82',
+        'http://www.youtube.com/playlist?list=PL46F0A159EC02DF82'
+      ]
+    }];
 
-  assertURLTestPairs(assert, testPairs);
+  delete tests[1].videoInfo.startTime;
+  delete tests[2].videoInfo.startTime;
+  tests[2].videoInfo.playlistIndex = tests[3].videoInfo.playlistIndex = 25;
+  tests[2].videoInfo.id = tests[3].videoInfo.id = '6xLcSTDeB7A';
+  assertUrlTest(assert, tests);
 });
 
-QUnit.test("Feed YouTube URLs", function(assert) {
+QUnit.test("Feed YouTube URLs", function (assert) {
   "use strict";
-  var expected = {
+  var tests = [{
+    videoInfo: {
       'provider': 'youtube',
       'id': 'HRb7B9fPhfA',
       'mediaType': 'video'
     },
-    testPairs = {
-      'https://gdata.youtube.com/feeds/api/videos/HRb7B9fPhfA/related?v=2': expected,
-      'https://gdata.youtube.com/feeds/api/videos/HRb7B9fPhfA?v=2': expected,
-      'https://www.youtube.com/v/HRb7B9fPhfA?version=3&f=videos&app=youtube_gdata': expected
-    };
-
-  assertURLTestPairs(assert, testPairs);
+    createdUrl: 'https://youtube.com/watch?v=HRb7B9fPhfA',
+    createdShortUrl: 'https://youtu.be/HRb7B9fPhfA',
+    urls: ['https://gdata.youtube.com/feeds/api/videos/HRb7B9fPhfA/related?v=2',
+      'https://gdata.youtube.com/feeds/api/videos/HRb7B9fPhfA?v=2',
+      'https://www.youtube.com/v/HRb7B9fPhfA?version=3&f=videos&app=youtube_gdata'
+    ]
+  }];
+  assertUrlTest(assert, tests);
 });