diff --git a/.cache/v/cache/lastfailed b/.cache/v/cache/lastfailed
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/.cache/v/cache/lastfailed
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index ffeaad5..3018ac2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *.pyc
 __pycache__/
-/Music/
+Music/
 /*.txt
diff --git a/spotdl.py b/spotdl.py
index 44fc5d2..35332f1 100755
--- a/spotdl.py
+++ b/spotdl.py
@@ -19,7 +19,7 @@ try:
 except ImportError:
     import urllib.request as urllib2
 
-# decode spotify link to "[artist] - [song]"
+# "[artist] - [song]"
 def generate_songname(raw_song):
     if misc.is_spotify(raw_song):
         tags = generate_metadata(raw_song)
@@ -105,7 +105,7 @@ def go_pafy(raw_song):
         return pafy.new(trackURL)
 
 # title of the YouTube video
-def get_YouTube_title(content, number):
+def get_YouTube_title(content, number=None):
     title = misc.fix_encoding(content.title)
     if number is None:
         return title
@@ -259,18 +259,21 @@ def grab_single(raw_song, number=None):
         else:
             print('No audio streams available')
 
+class Args(object):
+    manual = False
+
+args = Args()
+# token is mandatory when using Spotify's API
+# https://developer.spotify.com/news-stories/2017/01/27/removing-unauthenticated-calls-to-the-web-api/
+token = misc.generate_token()
+spotify = spotipy.Spotify(auth=token)
+
+misc.filter_path('Music')
+
 if __name__ == '__main__':
 
     os.chdir(sys.path[0])
 
-    misc.filter_path('Music')
-
-    # token is mandatory when using Spotify's API
-    # https://developer.spotify.com/news-stories/2017/01/27/removing-unauthenticated-calls-to-the-web-api/
-    token = misc.generate_token()
-    spotify = spotipy.Spotify(auth=token)
-
-    # set up arguments
     args = misc.get_arguments()
 
     if args.song:
diff --git a/test/.cache/v/cache/lastfailed b/test/.cache/v/cache/lastfailed
new file mode 100644
index 0000000..fafc580
--- /dev/null
+++ b/test/.cache/v/cache/lastfailed
@@ -0,0 +1,3 @@
+{
+  "test_youtube.py": true
+}
\ No newline at end of file
diff --git a/test/test_spotify.py b/test/test_spotify.py
new file mode 100644
index 0000000..05c25d4
--- /dev/null
+++ b/test/test_spotify.py
@@ -0,0 +1,9 @@
+# -*- coding: UTF-8 -*-
+
+import spotdl
+
+def test_songname():
+    song = "http://open.spotify.com/track/2e0jnySVkYF1pvBlpoNX1Y"
+    expected_title = "David André Østby - Tilbake (SAEVIK Remix)"
+    title = spotdl.generate_songname(song)
+    assert title == expected_title