Factor out mock setup
Another opportunity for self._remove_server
Make the tests pass