Added calls to test code in client_server