Merge "Use self.client in test_server_actions"