Little changes updated in TestServer class and