Finished refactoring tests

Fixed it so I don't keep making a new server.  Learned some fun new
stuff about threads in the process