Fixed review comments for ServerTest
Fixed review comments for ServerTest