modified echo client to work better with tests
modified tests to work
small changes to make server work better with test