I got tired of looking at this function
Fix test

I've asked if there are smarter ways to write this test on Twitter, the
world's premier support platform for open source software:

https://twitter.com/lvh/status/528918962978164736
Clean up tests
Fix the delete server docstring