diff --git a/server/Makefile b/server/Makefile
index 5414f5f..707b65f 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -18,12 +18,12 @@ global: surnames.txt names.txt ipaddr.txt
 
 surnames.txt: 
 	curl https://raw.githubusercontent.com/Hyneman/moby-project/672f6bdca054c42d375f065ffee87e8ceba0c242/moby/mwords/21986na.mes |\
-	iconv -f cp1252 - > surnames.txt
+	iconv -f cp1252 - | grep -v " " > surnames.txt
 
 names.txt:
 	curl https://raw.githubusercontent.com/Hyneman/moby-project/672f6bdca054c42d375f065ffee87e8ceba0c242/moby/mwords/3897male.nam > male.txt
 	curl https://raw.githubusercontent.com/Hyneman/moby-project/672f6bdca054c42d375f065ffee87e8ceba0c242/moby/mwords/4946fema.len > female.txt
-	cat male.txt female.txt | sort | uniq > names.txt
+	cat male.txt female.txt | sort | uniq | grep -v " " > names.txt
 
 ipaddr.txt:
 	dig +short @dns.toys -4 ip > ipaddr.txt
diff --git a/server/src/names.rs b/server/src/names.rs
index 5293c8d..e434488 100644
--- a/server/src/names.rs
+++ b/server/src/names.rs
@@ -131,4 +131,11 @@ mod tests {
         const TEST_NUM: u32 = u32::MAX - 1;
         assert_eq!(TEST_NUM, test_to_from(TEST_NUM));
     }
+
+    #[test]
+    fn many() {
+        for n in 0..1000 {
+            assert_eq!(n, test_to_from(n));
+        }
+    }
 }