diff --git a/pubky/src/shared/public.rs b/pubky/src/shared/public.rs
index 1fc7e4f..2f9e73b 100644
--- a/pubky/src/shared/public.rs
+++ b/pubky/src/shared/public.rs
@@ -207,25 +207,24 @@ mod tests {
 
         client.signup(&keypair, &server.public_key()).await.unwrap();
 
+        let pubky = keypair.public_key();
+
         let urls = vec![
-            format!("pubky://{}/pub/a.wrong/a.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/a.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/b.txt", keypair.public_key()),
-            format!(
-                "pubky://{}/pub/example.com/cc-nested/z.txt",
-                keypair.public_key()
-            ),
-            format!("pubky://{}/pub/example.wrong/a.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/c.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/d.txt", keypair.public_key()),
-            format!("pubky://{}/pub/z.wrong/a.txt", keypair.public_key()),
+            format!("pubky://{pubky}/pub/a.wrong/a.txt"),
+            format!("pubky://{pubky}/pub/example.com/a.txt"),
+            format!("pubky://{pubky}/pub/example.com/b.txt"),
+            format!("pubky://{pubky}/pub/example.com/cc-nested/z.txt"),
+            format!("pubky://{pubky}/pub/example.wrong/a.txt"),
+            format!("pubky://{pubky}/pub/example.com/c.txt"),
+            format!("pubky://{pubky}/pub/example.com/d.txt"),
+            format!("pubky://{pubky}/pub/z.wrong/a.txt"),
         ];
 
         for url in urls {
             client.put(url.as_str(), &[0]).await.unwrap();
         }
 
-        let url = format!("pubky://{}/pub/example.com/extra", keypair.public_key());
+        let url = format!("pubky://{pubky}/pub/example.com/extra");
         let url = url.as_str();
 
         {
@@ -234,14 +233,11 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/example.com/a.txt", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/b.txt", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/c.txt", keypair.public_key()),
-                    format!(
-                        "pubky://{}/pub/example.com/cc-nested/z.txt",
-                        keypair.public_key()
-                    ),
-                    format!("pubky://{}/pub/example.com/d.txt", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.com/a.txt"),
+                    format!("pubky://{pubky}/pub/example.com/b.txt"),
+                    format!("pubky://{pubky}/pub/example.com/c.txt"),
+                    format!("pubky://{pubky}/pub/example.com/cc-nested/z.txt"),
+                    format!("pubky://{pubky}/pub/example.com/d.txt"),
                 ],
                 "normal list with no limit or cursor"
             );
@@ -253,8 +249,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/example.com/a.txt", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/b.txt", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.com/a.txt"),
+                    format!("pubky://{pubky}/pub/example.com/b.txt"),
                 ],
                 "normal list with limit but no cursor"
             );
@@ -273,8 +269,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/example.com/b.txt", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/c.txt", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.com/b.txt"),
+                    format!("pubky://{pubky}/pub/example.com/c.txt"),
                 ],
                 "normal list with limit and a file cursor"
             );
@@ -293,11 +289,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!(
-                        "pubky://{}/pub/example.com/cc-nested/z.txt",
-                        keypair.public_key()
-                    ),
-                    format!("pubky://{}/pub/example.com/d.txt", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.com/cc-nested/z.txt"),
+                    format!("pubky://{pubky}/pub/example.com/d.txt"),
                 ],
                 "normal list with limit and a directory cursor"
             );
@@ -308,10 +301,7 @@ mod tests {
                 .list(url)
                 .unwrap()
                 .limit(2)
-                .cursor(&format!(
-                    "pubky://{}/pub/example.com/a.txt",
-                    keypair.public_key()
-                ))
+                .cursor(&format!("pubky://{pubky}/pub/example.com/a.txt"))
                 .send()
                 .await
                 .unwrap();
@@ -319,8 +309,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/example.com/b.txt", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/c.txt", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.com/b.txt"),
+                    format!("pubky://{pubky}/pub/example.com/c.txt"),
                 ],
                 "normal list with limit and a full url cursor"
             );
@@ -339,8 +329,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/example.com/b.txt", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/c.txt", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.com/b.txt"),
+                    format!("pubky://{pubky}/pub/example.com/c.txt"),
                 ],
                 "normal list with limit and a leading / cursor"
             );
@@ -358,14 +348,11 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/example.com/d.txt", keypair.public_key()),
-                    format!(
-                        "pubky://{}/pub/example.com/cc-nested/z.txt",
-                        keypair.public_key()
-                    ),
-                    format!("pubky://{}/pub/example.com/c.txt", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/b.txt", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/a.txt", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.com/d.txt"),
+                    format!("pubky://{pubky}/pub/example.com/cc-nested/z.txt"),
+                    format!("pubky://{pubky}/pub/example.com/c.txt"),
+                    format!("pubky://{pubky}/pub/example.com/b.txt"),
+                    format!("pubky://{pubky}/pub/example.com/a.txt"),
                 ],
                 "reverse list with no limit or cursor"
             );
@@ -384,11 +371,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/example.com/d.txt", keypair.public_key()),
-                    format!(
-                        "pubky://{}/pub/example.com/cc-nested/z.txt",
-                        keypair.public_key()
-                    ),
+                    format!("pubky://{pubky}/pub/example.com/d.txt"),
+                    format!("pubky://{pubky}/pub/example.com/cc-nested/z.txt"),
                 ],
                 "reverse list with limit but no cursor"
             );
@@ -408,11 +392,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!(
-                        "pubky://{}/pub/example.com/cc-nested/z.txt",
-                        keypair.public_key()
-                    ),
-                    format!("pubky://{}/pub/example.com/c.txt", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.com/cc-nested/z.txt"),
+                    format!("pubky://{pubky}/pub/example.com/c.txt"),
                 ],
                 "reverse list with limit and cursor"
             );
@@ -430,24 +411,26 @@ mod tests {
 
         client.signup(&keypair, &server.public_key()).await.unwrap();
 
+        let pubky = keypair.public_key();
+
         let urls = vec![
-            format!("pubky://{}/pub/a.com/a.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/a.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/b.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/c.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/d.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.con/d.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.con", keypair.public_key()),
-            format!("pubky://{}/pub/file", keypair.public_key()),
-            format!("pubky://{}/pub/file2", keypair.public_key()),
-            format!("pubky://{}/pub/z.com/a.txt", keypair.public_key()),
+            format!("pubky://{pubky}/pub/a.com/a.txt"),
+            format!("pubky://{pubky}/pub/example.com/a.txt"),
+            format!("pubky://{pubky}/pub/example.com/b.txt"),
+            format!("pubky://{pubky}/pub/example.com/c.txt"),
+            format!("pubky://{pubky}/pub/example.com/d.txt"),
+            format!("pubky://{pubky}/pub/example.con/d.txt"),
+            format!("pubky://{pubky}/pub/example.con"),
+            format!("pubky://{pubky}/pub/file"),
+            format!("pubky://{pubky}/pub/file2"),
+            format!("pubky://{pubky}/pub/z.com/a.txt"),
         ];
 
         for url in urls {
             client.put(url.as_str(), &[0]).await.unwrap();
         }
 
-        let url = format!("pubky://{}/pub/", keypair.public_key());
+        let url = format!("pubky://{pubky}/pub/");
         let url = url.as_str();
 
         {
@@ -462,13 +445,13 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/a.com/", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/", keypair.public_key()),
-                    format!("pubky://{}/pub/example.con", keypair.public_key()),
-                    format!("pubky://{}/pub/example.con/", keypair.public_key()),
-                    format!("pubky://{}/pub/file", keypair.public_key()),
-                    format!("pubky://{}/pub/file2", keypair.public_key()),
-                    format!("pubky://{}/pub/z.com/", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/a.com/"),
+                    format!("pubky://{pubky}/pub/example.com/"),
+                    format!("pubky://{pubky}/pub/example.con"),
+                    format!("pubky://{pubky}/pub/example.con/"),
+                    format!("pubky://{pubky}/pub/file"),
+                    format!("pubky://{pubky}/pub/file2"),
+                    format!("pubky://{pubky}/pub/z.com/"),
                 ],
                 "normal list shallow"
             );
@@ -487,8 +470,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/a.com/", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/a.com/"),
+                    format!("pubky://{pubky}/pub/example.com/"),
                 ],
                 "normal list shallow with limit but no cursor"
             );
@@ -508,8 +491,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/example.com/", keypair.public_key()),
-                    format!("pubky://{}/pub/example.con", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.com/"),
+                    format!("pubky://{pubky}/pub/example.con"),
                 ],
                 "normal list shallow with limit and a file cursor"
             );
@@ -529,9 +512,9 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/example.con", keypair.public_key()),
-                    format!("pubky://{}/pub/example.con/", keypair.public_key()),
-                    format!("pubky://{}/pub/file", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.con"),
+                    format!("pubky://{pubky}/pub/example.con/"),
+                    format!("pubky://{pubky}/pub/file"),
                 ],
                 "normal list shallow with limit and a directory cursor"
             );
@@ -550,13 +533,13 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/z.com/", keypair.public_key()),
-                    format!("pubky://{}/pub/file2", keypair.public_key()),
-                    format!("pubky://{}/pub/file", keypair.public_key()),
-                    format!("pubky://{}/pub/example.con/", keypair.public_key()),
-                    format!("pubky://{}/pub/example.con", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/", keypair.public_key()),
-                    format!("pubky://{}/pub/a.com/", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/z.com/"),
+                    format!("pubky://{pubky}/pub/file2"),
+                    format!("pubky://{pubky}/pub/file"),
+                    format!("pubky://{pubky}/pub/example.con/"),
+                    format!("pubky://{pubky}/pub/example.con"),
+                    format!("pubky://{pubky}/pub/example.com/"),
+                    format!("pubky://{pubky}/pub/a.com/"),
                 ],
                 "reverse list shallow"
             );
@@ -576,8 +559,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/z.com/", keypair.public_key()),
-                    format!("pubky://{}/pub/file2", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/z.com/"),
+                    format!("pubky://{pubky}/pub/file2"),
                 ],
                 "reverse list shallow with limit but no cursor"
             );
@@ -598,8 +581,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/file", keypair.public_key()),
-                    format!("pubky://{}/pub/example.con/", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/file"),
+                    format!("pubky://{pubky}/pub/example.con/"),
                 ],
                 "reverse list shallow with limit and a file cursor"
             );
@@ -620,8 +603,8 @@ mod tests {
             assert_eq!(
                 list,
                 vec![
-                    format!("pubky://{}/pub/example.con", keypair.public_key()),
-                    format!("pubky://{}/pub/example.com/", keypair.public_key()),
+                    format!("pubky://{pubky}/pub/example.con"),
+                    format!("pubky://{pubky}/pub/example.com/"),
                 ],
                 "reverse list shallow with limit and a directory cursor"
             );
@@ -639,17 +622,19 @@ mod tests {
 
         client.signup(&keypair, &server.public_key()).await.unwrap();
 
+        let pubky = keypair.public_key();
+
         let urls = vec![
-            format!("pubky://{}/pub/a.com/a.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/a.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/b.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/c.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.com/d.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.con/d.txt", keypair.public_key()),
-            format!("pubky://{}/pub/example.con", keypair.public_key()),
-            format!("pubky://{}/pub/file", keypair.public_key()),
-            format!("pubky://{}/pub/file2", keypair.public_key()),
-            format!("pubky://{}/pub/z.com/a.txt", keypair.public_key()),
+            format!("pubky://{pubky}/pub/a.com/a.txt"),
+            format!("pubky://{pubky}/pub/example.com/a.txt"),
+            format!("pubky://{pubky}/pub/example.com/b.txt"),
+            format!("pubky://{pubky}/pub/example.com/c.txt"),
+            format!("pubky://{pubky}/pub/example.com/d.txt"),
+            format!("pubky://{pubky}/pub/example.con/d.txt"),
+            format!("pubky://{pubky}/pub/example.con"),
+            format!("pubky://{pubky}/pub/file"),
+            format!("pubky://{pubky}/pub/file2"),
+            format!("pubky://{pubky}/pub/z.com/a.txt"),
         ];
 
         for url in urls {
@@ -682,16 +667,16 @@ mod tests {
             assert_eq!(
                 lines,
                 vec![
-                    format!("PUT pubky://{}/pub/a.com/a.txt", keypair.public_key()),
-                    format!("DEL pubky://{}/pub/a.com/a.txt", keypair.public_key()),
-                    format!("PUT pubky://{}/pub/example.com/a.txt", keypair.public_key()),
-                    format!("DEL pubky://{}/pub/example.com/a.txt", keypair.public_key()),
-                    format!("PUT pubky://{}/pub/example.com/b.txt", keypair.public_key()),
-                    format!("DEL pubky://{}/pub/example.com/b.txt", keypair.public_key()),
-                    format!("PUT pubky://{}/pub/example.com/c.txt", keypair.public_key()),
-                    format!("DEL pubky://{}/pub/example.com/c.txt", keypair.public_key()),
-                    format!("PUT pubky://{}/pub/example.com/d.txt", keypair.public_key()),
-                    format!("DEL pubky://{}/pub/example.com/d.txt", keypair.public_key()),
+                    format!("PUT pubky://{pubky}/pub/a.com/a.txt"),
+                    format!("DEL pubky://{pubky}/pub/a.com/a.txt"),
+                    format!("PUT pubky://{pubky}/pub/example.com/a.txt"),
+                    format!("DEL pubky://{pubky}/pub/example.com/a.txt"),
+                    format!("PUT pubky://{pubky}/pub/example.com/b.txt"),
+                    format!("DEL pubky://{pubky}/pub/example.com/b.txt"),
+                    format!("PUT pubky://{pubky}/pub/example.com/c.txt"),
+                    format!("DEL pubky://{pubky}/pub/example.com/c.txt"),
+                    format!("PUT pubky://{pubky}/pub/example.com/d.txt"),
+                    format!("DEL pubky://{pubky}/pub/example.com/d.txt"),
                     format!("cursor: {cursor}",)
                 ]
             );
@@ -716,16 +701,16 @@ mod tests {
             assert_eq!(
                 lines,
                 vec![
-                    format!("PUT pubky://{}/pub/example.con/d.txt", keypair.public_key()),
-                    format!("DEL pubky://{}/pub/example.con/d.txt", keypair.public_key()),
-                    format!("PUT pubky://{}/pub/example.con", keypair.public_key()),
-                    format!("DEL pubky://{}/pub/example.con", keypair.public_key()),
-                    format!("PUT pubky://{}/pub/file", keypair.public_key()),
-                    format!("DEL pubky://{}/pub/file", keypair.public_key()),
-                    format!("PUT pubky://{}/pub/file2", keypair.public_key()),
-                    format!("DEL pubky://{}/pub/file2", keypair.public_key()),
-                    format!("PUT pubky://{}/pub/z.com/a.txt", keypair.public_key()),
-                    format!("DEL pubky://{}/pub/z.com/a.txt", keypair.public_key()),
+                    format!("PUT pubky://{pubky}/pub/example.con/d.txt"),
+                    format!("DEL pubky://{pubky}/pub/example.con/d.txt"),
+                    format!("PUT pubky://{pubky}/pub/example.con"),
+                    format!("DEL pubky://{pubky}/pub/example.con"),
+                    format!("PUT pubky://{pubky}/pub/file"),
+                    format!("DEL pubky://{pubky}/pub/file"),
+                    format!("PUT pubky://{pubky}/pub/file2"),
+                    format!("DEL pubky://{pubky}/pub/file2"),
+                    format!("PUT pubky://{pubky}/pub/z.com/a.txt"),
+                    format!("DEL pubky://{pubky}/pub/z.com/a.txt"),
                     lines.last().unwrap().to_string()
                 ]
             )