Handling more cases for server, echo server test success