Merge "Use base.delete_server in test_servers.py"