Merge "delete servers in setUpClass if ecxeption raised"