smarter kiling of test server