diff --git a/gallery_dl/extractor/batoto.py b/gallery_dl/extractor/batoto.py
index cfabd11b..0b8f1677 100644
--- a/gallery_dl/extractor/batoto.py
+++ b/gallery_dl/extractor/batoto.py
@@ -18,9 +18,9 @@ class BatotoExtractor(AsynchronousExtractor):
     directory_fmt = ["{category}", "{manga}", "c{chapter:>03} - {title}"]
     filename_fmt = "{manga}_c{chapter:>03}_{page:>03}.{extension}"
     pattern = [r"(?:https?://)?(?:www\.)?bato\.to/reader#([0-9a-f]+)"]
-    test = [("http://bato.to/reader#df48fa98f7d41851", {
-        "url": "ab0526091f65b8eda7a8866b937adbdb468d68b1",
-        "keyword": "ef14d3230aa0872e8d9e4236ed9160755f78aeb3",
+    test = [("https://bato.to/reader#41c311af0d317c73", {
+        "url": "5b40e121dce03918db52d05be820bec14e75b7ac",
+        "keyword": "dfe033b8d3df5bf8e037c709675ef449cba75867",
     })]
     url = "https://bato.to/areader"
 
@@ -67,7 +67,7 @@ class BatotoExtractor(AsynchronousExtractor):
         return {
             "category": self.category,
             "token": self.token,
-            "manga": manga,
+            "manga": text.unescape(manga),
             "volume": match.group(2) or "",
             "chapter": match.group(3),
             "chapter-extra": match.group(4),
diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py
index 0a371779..82d09b75 100644
--- a/gallery_dl/extractor/danbooru.py
+++ b/gallery_dl/extractor/danbooru.py
@@ -21,7 +21,7 @@ class DanbooruTagExtractor(DanbooruExtractor, booru.BooruTagExtractor):
     pattern = [(r"(?:https?://)?(?:www\.)?danbooru.donmai.us/posts"
                 r"\?(?:utf8=%E2%9C%93&)?tags=([^&]+)")]
     test = [("https://danbooru.donmai.us/posts?tags=bonocho", {
-        "url": "f05b24cfd01a98eab6e8a4501885e3c29928738c",
+        "url": "fb730af3f5e15650e5d924ffcda54b9ef232b89b",
         "content": "b196fb9f1668109d7774a0a82efea3ffdda07746",
     })]
 
@@ -30,7 +30,7 @@ class DanbooruPoolExtractor(DanbooruExtractor, booru.BooruPoolExtractor):
     subcategory = "pool"
     pattern = [r"(?:https?://)?(?:www\.)?danbooru.donmai.us/pools/(\d+)"]
     test = [("https://danbooru.donmai.us/pools/7659", {
-        "url": "db522c7f74d42ec1940fb23d1a58ed8edb65f9ae",
+        "url": "73c02ec3d67ffd46d489dd6cfd7b35fee053865c",
         "content": "b16bab12bea5f7ea9e0a836bf8045f280e113d99",
     })]
 
@@ -39,6 +39,6 @@ class DanbooruPostExtractor(DanbooruExtractor, booru.BooruPostExtractor):
     subcategory = "post"
     pattern = [r"(?:https?://)?(?:www\.)?danbooru.donmai.us/posts/(\d+)"]
     test = [("https://danbooru.donmai.us/posts/294929", {
-        "url": "98fb9f9dc48ef5794891c6725f3610efaf6042c1",
+        "url": "9caa006a4d9eedbacbe030655ade0d3225399749",
         "content": "5e255713cbf0a8e0801dc423563c34d896bb9229",
     })]
diff --git a/gallery_dl/extractor/kissmanga.py b/gallery_dl/extractor/kissmanga.py
index 9705c0a2..9a406c3f 100644
--- a/gallery_dl/extractor/kissmanga.py
+++ b/gallery_dl/extractor/kissmanga.py
@@ -52,11 +52,11 @@ class KissmangaChapterExtractor(KissmangaExtractor):
     pattern = [r"(?:https?://)?(?:www\.)?kissmanga\.com/Manga/.+/.+\?id=\d+"]
     test = [
         ("http://kissmanga.com/Manga/Dropout/Ch-000---Oneshot-?id=145847", {
-            "url": "d9ce171d3d4c0493dbb169a5641ac4cd45b0cb3a",
+            "url": "4136bcd1c6cecbca8cc2bc965d54f33ef0a97cc0",
             "keyword": "892c3e4df03a575a282a5695add986a49623d746",
         }),
         ("http://kissmanga.com/Manga/Urban-Tales/a?id=256717", {
-            "url": "b8dbf9fca1d8c942ca5fefd10299da49e8399081",
+            "url": "de074848f6c1245204bb9214c12bcc3ecfd65019",
             "keyword": "0a98952984941cc2a11892b1cd7b237ffb20adaa",
         })
     ]
diff --git a/gallery_dl/extractor/mangamint.py b/gallery_dl/extractor/mangamint.py
index ec567e3a..e5c1a50a 100644
--- a/gallery_dl/extractor/mangamint.py
+++ b/gallery_dl/extractor/mangamint.py
@@ -54,7 +54,7 @@ class MangaMintChapterExtractor(Extractor):
     filename_fmt = "{manga}_c{chapter:>03}{chapter-minor}_{page:>03}.{extension}"
     pattern = [r"(?:https?://)?(?:www\.)?mangamint\.com/([^\?]+-(\d+))"]
     test = [("http://www.mangamint.com/mushishi-1", {
-        "url": "eb1669d7043a17b79ccc92454c2676200628800c",
+        "url": "337f46c4dab50f544e9196ced723ac8f70400dd0",
         "keyword": "ca4ba6fa84367fd7c345879a17ebaad39b589da5",
     })]
 
diff --git a/gallery_dl/extractor/safebooru.py b/gallery_dl/extractor/safebooru.py
index 310d9b54..1d358e8d 100644
--- a/gallery_dl/extractor/safebooru.py
+++ b/gallery_dl/extractor/safebooru.py
@@ -40,5 +40,5 @@ class SafebooruPostExtractor(SafebooruExtractor, booru.BooruPostExtractor):
     pattern = [r"(?:https?://)?(?:www\.)?safebooru\.org/(?:index\.php)?\?page=post&s=view&id=(\d+)"]
     test = [("http://safebooru.org/index.php?page=post&s=view&id=1169132", {
         "url": "bcb6047665729c7c9db243a27f41cbef9af1ecef",
-        "keyword": "e2d9a87a66d89eb68d3e3420075c3be3c7ca530a",
+        "content": "93b293b27dabd198afafabbaf87c49863ac82f27",
     })]
diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py
index a5c6d9ed..710d2160 100644
--- a/gallery_dl/extractor/tumblr.py
+++ b/gallery_dl/extractor/tumblr.py
@@ -20,8 +20,8 @@ class TumblrUserExtractor(Extractor):
     filename_fmt = "{category}_{user}_{id}{offset}.{extension}"
     pattern = [r"(?:https?://)?([^.]+)\.tumblr\.com(?:/page/\d+)?/?$"]
     test = [("http://demo.tumblr.com/", {
-        "url": "a62b4f5dcb838645342b3ec0eb2dfb0342779699",
-        "keyword": "97e812ffa3319d4e46a91f09ddfbd24c9b97015a",
+        "url": "33ef388847dfa9d2b64232e4a3a5e193355ff2a5",
+        "keyword": "6c7010ef2e7c9c2df13c3233e57e7ec93ee9d6cd",
         "content": "31495fdb9f84edbb7f67972746a1521456f649e2",
     })]
 
@@ -89,8 +89,8 @@ class TumblrPostExtractor(TumblrUserExtractor):
     subcategory = "post"
     pattern = [r"(?:https?://)?([^.]+)\.tumblr\.com/post/(\d+)"]
     test = [("http://demo.tumblr.com/post/459265350", {
-        "url": "a62b4f5dcb838645342b3ec0eb2dfb0342779699",
-        "keyword": "2ea10536a046dafaaf5ccf2c2e9cce870bf4f7b2",
+        "url": "33ef388847dfa9d2b64232e4a3a5e193355ff2a5",
+        "keyword": "4f2ffeb2732955436fbc208741abf63fd0dfa777",
     })]
 
     def __init__(self, match):
@@ -103,8 +103,8 @@ class TumblrTagExtractor(TumblrUserExtractor):
     subcategory = "tag"
     pattern = [r"(?:https?://)?([^.]+)\.tumblr\.com/tagged/(.+)"]
     test = [("http://demo.tumblr.com/tagged/Times Square", {
-        "url": "a62b4f5dcb838645342b3ec0eb2dfb0342779699",
-        "keyword": "97e812ffa3319d4e46a91f09ddfbd24c9b97015a",
+        "url": "33ef388847dfa9d2b64232e4a3a5e193355ff2a5",
+        "keyword": "6c7010ef2e7c9c2df13c3233e57e7ec93ee9d6cd",
     })]
 
     def __init__(self, match):