Fix premature shutdown bug of discovery servers
Remove old client/server tests from repository (replaced with client_server_test.go)
Update client/server tests