diff --git a/cmoncrawl/aggregator/index_query.py b/cmoncrawl/aggregator/index_query.py
index 47d90f7f..f65f4a64 100644
--- a/cmoncrawl/aggregator/index_query.py
+++ b/cmoncrawl/aggregator/index_query.py
@@ -139,7 +139,7 @@ async def get_number_of_pages(
         max_retry: int,
         sleep_base: float,
         page_size: int | None = None,
-    ):
+    ) -> int:
         params: Dict[str, str | int] = {
             "showNumPages": "true",
             "output": "json",
@@ -279,7 +279,7 @@ async def __prefetch_next_crawl(self) -> int:
                 next_crawl = self.__crawls_remaining.popleft()
 
                 try:
-                    pages = await IndexAggregator.get_number_of_pages(
+                    num_pages = await IndexAggregator.get_number_of_pages(
                         self.__client,
                         next_crawl.cdx_server,
                         next_crawl.domain,
@@ -293,10 +293,10 @@ async def __prefetch_next_crawl(self) -> int:
                     )
                     continue
                 all_purpose_logger.info(
-                    f"Found {pages} pages for {next_crawl.domain} from {next_crawl.cdx_server}"
+                    f"Found {num_pages} pages for {next_crawl.domain} from {next_crawl.cdx_server}"
                 )
 
-                for i in range(pages):
+                for i in range(num_pages):
                     dc = DomainCrawl(
                         next_crawl.domain, next_crawl.cdx_server, i
                     )
@@ -315,7 +315,7 @@ async def __prefetch_next_crawl(self) -> int:
                             ),
                         )
                     )
-                return pages
+                return num_pages
             return 0
 
         async def __await_next_prefetch(self):
diff --git a/tests/aggregator_tests.py b/tests/aggregator_tests.py
index 498f442e..f5cd8dbc 100644
--- a/tests/aggregator_tests.py
+++ b/tests/aggregator_tests.py
@@ -64,7 +64,7 @@ async def asyncTearDown(self) -> None:
         await self.di.aclose(None, None, None)
 
     async def test_indexer_num_pages(self):
-        response = await self.di.get_number_of_pages(
+        num_pages = await self.di.get_number_of_pages(
             self.client,
             self.CC_SERVERS[0],
             "idnes.cz",
@@ -72,10 +72,7 @@ async def test_indexer_num_pages(self):
             sleep_base=4,
             match_type=MatchType.DOMAIN,
         )
-        self.assertIsNotNone(response)
-        num, size = response.content
-        self.assertEqual(num, 14)
-        self.assertEqual(size, 5)
+        self.assertEqual(num_pages, 14)
 
     async def test_indexer_all_CC(self):
         indexes = await get_all_CC_indexes(
@@ -189,16 +186,6 @@ async def test_unify_urls_id(self):
         for i, url in enumerate(urls):
             self.assertEquals(unify_url_id(url), urls_ids[i])
 
-    async def test_logging_failure_page(self):
-        async for record in self.di:
-            self.assertIsNotNone(record)
-            self.assertIsNotNone(record.url)
-            self.assertIsNotNone(record.filename)
-            self.assertIsNotNone(record.offset)
-            self.assertIsNotNone(record.length)
-            self.assertIsNotNone(record.timestamp)
-            self.assertIsNotNone(record.status)
-
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/end_to_end_tests.py b/tests/end_to_end_tests.py
index 6af27292..1643c751 100644
--- a/tests/end_to_end_tests.py
+++ b/tests/end_to_end_tests.py
@@ -16,7 +16,7 @@
 from cmoncrawl.processor.connectors.base import ICC_Dao
 
 
-class Download_files(unittest.IsolatedAsyncioTestCase):
+class ExtractFiles(unittest.IsolatedAsyncioTestCase):
     """
     CLI Testing
     """
@@ -64,9 +64,10 @@ async def test_extract_from_records(self, dao: DAOname):
         with open(output_folder / "0_file.jsonl") as f:
             lines = f.readlines()
         self.assertEqual(len(lines), 5)
-        self.assertEqual(
-            json.loads(lines[4])["title"],
+        titles = [json.loads(line)["title"] for line in lines]
+        self.assertIn(
             '<title data-document-head-keeper="0">Seznam – najdu tam, co neznám</title>',
+            titles,
         )
 
     async def test_extract_from_html(self):
@@ -95,45 +96,4 @@ async def test_extract_from_html(self):
             '<title data-document-head-keeper="0">Seznam – najdu tam, co neznám</title>',
         )
 
-
-class Download_files(unittest.IsolatedAsyncioTestCase):
-    """
-    CLI Testing
-    """
-
-    async def asyncSetUp(self) -> None:
-        all_purpose_logger.setLevel("DEBUG")
-        metadata_logger.setLevel("DEBUG")
-        self.base_folder = Path(__file__).parent / "test_extract"
-        self.output_folder = self.base_folder / "output"
-
-    async def asyncTearDown(self) -> None:
-        # remoev output folder
-        if self.output_folder.exists():
-            shutil.rmtree(self.output_folder)
-
-    @parameterized.expand([(DAOname.API,), (DAOname.S3,)])
-    async def test_download_records(self, dao: DAOname):
-        await url_download(
-            url="https://example.com",
-            match_type=None,
-            output=self.output_folder / "directory_0" / "0_file.jsonl",
-            cc_server=None,
-            since=datetime(2021, 1, 1),
-            to=datetime(2021, 12, 31),
-            limit=100,
-            max_retry=40,
-            sleep_base=1.4,
-            mode=DownloadOutputFormat.RECORD,
-            max_crawls_per_file=1,
-            max_directory_size=10,
-            filter_non_200=True,
-            encoding="utf-8",
-            download_method=dao,
-        )
-        self.assertTrue((self.output_folder / "downloaded_file.txt").exists())
-        with open(self.output_folder / "directory_0" / "0_file.jsonl") as f:
-            lines = f.readlines()
-
-        lines = [json.loads(line) for line in lines]
-        self.assertEqual(len(lines), 5)
+    # TODO Add test for download