Merge "Clean up servers created in test_multiple_create.py"