diff --git a/spotdl.py b/spotdl.py
index 3176694..e80905d 100755
--- a/spotdl.py
+++ b/spotdl.py
@@ -105,7 +105,7 @@ def go_pafy(raw_song):
         return pafy.new(track_url)
 
 # title of the YouTube video
-def get_YouTube_title(content, number=None):
+def get_youtube_title(content, number=None):
     title = misc.fix_encoding(content.title)
     if number is None:
         return title
@@ -160,7 +160,7 @@ def download_song(content):
         return True
 
 # check if input song already exists in Music folder
-def check_exists(music_file, raw_song, islist):
+def check_exists(music_file, raw_song, islist=True):
     files = os.listdir("Music")
     for file in files:
         if file.endswith(".temp"):
@@ -187,6 +187,7 @@ def check_exists(music_file, raw_song, islist):
                     return False
                 else:
                     return True
+    return False
 
 # download songs from list
 def grab_list(file):
@@ -240,7 +241,7 @@ def grab_single(raw_song, number=None):
         return
     # print "[number]. [artist] - [song]" if downloading from list
     # otherwise print "[artist] - [song]"
-    print(get_YouTube_title(content, number))
+    print(get_youtube_title(content, number))
     # generate file name of the song to download
     music_file = misc.generate_filename(content.title)
     music_file = misc.fix_decoding(music_file)
diff --git a/test/test_basic.py b/test/test_basic.py
index b03d063..cc989f0 100644
--- a/test/test_basic.py
+++ b/test/test_basic.py
@@ -2,14 +2,34 @@
 
 import spotdl
 
-raw_song = "http://open.spotify.com/track/2e0jnySVkYF1pvBlpoNX1Y"
+raw_song = 'http://open.spotify.com/track/2e0jnySVkYF1pvBlpoNX1Y'
 
-def test_spotify():
-    expected_title = "David André Østby - Tilbake (SAEVIK Remix)"
+def test_spotify_title():
+    expect_title = 'David André Østby - Tilbake (SAEVIK Remix)'
     title = spotdl.generate_songname(raw_song)
-    assert title == expected_title
+    assert title == expect_title
+
+def test_youtube_url():
+    expect_url = 'youtube.com/watch?v=zkD4smbefbc'
+    url = spotdl.generate_youtube_url(raw_song)
+    assert url == expect_url
 
 def test_youtube_title():
-    expected_url = "youtube.com/watch?v=zkD4smbefbc"
-    url = spotdl.generate_youtube_url(raw_song)
-    assert url == expected_url
+    expect_title = 'Tilbake (SAEVIK Remix) [Feat. Marie Hognestad] - David André Østby'
+    content = spotdl.go_pafy(raw_song)
+    title = spotdl.get_youtube_title(content)
+    assert title == expect_title
+
+def test_check_exists():
+    expect_check = False
+    content = spotdl.go_pafy(raw_song)
+    music_file = spotdl.misc.generate_filename(content.title)
+    music_file = spotdl.misc.fix_decoding(music_file)
+    check = spotdl.check_exists(music_file, raw_song)
+    assert check == expect_check
+
+def test_download():
+    expect_download = True
+    content = spotdl.go_pafy(raw_song)
+    download = download_song(content)
+    assert download == expect_download