diff --git a/tests/__data__/expected/.gh-pages/categories/undefined.m3u b/tests/__data__/expected/.gh-pages/categories/undefined.m3u
index aec4e52a8..504f98807 100644
--- a/tests/__data__/expected/.gh-pages/categories/undefined.m3u
+++ b/tests/__data__/expected/.gh-pages/categories/undefined.m3u
@@ -5,7 +5,5 @@
 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8
 #EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV
 http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Tastemade
-https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Zoo.ad" tvg-logo="" group-title="Undefined",Zoo (720p)
 https://iptv-all.lanesh4d0w.repl.co/andorra/zoo
diff --git a/tests/__data__/expected/.gh-pages/countries/undefined.m3u b/tests/__data__/expected/.gh-pages/countries/undefined.m3u
index 8229afc46..275a498ee 100644
--- a/tests/__data__/expected/.gh-pages/countries/undefined.m3u
+++ b/tests/__data__/expected/.gh-pages/countries/undefined.m3u
@@ -1,3 +1 @@
 #EXTM3U x-tvg-url=""
-#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Tastemade
-https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8
diff --git a/tests/__data__/expected/.gh-pages/index.category.m3u b/tests/__data__/expected/.gh-pages/index.category.m3u
index 11ee27c00..000a8fafe 100644
--- a/tests/__data__/expected/.gh-pages/index.category.m3u
+++ b/tests/__data__/expected/.gh-pages/index.category.m3u
@@ -13,7 +13,5 @@ http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8
 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8
 #EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Daawah TV
 http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Tastemade
-https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Zoo.ad" tvg-logo="" group-title="Undefined",Zoo (720p)
 https://iptv-all.lanesh4d0w.repl.co/andorra/zoo
diff --git a/tests/__data__/expected/.gh-pages/index.country.m3u b/tests/__data__/expected/.gh-pages/index.country.m3u
index 067830fc5..bc902ced3 100644
--- a/tests/__data__/expected/.gh-pages/index.country.m3u
+++ b/tests/__data__/expected/.gh-pages/index.country.m3u
@@ -511,5 +511,3 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
 #EXTINF:-1 tvg-id="BBCNews.uk" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-kingdom/bbc-news-uk.png" group-title="Åland",BBC News HD
 http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Tastemade
-https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8
diff --git a/tests/__data__/expected/.gh-pages/index.language.m3u b/tests/__data__/expected/.gh-pages/index.language.m3u
index fe5c28009..409b6f699 100644
--- a/tests/__data__/expected/.gh-pages/index.language.m3u
+++ b/tests/__data__/expected/.gh-pages/index.language.m3u
@@ -11,7 +11,5 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8
 http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8
 #EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Undefined",Meteomedia
 http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Tastemade
-https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Zoo.ad" tvg-logo="" group-title="Undefined",Zoo (720p)
 https://iptv-all.lanesh4d0w.repl.co/andorra/zoo
diff --git a/tests/__data__/expected/.gh-pages/index.m3u b/tests/__data__/expected/.gh-pages/index.m3u
index ad4e0b6e2..9d9ca8699 100644
--- a/tests/__data__/expected/.gh-pages/index.m3u
+++ b/tests/__data__/expected/.gh-pages/index.m3u
@@ -9,8 +9,6 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
 http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8
 #EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia
 http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Tastemade
-https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Zoo.ad" tvg-logo="" group-title="Undefined",Zoo (720p)
 https://iptv-all.lanesh4d0w.repl.co/andorra/zoo
 #EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (1080p)
diff --git a/tests/__data__/expected/.gh-pages/index.nsfw.m3u b/tests/__data__/expected/.gh-pages/index.nsfw.m3u
index 6763fe590..21cfa284f 100644
--- a/tests/__data__/expected/.gh-pages/index.nsfw.m3u
+++ b/tests/__data__/expected/.gh-pages/index.nsfw.m3u
@@ -9,8 +9,6 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8
 http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8
 #EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia
 http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Tastemade
-https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="VisitXTV.nl" tvg-logo="https://i.imgur.com/RJ9wbNF.jpg" group-title="XXX",Visit-X TV
 https://stream.visit-x.tv/vxtv/ngrp:live_all/60fps.m3u8
 #EXTINF:-1 tvg-id="Zoo.ad" tvg-logo="" group-title="Undefined",Zoo (720p)
diff --git a/tests/__data__/expected/.gh-pages/index.region.m3u b/tests/__data__/expected/.gh-pages/index.region.m3u
index d67b3d648..3a4d52c18 100644
--- a/tests/__data__/expected/.gh-pages/index.region.m3u
+++ b/tests/__data__/expected/.gh-pages/index.region.m3u
@@ -45,5 +45,3 @@ http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8
 https://iptv-all.lanesh4d0w.repl.co/andorra/zoo
 #EXTINF:-1 tvg-id="LDPRTV.ru" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="Worldwide",ЛДПР ТВ (1080p)
 http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Tastemade
-https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8
diff --git a/tests/__data__/expected/.gh-pages/languages/undefined.m3u b/tests/__data__/expected/.gh-pages/languages/undefined.m3u
index c758d99e3..e5bbc812e 100644
--- a/tests/__data__/expected/.gh-pages/languages/undefined.m3u
+++ b/tests/__data__/expected/.gh-pages/languages/undefined.m3u
@@ -7,7 +7,5 @@ http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8
 http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8
 #EXTINF:-1 tvg-id="MeteoMedia.ca" tvg-logo="https://s1.twnmm.com/images/en_ca/mobile/logos/twn-mobile-logo.png" group-title="Weather",Meteomedia
 http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Tastemade
-https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Zoo.ad" tvg-logo="" group-title="Undefined",Zoo (720p)
 https://iptv-all.lanesh4d0w.repl.co/andorra/zoo
diff --git a/tests/__data__/expected/.gh-pages/regions/undefined.m3u b/tests/__data__/expected/.gh-pages/regions/undefined.m3u
index 8229afc46..275a498ee 100644
--- a/tests/__data__/expected/.gh-pages/regions/undefined.m3u
+++ b/tests/__data__/expected/.gh-pages/regions/undefined.m3u
@@ -1,3 +1 @@
 #EXTM3U x-tvg-url=""
-#EXTINF:-1 tvg-id="" tvg-logo="" group-title="Undefined",Tastemade
-https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8
diff --git a/tests/__data__/expected/database/db_create.streams.db b/tests/__data__/expected/database/db_create.streams.db
index fe943bd50..2016f59ba 100644
--- a/tests/__data__/expected/database/db_create.streams.db
+++ b/tests/__data__/expected/database/db_create.streams.db
@@ -1,5 +1,4 @@
 {"channel":null,"title":"TVN","filepath":"tests/__data__/input/streams/us_blocked.m3u","url":"https://example.com/playlist2.m3u8","http_referrer":null,"user_agent":null,"cluster_id":1,"_id":"UAYbCvjOWvqXHH95"}
-{"channel":null,"title":"1A Network (720p)","filepath":"tests/__data__/input/streams/unsorted.m3u","url":"https://simultv.s.llnwi.net/n4s4/2ANetwork/interlink.m3u8","http_referrer":null,"user_agent":null,"cluster_id":1,"_id":"IjKHoixx2crsuOlE"}
 {"channel":"LibyasChannel.ly","title":"Libyas Channel","filepath":"tests/__data__/input/streams/ly.m3u","url":"https://master.starmena-cloud.com/hls/libyas.m3u8","http_referrer":null,"user_agent":null,"status":"online","width":1024,"height":576,"bitrate":0,"frame_rate":25,"added_at":"2022-07-07T00:00:00Z","updated_at":"2022-07-07T00:00:00Z","checked_at":"2022-07-07T00:00:00Z","cluster_id":1,"_id":"I0rJlwp3rZEy2SnG"}
 {"channel":"EverydayHeroes.us","title":"Everyday Heroes (720p)","filepath":"tests/__data__/input/streams/us_blocked.m3u","url":"https://a.jsrdn.com/broadcast/7b1451fa52/+0000/c.m3u8","http_referrer":null,"user_agent":null,"cluster_id":1,"_id":"tdzk1IN7wLJxfGab"}
 {"channel":null,"title":"ATV (720p) [Offline]","filepath":"tests/__data__/input/streams/ad.m3u","url":"https://iptv-all.lanesh4d0w.repl.co/andorra/atv","http_referrer":"http://imn.iq","user_agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148","status":"error","added_at":"2022-07-07T00:00:00Z","updated_at":"2022-08-07T00:00:00Z","checked_at":"2022-08-07T00:00:00Z","cluster_id":1,"_id":"3evMHt3nFsZjhzas"}
diff --git a/tests/__data__/expected/logs/generators/categories.log b/tests/__data__/expected/logs/generators/categories.log
index 9e170e51c..af68b09a9 100644
--- a/tests/__data__/expected/logs/generators/categories.log
+++ b/tests/__data__/expected/logs/generators/categories.log
@@ -26,4 +26,4 @@
 {"filepath":"categories/travel.m3u","count":0}
 {"filepath":"categories/weather.m3u","count":1}
 {"filepath":"categories/xxx.m3u","count":1}
-{"filepath":"categories/undefined.m3u","count":4}
\ No newline at end of file
+{"filepath":"categories/undefined.m3u","count":3}
\ No newline at end of file
diff --git a/tests/__data__/expected/logs/generators/countries.log b/tests/__data__/expected/logs/generators/countries.log
index c2b3b1676..808e96554 100644
--- a/tests/__data__/expected/logs/generators/countries.log
+++ b/tests/__data__/expected/logs/generators/countries.log
@@ -248,4 +248,4 @@
 {"filepath":"countries/zm.m3u","count":1}
 {"filepath":"countries/zw.m3u","count":1}
 {"filepath":"countries/ax.m3u","count":1}
-{"filepath":"countries/undefined.m3u","count":1}
\ No newline at end of file
+{"filepath":"countries/undefined.m3u","count":0}
\ No newline at end of file
diff --git a/tests/__data__/expected/logs/generators/index_category_m3u.log b/tests/__data__/expected/logs/generators/index_category_m3u.log
index fa8ba62b8..5a6520c53 100644
--- a/tests/__data__/expected/logs/generators/index_category_m3u.log
+++ b/tests/__data__/expected/logs/generators/index_category_m3u.log
@@ -1 +1 @@
-{"filepath":"index.category.m3u","count":8}
\ No newline at end of file
+{"filepath":"index.category.m3u","count":7}
\ No newline at end of file
diff --git a/tests/__data__/expected/logs/generators/index_country_m3u.log b/tests/__data__/expected/logs/generators/index_country_m3u.log
index 11d20bf36..fbc54900a 100644
--- a/tests/__data__/expected/logs/generators/index_country_m3u.log
+++ b/tests/__data__/expected/logs/generators/index_country_m3u.log
@@ -1 +1 @@
-{"filepath":"index.country.m3u","count":256}
\ No newline at end of file
+{"filepath":"index.country.m3u","count":255}
\ No newline at end of file
diff --git a/tests/__data__/expected/logs/generators/index_language_m3u.log b/tests/__data__/expected/logs/generators/index_language_m3u.log
index c3d549c79..745e1fede 100644
--- a/tests/__data__/expected/logs/generators/index_language_m3u.log
+++ b/tests/__data__/expected/logs/generators/index_language_m3u.log
@@ -1 +1 @@
-{"filepath":"index.language.m3u","count":7}
\ No newline at end of file
+{"filepath":"index.language.m3u","count":6}
\ No newline at end of file
diff --git a/tests/__data__/expected/logs/generators/index_m3u.log b/tests/__data__/expected/logs/generators/index_m3u.log
index eb39be430..b91b792f1 100644
--- a/tests/__data__/expected/logs/generators/index_m3u.log
+++ b/tests/__data__/expected/logs/generators/index_m3u.log
@@ -1 +1 @@
-{"filepath":"index.m3u","count":7}
\ No newline at end of file
+{"filepath":"index.m3u","count":6}
\ No newline at end of file
diff --git a/tests/__data__/expected/logs/generators/index_nsfw_m3u.log b/tests/__data__/expected/logs/generators/index_nsfw_m3u.log
index c44134e77..bdb924f9c 100644
--- a/tests/__data__/expected/logs/generators/index_nsfw_m3u.log
+++ b/tests/__data__/expected/logs/generators/index_nsfw_m3u.log
@@ -1 +1 @@
-{"filepath":"index.nsfw.m3u","count":8}
\ No newline at end of file
+{"filepath":"index.nsfw.m3u","count":7}
\ No newline at end of file
diff --git a/tests/__data__/expected/logs/generators/index_region_m3u.log b/tests/__data__/expected/logs/generators/index_region_m3u.log
index 6b5c533f9..276db17fc 100644
--- a/tests/__data__/expected/logs/generators/index_region_m3u.log
+++ b/tests/__data__/expected/logs/generators/index_region_m3u.log
@@ -1 +1 @@
-{"filepath":"index.region.m3u","count":21}
\ No newline at end of file
+{"filepath":"index.region.m3u","count":20}
\ No newline at end of file
diff --git a/tests/__data__/expected/logs/generators/languages.log b/tests/__data__/expected/logs/generators/languages.log
index 6d88ad28d..cfc303aef 100644
--- a/tests/__data__/expected/logs/generators/languages.log
+++ b/tests/__data__/expected/logs/generators/languages.log
@@ -1,3 +1,3 @@
 {"filepath":"languages/eng.m3u","count":1}
 {"filepath":"languages/rus.m3u","count":1}
-{"filepath":"languages/undefined.m3u","count":5}
\ No newline at end of file
+{"filepath":"languages/undefined.m3u","count":4}
\ No newline at end of file
diff --git a/tests/__data__/expected/logs/generators/regions.log b/tests/__data__/expected/logs/generators/regions.log
index 55cc847a0..95499a139 100644
--- a/tests/__data__/expected/logs/generators/regions.log
+++ b/tests/__data__/expected/logs/generators/regions.log
@@ -22,4 +22,4 @@
 {"filepath":"regions/ssa.m3u","count":0}
 {"filepath":"regions/wafr.m3u","count":0}
 {"filepath":"regions/int.m3u","count":6}
-{"filepath":"regions/undefined.m3u","count":1}
\ No newline at end of file
+{"filepath":"regions/undefined.m3u","count":0}
\ No newline at end of file
diff --git a/tests/__data__/input/database/playlist_generate.streams.db b/tests/__data__/input/database/playlist_generate.streams.db
index 295044794..b5a032003 100644
--- a/tests/__data__/input/database/playlist_generate.streams.db
+++ b/tests/__data__/input/database/playlist_generate.streams.db
@@ -8,8 +8,6 @@
 {"title":"Andorra TV (720p) [Not 24/7]","channel":"","filepath":"tests/__data__/output/streams/uk.m3u","url":"http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index2.m3u8","http_referrer":"http://imn.iq","user_agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148","height":720,"width":1280,"status":"online","cluster_id":3,"_id":"WTbieV1ptnZVCIdn"}
 {"title":"Visit-X TV","channel":"VisitXTV.nl","filepath":"tests/__data__/output/streams/nl.m3u","url":"https://stream.visit-x.tv/vxtv/ngrp:live_all/30fps.m3u8","frame_rate":30,"http_referrer":null,"user_agent":null,"status":"online","cluster_id":1,"_id":"2ST8btby3mmsgPF5"}
 {"title":"Visit-X TV","channel":"VisitXTV.nl","filepath":"tests/__data__/output/streams/nl.m3u","url":"https://stream.visit-x.tv/vxtv/ngrp:live_all/60fps.m3u8","frame_rate":60,"http_referrer":null,"user_agent":null,"status":"online","cluster_id":1,"_id":"2ST8btby3mmsgPF6"}
-{"title":"Tastemade","channel":"","filepath":"tests/__data__/output/streams/unsorted.m3u","url":"https://tastemade-freetv16min-plex.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-plex/CDN/playlist.m3u8","http_referrer":null,"user_agent":null,"status":"online","cluster_id":1,"_id":"2ST8btby3mmsgPAB"}
-{"title":"Supra","channel":"","filepath":"tests/__data__/output/streams/unsorted.m3u","url":"https://www.youtube.com/watch?v=dzShOMiH1FY","http_referrer":null,"user_agent":null,"status":"error","cluster_id":1,"_id":"2ST8btby3mmsg5AB"}
 {"title":"Daawah TV","channel":"","filepath":"tests/__data__/output/streams/in.m3u","url":"http://51.15.246.58:8081/daawahtv/daawahtv2/playlist.m3u8","http_referrer":null,"user_agent":null,"status":"online","cluster_id":1,"_id":"2ST8btby3mmsgPF9"}
 {"title":"Meteomedia","channel":"MeteoMedia.ca","filepath":"tests/__data__/output/streams/in.m3u","url":"http://encodercdn1.frontline.ca/encoder181/output/Meteo_Media_720p/playlist.m3u8","http_referrer":null,"user_agent":null,"status":"online","cluster_id":1,"_id":"2ST8btby3mmsgP49"}
 {"title":"Zoo (480p)","channel":"Zoo.ad","filepath":"tests/__data__/output/streams/ad.m3u","url":"https://iptv-all.lanesh4d0w.repl.co/andorra/zoo?480","http_referrer":null,"user_agent":null,"height":480,"width":640,"status":"online","cluster_id":1,"_id":"I6cjG2xCBRFFP4s3"}