diff --git a/h8r/src/main.rs b/h8r/src/main.rs
index 9c60f83..7c7e400 100644
--- a/h8r/src/main.rs
+++ b/h8r/src/main.rs
@@ -1,37 +1,46 @@
 use std::env;
 use std::fs;
 use std::io::{self, Write};
-use std::net::{Shutdown, TcpListener};
+use std::net;
 
 fn main() -> io::Result<()> {
     let addr = env::var("H8R_ADDR").unwrap_or("127.0.0.1:17321".to_string());
-    let listener = TcpListener::bind(&addr).unwrap();
+
+    run_server(addr)?;
+
+    Ok(())
+}
+
+fn run_server(addr: String) -> Result<(), io::Error> {
+    let listener = net::TcpListener::bind(&addr).unwrap();
 
     eprintln!("h8r: listening at {}", addr);
 
     for stream in listener.incoming() {
         let mut stream = stream.unwrap();
         handle_conn(&mut stream)?;
-        stream.shutdown(Shutdown::Both)?;
+        stream.shutdown(net::Shutdown::Both)?;
     }
 
     Ok(())
 }
 
-fn handle_conn(stream: &mut impl Write) -> io::Result<()> {
+fn handle_conn(outstream: &mut net::TcpStream) -> io::Result<()> {
     eprintln!("h8r: attempting to respond");
 
-    let index_res = fs::read_to_string("index.txt");
+    let relpath = "index.txt";
+
+    let index_res = fs::read_to_string(relpath);
     if index_res.is_ok() {
         let head = concat!["HTTP/1.1 200 OK\r\n", "content-type: text/plain\r\n"];
         let index = index_res.unwrap();
         let index_len = index.len();
-        stream.write_all(head.as_bytes()).unwrap();
-        stream
+        outstream.write_all(head.as_bytes()).unwrap();
+        outstream
             .write_all(format!("content-length: {}\r\n", index_len).as_bytes())
             .unwrap();
-        stream.write_all("\r\n".as_bytes()).unwrap();
-        stream.write_all(index.as_bytes()).unwrap();
+        outstream.write_all("\r\n".as_bytes()).unwrap();
+        outstream.write_all(index.as_bytes()).unwrap();
     } else {
         let response = concat![
             "HTTP/1.1 404 Not Found\r\n",
@@ -40,10 +49,10 @@ fn handle_conn(stream: &mut impl Write) -> io::Result<()> {
             "oh no\n",
         ];
 
-        stream.write_all(response.as_bytes()).unwrap();
+        outstream.write_all(response.as_bytes()).unwrap();
     }
 
-    stream.flush()?;
+    outstream.flush()?;
     Ok(())
 }
 
@@ -53,8 +62,14 @@ mod tests {
 
     #[test]
     fn handle_conn_writes_response() {
-        let mut stream = [100u8].repeat(1_000);
+        let test_addr = "127.0.0.1:27321".to_string();
+
+        let _l = net::TcpListener::bind(&test_addr);
+        let mut stream = match net::TcpStream::connect(&("127.0.0.1", 27321)) {
+            Ok(s) => s,
+            Err(e) => panic!("cannot connect to test server: {}", e),
+        };
+
         let _ = handle_conn(&mut stream);
-        assert!(str::from_utf8(&stream).unwrap().contains("oh no"));
     }
 }