Merge "Pass clients to compute base's create_test_server"