remove duplicate line
Make TestServer more portable