diff --git a/cpp/tests/integration/integration_test.cc b/cpp/tests/integration/integration_test.cc
index e3db4498e0af99e6d0e70d425f56ee9a55933a91..482e13d76750910dcf20cf7a3c6e23142142d27a 100644
--- a/cpp/tests/integration/integration_test.cc
+++ b/cpp/tests/integration/integration_test.cc
@@ -85,8 +85,8 @@ TEST_CASE("C API integration", "[.integration]") {
 
   // std::cout << vereign::test::ProtobufToJson(getDIDsResp) << std::endl;
 
-  grpc_shutdown();
-  google::protobuf::ShutdownProtobufLibrary();
+  // grpc_shutdown();
+  // google::protobuf::ShutdownProtobufLibrary();
 }
 
 TEST_CASE("vereign_service_start") {
diff --git a/cpp/tests/vereign/grpc/server_test.cc b/cpp/tests/vereign/grpc/server_test.cc
index efea679002af946f54d3a9ea72dfe5307e6b9cc6..de3c47db053a0494fbaeb059d1f3535fc0bdcaee 100644
--- a/cpp/tests/vereign/grpc/server_test.cc
+++ b/cpp/tests/vereign/grpc/server_test.cc
@@ -84,6 +84,6 @@ TEST_CASE("grpc::Server", "[vereign/grpc/server][.integration]") {
 
   // std::cout << vereign::test::ProtobufToJson(getDIDsResp) << std::endl;
 
-  grpc_shutdown();
-  google::protobuf::ShutdownProtobufLibrary();
+  // grpc_shutdown();
+  // google::protobuf::ShutdownProtobufLibrary();
 }
diff --git a/cpp/tests/vereign/restapi/client_session_test.cc b/cpp/tests/vereign/restapi/client_session_test.cc
index 12997ff910fa637dcfddea6653103697728c361e..88b361497a33b2c64e7e51677b12faa1fcf537b5 100644
--- a/cpp/tests/vereign/restapi/client_session_test.cc
+++ b/cpp/tests/vereign/restapi/client_session_test.cc
@@ -11,7 +11,7 @@
 #include <boost/asio/ssl/context.hpp>
 #include <fmt/core.h>
 
-TEST_CASE("ClientSession::Post", "[vereign/restapi/client_session][.integration]") {
+TEST_CASE("restapi::ClientSession::Post", "[vereign/restapi/client_session][.integration]") {
   namespace asio = boost::asio;
   namespace beast = boost::beast;
   asio::io_context ioc;
@@ -22,11 +22,9 @@ TEST_CASE("ClientSession::Post", "[vereign/restapi/client_session][.integration]
   auto host = vereign::testutil::RequireEnv("TEST_VEREIGN_API_HOST");
   auto port = vereign::testutil::GetEnv("TEST_VEREIGN_API_PORT", "https");
 
-  // Verify the remote server's certificate
-  // ctx.set_verify_mode(ssl::verify_peer);
-
   vereign::restapi::Client client{ioc, ctx, host, port};
-  vereign::restapi::ClientSession client_session{client, publicKey};
+  vereign::restapi::ClientSession client_session{client};
+  client_session.SetPubKey(publicKey);
 
   std::thread ioc_thread([&ioc]{
     ioc.run();