Merge "remove test folder of grpc-client from test folder of cli- main"