diff --git a/test/test_lastgenre.py b/test/test_lastgenre.py
index fb2952799..635acbe2c 100644
--- a/test/test_lastgenre.py
+++ b/test/test_lastgenre.py
@@ -36,21 +36,39 @@ class LastGenrePluginTest(unittest.TestCase):
         if whitelist:
             lastGenrePlugin.whitelist = whitelist
 
-    def test_defaults(self):
-        """Tests whitelist and c14n options with default filepaths
+    def test_default(self):
+        """Fetch genres with whitelist and c14n deactivated
         """
-        # default whitelist and c14n
-        self._setup_config(canonical='')
-        self.assertEqual(lastGenrePlugin._resolve_genres(['delta blues']),
-                         'Blues')
-        self.assertEqual(lastGenrePlugin._resolve_genres(['iota blues']), '')
-
-        # default whitelist and no c14n
         self._setup_config()
         self.assertEqual(lastGenrePlugin._resolve_genres(['delta blues']),
-                         'delta blues')
+                         'Delta Blues')
 
-    def test_whitelist(self):
+    def test_c14n_only(self):
+        """Default c14n tree funnels up to most common genre except for *wrong*
+        genres that stay unchanged.
+        """
+        self._setup_config(canonical='', count=99)
+        self.assertEqual(lastGenrePlugin._resolve_genres(['delta blues']),
+                         'Blues')
+        self.assertEqual(lastGenrePlugin._resolve_genres(['iota blues']),
+                         'Iota Blues')
+
+    def test_whitelist_only(self):
+        """Default whitelist rejects *wrong* (non existing) genres.
+        """
+        self._setup_config(whitelist='')
+        self.assertEqual(lastGenrePlugin._resolve_genres(['iota blues']),
+                         '')
+
+    def test_whitelist_c14n(self):
+        """Default whitelist and c14n both activated result in all parents
+        genres being selected (from specific to common).
+        """
+        self._setup_config(canonical='', whitelist='', count=99)
+        self.assertEqual(lastGenrePlugin._resolve_genres(['delta blues']),
+                         'Delta Blues, Country Blues, Blues')
+
+    def test_whitelist_custom(self):
         """Keep only genres that are in the whitelist.
         """
         self._setup_config(whitelist=set(['blues', 'rock', 'jazz']),
@@ -58,10 +76,6 @@ class LastGenrePluginTest(unittest.TestCase):
         self.assertEqual(lastGenrePlugin._resolve_genres(['pop', 'blues']),
                          'Blues')
 
-        self._setup_config(canonical='', whitelist=set(['rock']))
-        self.assertEqual(lastGenrePlugin._resolve_genres(['delta blues']),
-                         '')
-
     def test_count(self):
         """Keep the n first genres, as we expect them to be sorted from more to
         less popular.
@@ -78,13 +92,19 @@ class LastGenrePluginTest(unittest.TestCase):
         self._setup_config(whitelist=set(['blues', 'rock', 'jazz']),
                            canonical='',
                            count=2)
-
         # thanks to c14n, 'blues' superseeds 'country blues' and takes the
         # second slot
         self.assertEqual(lastGenrePlugin._resolve_genres(
                          ['jazz', 'pop', 'country blues', 'rock']),
                          'Jazz, Blues')
 
+    def test_c14n_whitelist(self):
+        """Genres first pass through c14n and are then filtered
+        """
+        self._setup_config(canonical='', whitelist=set(['rock']))
+        self.assertEqual(lastGenrePlugin._resolve_genres(['delta blues']),
+                         '')
+
 
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)