Merge "Fix server cleanup in test_multiple_create test"