Fix TestServer