Merge "Seperate negative tests for test_server_rescue"