Make sure the smoke test doesn't leave the server sitting around if the client blows up
Clean up whitespace