diff --git a/codegen/src/download_testfiles.rs b/codegen/src/download_testfiles.rs
index 4e47339..58a19d3 100644
--- a/codegen/src/download_testfiles.rs
+++ b/codegen/src/download_testfiles.rs
@@ -194,9 +194,11 @@ async fn comments_top(testfiles: &Path) {
     let details = rp.query().video_details("ZeerrnuLi5E").await.unwrap();
 
     let rp = rp_testfile(&json_path);
-    rp.query()
-        .video_comments(&details.top_comments.ctoken.unwrap())
+    details
+        .top_comments
+        .next(rp.query())
         .await
+        .unwrap()
         .unwrap();
 }
 
@@ -212,9 +214,11 @@ async fn comments_latest(testfiles: &Path) {
     let details = rp.query().video_details("ZeerrnuLi5E").await.unwrap();
 
     let rp = rp_testfile(&json_path);
-    rp.query()
-        .video_comments(&details.latest_comments.ctoken.unwrap())
+    details
+        .latest_comments
+        .next(rp.query())
         .await
+        .unwrap()
         .unwrap();
 }
 
diff --git a/src/client/mod.rs b/src/client/mod.rs
index 3001afa..0ec221c 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -1108,8 +1108,3 @@ trait MapResponse<T> {
         deobf: Option<&Deobfuscator>,
     ) -> Result<MapResult<T>, ExtractionError>;
 }
-
-#[cfg(test)]
-mod tests {
-    // use super::*;
-}