diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
index 64e053a7..d63eee1d 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
@@ -178,12 +178,12 @@ public class YoutubeStreamExtractor extends StreamExtractor {
                     // They refer to the youtube search. We do not handle them.
                     a.text(link);
 
-                } else if(redirectLink.toString().contains("watch?v=")
-                        || redirectLink.toString().contains("https://www.youtube.com/")) {
-                    // Another posibility is that this link is pointing to another video
-                    // we need to put the redirectLink in here explicitly in order to add the domain part to the link.
-                    a.text(redirectLink.toString());
                 }
+            } else if(redirectLink.toString().contains("watch?v=")
+                    || redirectLink.toString().contains("https://www.youtube.com/")) {
+                // Another posibility is that this link is pointing to another video
+                // we need to put the redirectLink in here explicitly in order to add the domain part to the link.
+                a.text(redirectLink.toString());
             }
         }
         return description.select("body").first().html();
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java
index 0c4bbf71..2b5f6058 100644
--- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java
+++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java
@@ -16,6 +16,7 @@ import java.io.IOException;
 import static org.junit.Assert.*;
 import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
 import static org.schabi.newpipe.extractor.ServiceList.YouTube;
+import static org.schabi.newpipe.extractor.services.youtube.YoutubeTrendingExtractorTest.extractor;
 
 /*
  * Created by Christian Schabesberger on 30.12.15.
@@ -41,127 +42,161 @@ import static org.schabi.newpipe.extractor.ServiceList.YouTube;
  * Test for {@link StreamExtractor}
  */
 public class YoutubeStreamExtractorDefaultTest {
-    private static YoutubeStreamExtractor extractor;
 
-    @BeforeClass
-    public static void setUp() throws Exception {
-        NewPipe.init(Downloader.getInstance());
-        extractor = (YoutubeStreamExtractor) YouTube
-                .getStreamExtractor("https://www.youtube.com/watch?v=rYEDA3JcQqw");
-        extractor.fetchPage();
-    }
+    public static class AdeleHello {
+        private static YoutubeStreamExtractor extractor;
 
-    @Test
-    public void testGetInvalidTimeStamp() throws ParsingException {
-        assertTrue(extractor.getTimeStamp() + "",
-                extractor.getTimeStamp() <= 0);
-    }
+        @BeforeClass
+        public static void setUp() throws Exception {
+            NewPipe.init(Downloader.getInstance());
+            extractor = (YoutubeStreamExtractor) YouTube
+                    .getStreamExtractor("https://www.youtube.com/watch?v=rYEDA3JcQqw");
+            extractor.fetchPage();
+        }
 
-    @Test
-    public void testGetValidTimeStamp() throws ExtractionException {
-        StreamExtractor extractor = YouTube.getStreamExtractor("https://youtu.be/FmG385_uUys?t=174");
-        assertEquals(extractor.getTimeStamp() + "", "174");
-    }
+        @Test
+        public void testGetInvalidTimeStamp() throws ParsingException {
+            assertTrue(extractor.getTimeStamp() + "",
+                    extractor.getTimeStamp() <= 0);
+        }
 
-    @Test
-    public void testGetTitle() throws ParsingException {
-        assertFalse(extractor.getName().isEmpty());
-    }
+        @Test
+        public void testGetValidTimeStamp() throws ExtractionException {
+            StreamExtractor extractor = YouTube.getStreamExtractor("https://youtu.be/FmG385_uUys?t=174");
+            assertEquals(extractor.getTimeStamp() + "", "174");
+        }
 
-    @Test
-    public void testGetDescription() throws ParsingException {
-        assertNotNull(extractor.getDescription());
-        assertFalse(extractor.getDescription().isEmpty());
-    }
+        @Test
+        public void testGetTitle() throws ParsingException {
+            assertFalse(extractor.getName().isEmpty());
+        }
 
-    @Test
-    public void testGetFullLinksInDescriptlion() throws ParsingException {
-        assertTrue(extractor.getDescription().contains("http://smarturl.it/SubscribeAdele?IQid=yt"));
-        assertFalse(extractor.getDescription().contains("http://smarturl.it/SubscribeAdele?IQi..."));
-    }
+        @Test
+        public void testGetDescription() throws ParsingException {
+            assertNotNull(extractor.getDescription());
+            assertFalse(extractor.getDescription().isEmpty());
+        }
 
-    @Test
-    public void testGetUploaderName() throws ParsingException {
-        assertNotNull(extractor.getUploaderName());
-        assertFalse(extractor.getUploaderName().isEmpty());
-    }
+        @Test
+        public void testGetFullLinksInDescriptlion() throws ParsingException {
+            assertTrue(extractor.getDescription().contains("http://smarturl.it/SubscribeAdele?IQid=yt"));
+            assertFalse(extractor.getDescription().contains("http://smarturl.it/SubscribeAdele?IQi..."));
+        }
+
+        @Test
+        public void testGetUploaderName() throws ParsingException {
+            assertNotNull(extractor.getUploaderName());
+            assertFalse(extractor.getUploaderName().isEmpty());
+        }
 
 
-    @Test
-    public void testGetLength() throws ParsingException {
-        assertTrue(extractor.getLength() > 0);
-    }
+        @Test
+        public void testGetLength() throws ParsingException {
+            assertTrue(extractor.getLength() > 0);
+        }
 
-    @Test
-    public void testGetViewCount() throws ParsingException {
-        Long count = extractor.getViewCount();
-        assertTrue(Long.toString(count), count >= /* specific to that video */ 1220025784);
-    }
+        @Test
+        public void testGetViewCount() throws ParsingException {
+            Long count = extractor.getViewCount();
+            assertTrue(Long.toString(count), count >= /* specific to that video */ 1220025784);
+        }
 
-    @Test
-    public void testGetUploadDate() throws ParsingException {
-        assertTrue(extractor.getUploadDate().length() > 0);
-    }
+        @Test
+        public void testGetUploadDate() throws ParsingException {
+            assertTrue(extractor.getUploadDate().length() > 0);
+        }
 
-    @Test
-    public void testGetUploaderUrl() throws ParsingException {
-        assertTrue(extractor.getUploaderUrl().length() > 0);
-    }
+        @Test
+        public void testGetUploaderUrl() throws ParsingException {
+            assertTrue(extractor.getUploaderUrl().length() > 0);
+        }
 
-    @Test
-    public void testGetThumbnailUrl() throws ParsingException {
-        assertIsSecureUrl(extractor.getThumbnailUrl());
-    }
+        @Test
+        public void testGetThumbnailUrl() throws ParsingException {
+            assertIsSecureUrl(extractor.getThumbnailUrl());
+        }
 
-    @Test
-    public void testGetUploaderAvatarUrl() throws ParsingException {
-        assertIsSecureUrl(extractor.getUploaderAvatarUrl());
-    }
+        @Test
+        public void testGetUploaderAvatarUrl() throws ParsingException {
+            assertIsSecureUrl(extractor.getUploaderAvatarUrl());
+        }
 
-    @Test
-    public void testGetAudioStreams() throws IOException, ExtractionException {
-        assertFalse(extractor.getAudioStreams().isEmpty());
-    }
+        @Test
+        public void testGetAudioStreams() throws IOException, ExtractionException {
+            assertFalse(extractor.getAudioStreams().isEmpty());
+        }
 
-    @Test
-    public void testGetVideoStreams() throws IOException, ExtractionException {
-        for (VideoStream s : extractor.getVideoStreams()) {
-            assertIsSecureUrl(s.url);
-            assertTrue(s.resolution.length() > 0);
-            assertTrue(Integer.toString(s.getFormatId()),
-                    0 <= s.getFormatId() && s.getFormatId() <= 4);
+        @Test
+        public void testGetVideoStreams() throws IOException, ExtractionException {
+            for (VideoStream s : extractor.getVideoStreams()) {
+                assertIsSecureUrl(s.url);
+                assertTrue(s.resolution.length() > 0);
+                assertTrue(Integer.toString(s.getFormatId()),
+                        0 <= s.getFormatId() && s.getFormatId() <= 4);
+            }
+        }
+
+        @Test
+        public void testStreamType() throws ParsingException {
+            assertTrue(extractor.getStreamType() == StreamType.VIDEO_STREAM);
+        }
+
+        @Test
+        public void testGetDashMpd() throws ParsingException {
+            // we dont expect this particular video to have a DASH file. For this purpouse we use a different test class.
+            assertTrue(extractor.getDashMpdUrl(),
+                    extractor.getDashMpdUrl() != null && extractor.getDashMpdUrl().isEmpty());
+        }
+
+        @Test
+        public void testGetRelatedVideos() throws ExtractionException, IOException {
+            StreamInfoItemsCollector relatedVideos = extractor.getRelatedVideos();
+            Utils.printErrors(relatedVideos.getErrors());
+            assertFalse(relatedVideos.getItems().isEmpty());
+            assertTrue(relatedVideos.getErrors().isEmpty());
+        }
+
+        @Test
+        public void testGetSubtitlesListDefault() throws IOException, ExtractionException {
+            // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
+            assertTrue(extractor.getSubtitlesDefault().isEmpty());
+        }
+
+        @Test
+        public void testGetSubtitlesList() throws IOException, ExtractionException {
+            // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
+            assertTrue(extractor.getSubtitles(SubtitlesFormat.TTML).isEmpty());
         }
     }
 
-    @Test
-    public void testStreamType() throws ParsingException {
-        assertTrue(extractor.getStreamType() == StreamType.VIDEO_STREAM);
-    }
+    public static class DescriptionTestPewdiepie {
+        private static YoutubeStreamExtractor extractor;
 
-    @Test
-    public void testGetDashMpd() throws ParsingException {
-        // we dont expect this particular video to have a DASH file. For this purpouse we use a different test class.
-        assertTrue(extractor.getDashMpdUrl(),
-                extractor.getDashMpdUrl() != null && extractor.getDashMpdUrl().isEmpty());
-    }
+        @BeforeClass
+        public static void setUp() throws Exception {
+            NewPipe.init(Downloader.getInstance());
+            extractor = (YoutubeStreamExtractor) YouTube
+                    .getStreamExtractor("https://www.youtube.com/watch?v=dJY8iT341F4");
+            extractor.fetchPage();
+        }
 
-    @Test
-    public void testGetRelatedVideos() throws ExtractionException, IOException {
-        StreamInfoItemsCollector relatedVideos = extractor.getRelatedVideos();
-        Utils.printErrors(relatedVideos.getErrors());
-        assertFalse(relatedVideos.getItems().isEmpty());
-        assertTrue(relatedVideos.getErrors().isEmpty());
-    }
+        @Test
+        public void testGetDescription() throws ParsingException {
+            assertNotNull(extractor.getDescription());
+            assertFalse(extractor.getDescription().isEmpty());
+        }
 
-    @Test
-    public void testGetSubtitlesListDefault() throws IOException, ExtractionException {
-        // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
-        assertTrue(extractor.getSubtitlesDefault().isEmpty());
-    }
+        @Test
+        public void testGetFullLinksInDescriptlion() throws ParsingException {
+            assertTrue(extractor.getDescription().contains("https://www.reddit.com/r/PewdiepieSubmissions/"));
+            assertTrue(extractor.getDescription().contains("https://www.youtube.com/channel/UC3e8EMTOn4g6ZSKggHTnNng"));
 
-    @Test
-    public void testGetSubtitlesList() throws IOException, ExtractionException {
-        // Video (/view?v=YQHsXMglC9A) set in the setUp() method has no captions => null
-        assertTrue(extractor.getSubtitles(SubtitlesFormat.TTML).isEmpty());
+            assertFalse(extractor.getDescription().contains("https://www.reddit.com/r/PewdiepieSub..."));
+            assertFalse(extractor.getDescription().contains("https://usa.clutchchairz.com/product/..."));
+            assertFalse(extractor.getDescription().contains("https://europe.clutchchairz.com/en/pr..."));
+            assertFalse(extractor.getDescription().contains("https://canada.clutchchairz.com/produ..."));
+            assertFalse(extractor.getDescription().contains("http://store.steampowered.com/app/703..."));
+            assertFalse(extractor.getDescription().contains("https://www.youtube.com/channel/UC3e8..."));
+        }
     }
 }