Merge "ensure servers are deleted between tests"