+ Added TestRpcClientFactory for test purpose