diff --git a/src/main/java/org/schabi/newpipe/extractor/search/InfoItemSearchCollector.java b/src/main/java/org/schabi/newpipe/extractor/search/InfoItemSearchCollector.java
index 45a8100ec..2d0245a67 100644
--- a/src/main/java/org/schabi/newpipe/extractor/search/InfoItemSearchCollector.java
+++ b/src/main/java/org/schabi/newpipe/extractor/search/InfoItemSearchCollector.java
@@ -29,7 +29,7 @@ import org.schabi.newpipe.extractor.user.UserInfoItemExtractor;
  */
 
 public class InfoItemSearchCollector extends InfoItemCollector {
-    private String suggestion;
+    private String suggestion = "";
     private StreamInfoItemCollector streamCollector;
     private UserInfoItemCollector userCollector;
 
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java
index 08538a0d1..ac8ea1a03 100644
--- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java
+++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java
@@ -53,7 +53,7 @@ public class SoundcloudPlaylistExtractor extends PlaylistExtractor {
 
     @Override
     public String getAvatarUrl() {
-        return playlist.getString("artwork_url");
+        return playlist.optString("artwork_url");
     }
 
     @Override
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistUrlIdHandler.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistUrlIdHandler.java
index 5e8ee0e58..7260f19d9 100644
--- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistUrlIdHandler.java
+++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistUrlIdHandler.java
@@ -6,10 +6,13 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.utils.Parser;
+import org.schabi.newpipe.extractor.utils.Utils;
 
 public class SoundcloudPlaylistUrlIdHandler implements UrlIdHandler {
 
     private static final SoundcloudPlaylistUrlIdHandler instance = new SoundcloudPlaylistUrlIdHandler();
+    private final String URL_PATTERN = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+" +
+            "/sets/[0-9a-z_-]+/?([#?].*)?$";
 
     public static SoundcloudPlaylistUrlIdHandler getInstance() {
         return instance;
@@ -26,6 +29,8 @@ public class SoundcloudPlaylistUrlIdHandler implements UrlIdHandler {
 
     @Override
     public String getId(String url) throws ParsingException {
+        Utils.checkUrl(URL_PATTERN, url);
+
         try {
             return SoundcloudParsingHelper.resolveIdWithEmbedPlayer(url);
         } catch (Exception e) {
@@ -35,6 +40,8 @@ public class SoundcloudPlaylistUrlIdHandler implements UrlIdHandler {
 
     @Override
     public String cleanUrl(String complexUrl) throws ParsingException {
+        Utils.checkUrl(URL_PATTERN, complexUrl);
+
         try {
             Element ogElement = Jsoup.parse(NewPipe.getDownloader().download(complexUrl))
                     .select("meta[property=og:url]").first();
@@ -47,7 +54,6 @@ public class SoundcloudPlaylistUrlIdHandler implements UrlIdHandler {
 
     @Override
     public boolean acceptUrl(String url) {
-        String regex = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+/sets/[0-9a-z_-]+/?([#?].*)?$";
-        return Parser.isMatch(regex, url.toLowerCase());
+        return Parser.isMatch(URL_PATTERN, url.toLowerCase());
     }
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java
index 9cf611374..ec61a94d3 100644
--- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java
+++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java
@@ -9,12 +9,7 @@ import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.stream.AudioStream;
-import org.schabi.newpipe.extractor.stream.StreamExtractor;
-import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
-import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
-import org.schabi.newpipe.extractor.stream.StreamType;
-import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.extractor.stream.*;
 import org.schabi.newpipe.extractor.utils.Parser;
 
 import java.io.IOException;
@@ -83,7 +78,7 @@ public class SoundcloudStreamExtractor extends StreamExtractor {
 
     @Override
     public String getThumbnailUrl() {
-        return track.getString("artwork_url");
+        return track.optString("artwork_url");
     }
 
     @Override
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java
index 3b768808c..d2bb1383b 100644
--- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java
+++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java
@@ -45,7 +45,7 @@ public class SoundcloudStreamInfoItemExtractor implements StreamInfoItemExtracto
 
     @Override
     public String getThumbnailUrl() {
-        return searchResult.getString("artwork_url");
+        return searchResult.optString("artwork_url");
     }
 
     @Override
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandler.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandler.java
index 34a525150..1adbf4623 100644
--- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandler.java
+++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandler.java
@@ -6,10 +6,13 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.utils.Parser;
+import org.schabi.newpipe.extractor.utils.Utils;
 
 public class SoundcloudStreamUrlIdHandler implements UrlIdHandler {
 
     private static final SoundcloudStreamUrlIdHandler instance = new SoundcloudStreamUrlIdHandler();
+    private final String URL_PATTERN = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+" +
+            "/(?!(tracks|albums|sets|reposts|followers|following)/?$)[0-9a-z_-]+/?([#?].*)?$";
 
     private SoundcloudStreamUrlIdHandler() {
     }
@@ -29,6 +32,8 @@ public class SoundcloudStreamUrlIdHandler implements UrlIdHandler {
 
     @Override
     public String getId(String url) throws ParsingException {
+        Utils.checkUrl(URL_PATTERN, url);
+
         try {
             return SoundcloudParsingHelper.resolveIdWithEmbedPlayer(url);
         } catch (Exception e) {
@@ -38,6 +43,8 @@ public class SoundcloudStreamUrlIdHandler implements UrlIdHandler {
 
     @Override
     public String cleanUrl(String complexUrl) throws ParsingException {
+        Utils.checkUrl(URL_PATTERN, complexUrl);
+
         try {
             Element ogElement = Jsoup.parse(NewPipe.getDownloader().download(complexUrl))
                     .select("meta[property=og:url]").first();
@@ -50,7 +57,6 @@ public class SoundcloudStreamUrlIdHandler implements UrlIdHandler {
 
     @Override
     public boolean acceptUrl(String url) {
-        String regex = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+/(?!(tracks|albums|sets|reposts|followers|following)/?$)[0-9a-z_-]+/?([#?].*)?$";
-        return Parser.isMatch(regex, url.toLowerCase());
+        return Parser.isMatch(URL_PATTERN, url.toLowerCase());
     }
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserInfoItemExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserInfoItemExtractor.java
index 925dca73d..0ec5418c4 100644
--- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserInfoItemExtractor.java
+++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserInfoItemExtractor.java
@@ -12,7 +12,7 @@ public class SoundcloudUserInfoItemExtractor implements UserInfoItemExtractor {
 
     @Override
     public String getThumbnailUrl() {
-        return searchResult.getString("avatar_url");
+        return searchResult.optString("avatar_url");
     }
 
     @Override
@@ -37,6 +37,6 @@ public class SoundcloudUserInfoItemExtractor implements UserInfoItemExtractor {
 
     @Override
     public String getDescription() {
-        return searchResult.getString("description");
+        return searchResult.optString("description");
     }
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserUrlIdHandler.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserUrlIdHandler.java
index 40bbb8c11..2f1b3738e 100644
--- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserUrlIdHandler.java
+++ b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserUrlIdHandler.java
@@ -6,10 +6,13 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.utils.Parser;
+import org.schabi.newpipe.extractor.utils.Utils;
 
 public class SoundcloudUserUrlIdHandler implements UrlIdHandler {
 
     private static final SoundcloudUserUrlIdHandler instance = new SoundcloudUserUrlIdHandler();
+    private final String URL_PATTERN = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+" +
+            "(/((tracks|albums|sets|reposts|followers|following)/?)?)?([#?].*)?$";
 
     public static SoundcloudUserUrlIdHandler getInstance() {
         return instance;
@@ -26,6 +29,8 @@ public class SoundcloudUserUrlIdHandler implements UrlIdHandler {
 
     @Override
     public String getId(String url) throws ParsingException {
+        Utils.checkUrl(URL_PATTERN, url);
+
         try {
             return SoundcloudParsingHelper.resolveIdWithEmbedPlayer(url);
         } catch (Exception e) {
@@ -35,6 +40,8 @@ public class SoundcloudUserUrlIdHandler implements UrlIdHandler {
 
     @Override
     public String cleanUrl(String complexUrl) throws ParsingException {
+        Utils.checkUrl(URL_PATTERN, complexUrl);
+
         try {
             Element ogElement = Jsoup.parse(NewPipe.getDownloader().download(complexUrl))
                     .select("meta[property=og:url]").first();
@@ -47,7 +54,6 @@ public class SoundcloudUserUrlIdHandler implements UrlIdHandler {
 
     @Override
     public boolean acceptUrl(String url) {
-        String regex = "^https?://(www\\.)?soundcloud.com/[0-9a-z_-]+(/((tracks|albums|sets|reposts|followers|following)/?)?)?([#?].*)?$";
-        return Parser.isMatch(regex, url.toLowerCase());
+        return Parser.isMatch(URL_PATTERN, url.toLowerCase());
     }
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserUrlIdHandler.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserUrlIdHandler.java
index 657722d41..8efa078f3 100644
--- a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserUrlIdHandler.java
+++ b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserUrlIdHandler.java
@@ -50,9 +50,7 @@ public class YoutubeUserUrlIdHandler implements UrlIdHandler {
 
     @Override
     public boolean acceptUrl(String url) {
-        return (url.contains("youtube") ||
-                url.contains("youtu.be")) &&
-                (url.contains("/user/") ||
-                        url.contains("/channel/"));
+        return (url.contains("youtube") || url.contains("youtu.be"))
+                && (url.contains("/user/") || url.contains("/channel/"));
     }
 }
diff --git a/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java b/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java
index d81b7f8d9..7d5480fdd 100644
--- a/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java
+++ b/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor.utils;
 
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
 public class Utils {
     private Utils() {
         //no instance
@@ -42,4 +44,20 @@ public class Utils {
         }
         return false;
     }
+
+    /**
+     * Check if the url matches the pattern.
+     *
+     * @param pattern the pattern that will be used to check the url
+     * @param url     the url to be tested
+     */
+    public static void checkUrl(String pattern, String url) throws ParsingException {
+        if (url == null || url.isEmpty()) {
+            throw new IllegalArgumentException("Url can't be null or empty");
+        }
+
+        if (!Parser.isMatch(pattern, url.toLowerCase())) {
+            throw new ParsingException("Url not suitable for this url handler");
+        }
+    }
 }
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java
index 36675ea1e..3200bd505 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java
@@ -1,16 +1,14 @@
 package org.schabi.newpipe.extractor.services.soundcloud;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
 
+import static org.junit.Assert.*;
+import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
+
 /**
  * Test for {@link PlaylistExtractor}
  */
@@ -26,7 +24,7 @@ public class SoundcloudPlaylistExtractorTest {
     }
 
     @Test
-    public void testGetDownloader()  throws Exception {
+    public void testGetDownloader() throws Exception {
         assertNotNull(NewPipe.getDownloader());
     }
 
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineAllTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineAllTest.java
index 30cdfaa5e..5c4b10b0f 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineAllTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineAllTest.java
@@ -1,18 +1,19 @@
 package org.schabi.newpipe.extractor.services.soundcloud;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
-
-import java.util.EnumSet;
-
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchResult;
 
+import java.util.EnumSet;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
+
 /**
  * Test for {@link SearchEngine}
  */
@@ -42,6 +43,7 @@ public class SoundcloudSearchEngineAllTest {
         assertTrue(result.errors == null || result.errors.isEmpty());
     }
 
+    @Ignore
     @Test
     public void testSuggestion() {
         //todo write a real test
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineStreamTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineStreamTest.java
index 7db782b21..ad9605c14 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineStreamTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineStreamTest.java
@@ -1,13 +1,7 @@
 package org.schabi.newpipe.extractor.services.soundcloud;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
-
-import java.util.EnumSet;
-
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.InfoItem;
@@ -15,6 +9,11 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchResult;
 
+import java.util.EnumSet;
+
+import static org.junit.Assert.*;
+import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
+
 /**
  * Test for {@link SearchEngine}
  */
@@ -50,6 +49,7 @@ public class SoundcloudSearchEngineStreamTest {
         assertTrue(result.errors == null || result.errors.isEmpty());
     }
 
+    @Ignore
     @Test
     public void testSuggestion() {
         //todo write a real test
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineUserTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineUserTest.java
index 997f96d7e..fd1896fb0 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineUserTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineUserTest.java
@@ -1,13 +1,7 @@
 package org.schabi.newpipe.extractor.services.soundcloud;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
-
-import java.util.EnumSet;
-
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.InfoItem;
@@ -15,6 +9,11 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchResult;
 
+import java.util.EnumSet;
+
+import static org.junit.Assert.*;
+import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
+
 /**
  * Test for {@link SearchEngine}
  */
@@ -50,6 +49,7 @@ public class SoundcloudSearchEngineUserTest {
         assertTrue(result.errors == null || result.errors.isEmpty());
     }
 
+    @Ignore
     @Test
     public void testSuggestion() {
         //todo write a real test
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java
index d7c28a61d..6bd53247d 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java
@@ -1,12 +1,5 @@
 package org.schabi.newpipe.extractor.services.soundcloud;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
-
-import java.io.IOException;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
@@ -17,6 +10,11 @@ import org.schabi.newpipe.extractor.stream.StreamExtractor;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
 import org.schabi.newpipe.extractor.stream.StreamType;
 
+import java.io.IOException;
+
+import static org.junit.Assert.*;
+import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
+
 /**
  * Test for {@link StreamExtractor}
  */
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandlerTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandlerTest.java
index 771c82971..109ae0130 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandlerTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandlerTest.java
@@ -1,18 +1,16 @@
 package org.schabi.newpipe.extractor.services.soundcloud;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
 /**
  * Test for {@link SoundcloudStreamUrlIdHandler}
  */
@@ -25,7 +23,7 @@ public class SoundcloudStreamUrlIdHandlerTest {
         NewPipe.init(Downloader.getInstance());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void getIdWithNullAsUrl() throws ParsingException {
         urlIdHandler.getId(null);
     }
@@ -36,18 +34,19 @@ public class SoundcloudStreamUrlIdHandlerTest {
         invalidUrls.add("https://soundcloud.com/liluzivert/t.e.s.t");
         invalidUrls.add("https://soundcloud.com/liluzivert/tracks");
         invalidUrls.add("https://soundcloud.com/");
-        for(String invalidUrl: invalidUrls) {
+        for (String invalidUrl : invalidUrls) {
             Throwable exception = null;
             try {
                 urlIdHandler.getId(invalidUrl);
             } catch (ParsingException e) {
                 exception = e;
             }
-            if(exception == null) {
+            if (exception == null) {
                 fail("Expected ParsingException for url: " + invalidUrl);
             }
         }
     }
+
     @Test
     public void getId() throws Exception {
         assertEquals("309689103", urlIdHandler.getId("https://soundcloud.com/liluzivert/15-ysl"));
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractorTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractorTest.java
index 6b2641edc..b765ee2c2 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractorTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractorTest.java
@@ -1,10 +1,5 @@
 package org.schabi.newpipe.extractor.services.soundcloud;
 
-import static org.junit.Assert.assertFalse;
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
-
-import java.io.IOException;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
@@ -12,6 +7,11 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.SuggestionExtractor;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 
+import java.io.IOException;
+
+import static org.junit.Assert.assertFalse;
+import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
+
 /**
  * Test for {@link SuggestionExtractor}
  */
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserExtractorTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserExtractorTest.java
index b05e80356..e97300e27 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserExtractorTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudUserExtractorTest.java
@@ -1,21 +1,19 @@
 package org.schabi.newpipe.extractor.services.soundcloud;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.user.UserExtractor;
 
+import static org.junit.Assert.*;
+import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
+
 /**
  * Test for {@link UserExtractor}
  */
 
-public class SoundcloudUserExtractorTest  {
+public class SoundcloudUserExtractorTest {
 
     UserExtractor extractor;
 
@@ -27,7 +25,7 @@ public class SoundcloudUserExtractorTest  {
     }
 
     @Test
-    public void testGetDownloader()  throws Exception {
+    public void testGetDownloader() throws Exception {
         assertNotNull(NewPipe.getDownloader());
     }
 
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java
index 83034870e..37edb5d19 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java
@@ -6,9 +6,7 @@ import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 
 /**
@@ -26,7 +24,7 @@ public class YoutubePlaylistExtractorTest {
     }
 
     @Test
-    public void testGetDownloader()  throws Exception {
+    public void testGetDownloader() throws Exception {
         assertNotNull(NewPipe.getDownloader());
     }
 
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineAllTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineAllTest.java
index 8f80f72c2..0dc887b1e 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineAllTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineAllTest.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.extractor.services.youtube;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -63,6 +64,7 @@ public class YoutubeSearchEngineAllTest {
         assertTrue(result.errors == null || result.errors.isEmpty());
     }
 
+    @Ignore
     @Test
     public void testSuggestion() {
         //todo write a real test
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineStreamTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineStreamTest.java
index 3cf94ce17..8abd048e5 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineStreamTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineStreamTest.java
@@ -1,8 +1,8 @@
 package org.schabi.newpipe.extractor.services.youtube;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
-
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -11,9 +11,7 @@ import org.schabi.newpipe.extractor.search.SearchResult;
 
 import java.util.EnumSet;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 
 
@@ -72,6 +70,7 @@ public class YoutubeSearchEngineStreamTest {
         assertTrue(result.errors == null || result.errors.isEmpty());
     }
 
+    @Ignore
     @Test
     public void testSuggestion() {
         //todo write a real test
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineUserTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineUserTest.java
index 01b2b2985..b871fedcb 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineUserTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineUserTest.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.extractor.services.youtube;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.InfoItem;
@@ -10,9 +11,7 @@ import org.schabi.newpipe.extractor.search.SearchResult;
 
 import java.util.EnumSet;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 
 
@@ -71,6 +70,7 @@ public class YoutubeSearchEngineUserTest {
         assertTrue(result.errors == null || result.errors.isEmpty());
     }
 
+    @Ignore
     @Test
     public void testSuggestion() {
         //todo write a real test
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java
index b3c2b2971..f6c1f9428 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java
@@ -118,7 +118,7 @@ public class YoutubeStreamExtractorDefaultTest {
 
     @Test
     public void testGetVideoStreams() throws IOException, ExtractionException {
-        for(VideoStream s : extractor.getVideoStreams()) {
+        for (VideoStream s : extractor.getVideoStreams()) {
             assertTrue(s.url,
                     s.url.contains(HTTPS));
             assertTrue(s.resolution.length() > 0);
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorGemaTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorGemaTest.java
index 47d0aa8bb..7bc1d5873 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorGemaTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorGemaTest.java
@@ -33,7 +33,7 @@ import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 
 /**
  * This exception is only thrown in Germany.
- *
+ * <p>
  * WARNING: Deactivate this Test Case before uploading it to Github, otherwise CI will fail.
  */
 @Ignore
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java
index 610c8d2e4..faeba3b47 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java
@@ -36,7 +36,7 @@ public class YoutubeStreamExtractorRestrictedTest {
 
     @Test
     public void testGetValidTimeStamp() throws IOException, ExtractionException {
-        StreamExtractor extractor= YouTube.getService()
+        StreamExtractor extractor = YouTube.getService()
                 .getStreamExtractor("https://youtu.be/FmG385_uUys?t=174");
         assertTrue(Integer.toString(extractor.getTimeStamp()),
                 extractor.getTimeStamp() == 174);
@@ -97,7 +97,7 @@ public class YoutubeStreamExtractorRestrictedTest {
 
     @Test
     public void testGetVideoStreams() throws IOException, ExtractionException {
-        for(VideoStream s : extractor.getVideoStreams()) {
+        for (VideoStream s : extractor.getVideoStreams()) {
             assertTrue(s.url,
                     s.url.contains(HTTPS));
             assertTrue(s.resolution.length() > 0);
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandlerTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandlerTest.java
index c0c77714c..3282528fa 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandlerTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandlerTest.java
@@ -10,9 +10,7 @@ import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * Test for {@link YoutubeStreamUrlIdHandler}
@@ -43,18 +41,19 @@ public class YoutubeStreamUrlIdHandlerTest {
         invalidUrls.add("https://www.youtube.com/watch?v=jZViOEv90d");
         invalidUrls.add("https://www.youtube.com/watchjZViOEv90d");
         invalidUrls.add("https://www.youtube.com/");
-        for(String invalidUrl: invalidUrls) {
+        for (String invalidUrl : invalidUrls) {
             Throwable exception = null;
             try {
                 urlIdHandler.getId(invalidUrl);
             } catch (ParsingException e) {
                 exception = e;
             }
-            if(exception == null) {
+            if (exception == null) {
                 fail("Expected ParsingException for url: " + invalidUrl);
             }
         }
     }
+
     @Test
     public void getId() throws Exception {
         assertEquals("jZViOEv90dI", urlIdHandler.getId("https://www.youtube.com/watch?v=jZViOEv90dI"));
@@ -84,7 +83,7 @@ public class YoutubeStreamUrlIdHandlerTest {
         String sharedId = "7JIArTByb3E";
         String realId = "Q7JsK50NGaA";
         assertEquals(realId, urlIdHandler.getId("vnd.youtube://www.YouTube.com/shared?ci=" + sharedId + "&feature=twitter-deep-link"));
-        assertEquals(realId, urlIdHandler.getId("vnd.youtube://www.youtube.com/shared?ci=" + sharedId ));
+        assertEquals(realId, urlIdHandler.getId("vnd.youtube://www.youtube.com/shared?ci=" + sharedId));
         assertEquals(realId, urlIdHandler.getId("https://www.youtube.com/shared?ci=" + sharedId));
     }
 
@@ -111,7 +110,7 @@ public class YoutubeStreamUrlIdHandlerTest {
 
         String sharedId = "8A940MXKFmQ";
         assertTrue(urlIdHandler.acceptUrl("vnd.youtube://www.youtube.com/shared?ci=" + sharedId + "&feature=twitter-deep-link"));
-        assertTrue(urlIdHandler.acceptUrl("vnd.youtube://www.youtube.com/shared?ci=" + sharedId ));
+        assertTrue(urlIdHandler.acceptUrl("vnd.youtube://www.youtube.com/shared?ci=" + sharedId));
         assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/shared?ci=" + sharedId));
     }
 }
\ No newline at end of file
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserExtractorTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserExtractorTest.java
index 0868334a7..fd3c0102e 100644
--- a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserExtractorTest.java
+++ b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserExtractorTest.java
@@ -6,9 +6,7 @@ import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.user.UserExtractor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 
 /*
@@ -35,7 +33,7 @@ import static org.schabi.newpipe.extractor.ServiceList.YouTube;
  * Test for {@link UserExtractor}
  */
 
-public class YoutubeUserExtractorTest  {
+public class YoutubeUserExtractorTest {
 
     UserExtractor extractor;
 
@@ -47,7 +45,7 @@ public class YoutubeUserExtractorTest  {
     }
 
     @Test
-    public void testGetDownloader()  throws Exception {
+    public void testGetDownloader() throws Exception {
         assertNotNull(NewPipe.getDownloader());
     }