Merge "clean up trys in test_servers"