diff --git a/dtmgrpc/dtmgimp/grpc_clients.go b/dtmgrpc/dtmgimp/grpc_clients.go
index dc21e81..b299b9a 100644
--- a/dtmgrpc/dtmgimp/grpc_clients.go
+++ b/dtmgrpc/dtmgimp/grpc_clients.go
@@ -43,11 +43,6 @@ func MustGetDtmClient(grpcServer string) dtmgpb.DtmClient {
 	return dtmgpb.NewDtmClient(MustGetGrpcConn(grpcServer, false))
 }
 
-// MustGetRawDtmClient must get raw codec grpc conn
-func MustGetRawDtmClient(grpcServer string) dtmgpb.DtmClient {
-	return dtmgpb.NewDtmClient(MustGetGrpcConn(grpcServer, true))
-}
-
 // GetGrpcConn 1
 func GetGrpcConn(grpcServer string, isRaw bool) (conn *grpc.ClientConn, rerr error) {
 	clients := &normalClients
diff --git a/test/busi/base_grpc.go b/test/busi/base_grpc.go
index c858a1f..3c71a50 100644
--- a/test/busi/base_grpc.go
+++ b/test/busi/base_grpc.go
@@ -63,9 +63,9 @@ type busiServer struct {
 	UnimplementedBusiServer
 }
 
-func (s *busiServer) QueryPrepared(ctx context.Context, in *BusiReq) (*emptypb.Empty, error) {
+func (s *busiServer) QueryPrepared(ctx context.Context, in *BusiReq) (*BusiReply, error) {
 	res := MainSwitch.QueryPreparedResult.Fetch()
-	return &emptypb.Empty{}, dtmgimp.Result2Error(res, nil)
+	return &BusiReply{Message: "a sample data"}, dtmgimp.Result2Error(res, nil)
 }
 
 func (s *busiServer) TransIn(ctx context.Context, in *BusiReq) (*emptypb.Empty, error) {
diff --git a/test/busi/busi.pb.go b/test/busi/busi.pb.go
index 975a949..759886f 100644
--- a/test/busi/busi.pb.go
+++ b/test/busi/busi.pb.go
@@ -148,7 +148,7 @@ var file_test_busi_busi_proto_rawDesc = []byte{
 	0x6e, 0x73, 0x49, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x25, 0x0a, 0x09, 0x42, 0x75,
 	0x73, 0x69, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
 	0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x32, 0x94, 0x09, 0x0a, 0x04, 0x42, 0x75, 0x73, 0x69, 0x12, 0x32, 0x0a, 0x07, 0x54, 0x72,
+	0x65, 0x32, 0x8d, 0x09, 0x0a, 0x04, 0x42, 0x75, 0x73, 0x69, 0x12, 0x32, 0x0a, 0x07, 0x54, 0x72,
 	0x61, 0x6e, 0x73, 0x49, 0x6e, 0x12, 0x0d, 0x2e, 0x62, 0x75, 0x73, 0x69, 0x2e, 0x42, 0x75, 0x73,
 	0x69, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x33,
@@ -214,15 +214,15 @@ var file_test_busi_busi_proto_rawDesc = []byte{
 	0x75, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x0d, 0x2e, 0x62, 0x75, 0x73,
 	0x69, 0x2e, 0x42, 0x75, 0x73, 0x69, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74,
-	0x79, 0x22, 0x00, 0x12, 0x38, 0x0a, 0x0d, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x65, 0x70,
+	0x79, 0x22, 0x00, 0x12, 0x31, 0x0a, 0x0d, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x65, 0x70,
 	0x61, 0x72, 0x65, 0x64, 0x12, 0x0d, 0x2e, 0x62, 0x75, 0x73, 0x69, 0x2e, 0x42, 0x75, 0x73, 0x69,
-	0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x39, 0x0a,
-	0x0e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x64, 0x42, 0x12,
-	0x0d, 0x2e, 0x62, 0x75, 0x73, 0x69, 0x2e, 0x42, 0x75, 0x73, 0x69, 0x52, 0x65, 0x71, 0x1a, 0x16,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2f, 0x62, 0x75,
-	0x73, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e, 0x62, 0x75, 0x73, 0x69, 0x2e, 0x42, 0x75, 0x73, 0x69, 0x52,
+	0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x39, 0x0a, 0x0e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50,
+	0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x64, 0x42, 0x12, 0x0d, 0x2e, 0x62, 0x75, 0x73, 0x69, 0x2e,
+	0x42, 0x75, 0x73, 0x69, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22,
+	0x00, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2f, 0x62, 0x75, 0x73, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -282,7 +282,7 @@ var file_test_busi_busi_proto_depIdxs = []int32{
 	2,  // 35: busi.Busi.TransOutRevertBSaga:output_type -> google.protobuf.Empty
 	2,  // 36: busi.Busi.TransOutHeaderYes:output_type -> google.protobuf.Empty
 	2,  // 37: busi.Busi.TransOutHeaderNo:output_type -> google.protobuf.Empty
-	2,  // 38: busi.Busi.QueryPrepared:output_type -> google.protobuf.Empty
+	1,  // 38: busi.Busi.QueryPrepared:output_type -> busi.BusiReply
 	2,  // 39: busi.Busi.QueryPreparedB:output_type -> google.protobuf.Empty
 	20, // [20:40] is the sub-list for method output_type
 	0,  // [0:20] is the sub-list for method input_type
diff --git a/test/busi/busi.proto b/test/busi/busi.proto
index 123ff33..c94d8df 100644
--- a/test/busi/busi.proto
+++ b/test/busi/busi.proto
@@ -37,7 +37,7 @@ service Busi {
   rpc TransOutRevertBSaga(BusiReq) returns (google.protobuf.Empty) {}
   rpc TransOutHeaderYes(BusiReq) returns (google.protobuf.Empty) {}
   rpc TransOutHeaderNo(BusiReq) returns (google.protobuf.Empty) {}
-  rpc QueryPrepared(BusiReq) returns (google.protobuf.Empty) {}
+  rpc QueryPrepared(BusiReq) returns (BusiReply) {}
   rpc QueryPreparedB(BusiReq) returns (google.protobuf.Empty) {}
 }
 
diff --git a/test/busi/busi_grpc.pb.go b/test/busi/busi_grpc.pb.go
index be3a769..f7db854 100644
--- a/test/busi/busi_grpc.pb.go
+++ b/test/busi/busi_grpc.pb.go
@@ -37,7 +37,7 @@ type BusiClient interface {
 	TransOutRevertBSaga(ctx context.Context, in *BusiReq, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	TransOutHeaderYes(ctx context.Context, in *BusiReq, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	TransOutHeaderNo(ctx context.Context, in *BusiReq, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	QueryPrepared(ctx context.Context, in *BusiReq, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	QueryPrepared(ctx context.Context, in *BusiReq, opts ...grpc.CallOption) (*BusiReply, error)
 	QueryPreparedB(ctx context.Context, in *BusiReq, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
@@ -211,8 +211,8 @@ func (c *busiClient) TransOutHeaderNo(ctx context.Context, in *BusiReq, opts ...
 	return out, nil
 }
 
-func (c *busiClient) QueryPrepared(ctx context.Context, in *BusiReq, opts ...grpc.CallOption) (*emptypb.Empty, error) {
-	out := new(emptypb.Empty)
+func (c *busiClient) QueryPrepared(ctx context.Context, in *BusiReq, opts ...grpc.CallOption) (*BusiReply, error) {
+	out := new(BusiReply)
 	err := c.cc.Invoke(ctx, "/busi.Busi/QueryPrepared", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -251,7 +251,7 @@ type BusiServer interface {
 	TransOutRevertBSaga(context.Context, *BusiReq) (*emptypb.Empty, error)
 	TransOutHeaderYes(context.Context, *BusiReq) (*emptypb.Empty, error)
 	TransOutHeaderNo(context.Context, *BusiReq) (*emptypb.Empty, error)
-	QueryPrepared(context.Context, *BusiReq) (*emptypb.Empty, error)
+	QueryPrepared(context.Context, *BusiReq) (*BusiReply, error)
 	QueryPreparedB(context.Context, *BusiReq) (*emptypb.Empty, error)
 	mustEmbedUnimplementedBusiServer()
 }
@@ -314,7 +314,7 @@ func (UnimplementedBusiServer) TransOutHeaderYes(context.Context, *BusiReq) (*em
 func (UnimplementedBusiServer) TransOutHeaderNo(context.Context, *BusiReq) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method TransOutHeaderNo not implemented")
 }
-func (UnimplementedBusiServer) QueryPrepared(context.Context, *BusiReq) (*emptypb.Empty, error) {
+func (UnimplementedBusiServer) QueryPrepared(context.Context, *BusiReq) (*BusiReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method QueryPrepared not implemented")
 }
 func (UnimplementedBusiServer) QueryPreparedB(context.Context, *BusiReq) (*emptypb.Empty, error) {
diff --git a/test/main_test.go b/test/main_test.go
index 2fa6a1c..9d0036c 100644
--- a/test/main_test.go
+++ b/test/main_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/dtm-labs/dtm/dtmgrpc"
 	"github.com/dtm-labs/dtm/dtmsvr"
 	"github.com/dtm-labs/dtm/dtmsvr/config"
+	"github.com/dtm-labs/dtm/dtmsvr/storage/registry"
 	"github.com/dtm-labs/dtm/test/busi"
 	"github.com/go-resty/resty/v2"
 )
@@ -55,6 +56,8 @@ func TestMain(m *testing.M) {
 		conf.Store.Password = ""
 		conf.Store.Port = 6379
 	}
+	registry.WaitStoreUp()
+
 	dtmsvr.PopulateDB(false)
 	go dtmsvr.StartSvr()
 
diff --git a/test/store_test.go b/test/store_test.go
index c2413f7..b711c76 100644
--- a/test/store_test.go
+++ b/test/store_test.go
@@ -88,10 +88,6 @@ func TestStoreLockTrans(t *testing.T) {
 	assert.Nil(t, g2)
 }
 
-func TestStoreWait(t *testing.T) {
-	registry.WaitStoreUp()
-}
-
 func TestUpdateBranches(t *testing.T) {
 	if !conf.Store.IsDB() {
 		_, err := registry.GetStore().UpdateBranches(nil, nil)