diff --git a/test/test_group.cc b/test/test_group.cc
index e90d4ad..90c0a4e 100644
--- a/test/test_group.cc
+++ b/test/test_group.cc
@@ -8,7 +8,7 @@
 
 #include "../src/Adapter.hh"
 #include "../src/utils.hh"
-#include "../src/std_utils.hh"
+#include <pEp/std_utils.hh>
 
 #include "../src/grp_manager_interface.hh"
 #include "../src/grp_driver_engine.hh"
@@ -58,8 +58,8 @@ GroupQueryInterface* gq = nullptr;
 ::PEP_STATUS test_notifyHandshake(::pEp_identity* _me, ::pEp_identity* _partner, sync_handshake_signal signal)
 {
     log("called");
-    log("me: " + pEp::Utils::to_string(_me, false));
-    log("partner: " + pEp::Utils::to_string(_partner, false));
+    log("me: " + pEp::Utils::to_string(*_me, false));
+    log("partner: " + pEp::Utils::to_string(*_partner, false));
     log("Signal: " + to_string(signal));
     //    log("Signal: " + string{ ::sync_handshake_signal_to_string(signal) });
 
@@ -80,7 +80,7 @@ void test_create_alice_me()
     status = ::myself(Adapter::session(), alice);
     log("STATUS: " + status_to_string(status));
     assert(!status);
-    log("Alice:" + pEp::Utils::to_string(alice, debug_info_full));
+    log("Alice:" + pEp::Utils::to_string(*alice, debug_info_full));
 }
 
 void test_create_bob_partner()
@@ -94,7 +94,7 @@ void test_create_bob_partner()
     status = ::update_identity(Adapter::session(), bob);
     log("STATUS: " + status_to_string(status));
     assert(!status);
-    log("Bob:" + pEp::Utils::to_string(bob, debug_info_full));
+    log("Bob:" + pEp::Utils::to_string(*bob, debug_info_full));
 }
 
 void test_create_carol_partner()
@@ -108,7 +108,7 @@ void test_create_carol_partner()
 //    status = ::myself(Adapter::session(), carol);
     log("STATUS: " + status_to_string(status));
     assert(!status);
-    log("Carol:" + pEp::Utils::to_string(carol, debug_info_full));
+    log("Carol:" + pEp::Utils::to_string(*carol, debug_info_full));
 }
 
 void test_setup_and_start_sync()
@@ -127,7 +127,7 @@ void test_group_create()
     log("create group identity");
     grp_ident = ::new_identity("group1@peptest.ch", NULL, "432", "group1");
     assert(grp_ident);
-    log("grp_ident:" + pEp::Utils::to_string(grp_ident, debug_info_full));
+    log("grp_ident:" + pEp::Utils::to_string(*grp_ident, debug_info_full));
 
 //    PEP_STATUS stat = ::myself(Adapter::session(), grp_ident);
 //    log("STATUS: " + status_to_string(status));
@@ -243,7 +243,7 @@ int main(int argc, char** argv)
         ::pEp_identity* manager = nullptr;
         PEP_STATUS stat = gq->group_query_manager(Adapter::session(), grp_ident, &manager);
         log(status_to_string(stat));
-        log(::Utils::to_string(manager));
+        log(::Utils::to_string(*manager));
     }
     logH1("6. Dissolve");
     test_group_dissolve();
diff --git a/test/test_pEpSQLite.cc b/test/test_pEpSQLite.cc
index be6d782..90bad20 100644
--- a/test/test_pEpSQLite.cc
+++ b/test/test_pEpSQLite.cc
@@ -1,7 +1,7 @@
 #include "test_pEpSQLite.hh"
 #include "../src/pEpSQLite.hh"
 #include "../src/utils.hh"
-#include "../src/std_utils.hh"
+#include <pEp/std_utils.hh>
 #include <pEp/pitytest11/test_utils.hh>
 
 #include <fstream>
diff --git a/test/test_swarm_group.cc b/test/test_swarm_group.cc
index e11bfe2..642cb93 100644
--- a/test/test_swarm_group.cc
+++ b/test/test_swarm_group.cc
@@ -6,7 +6,7 @@
 // libpEpAdapter
 #include "../src/Adapter.hh"
 #include "../src/group_manager_api.h"
-#include "../src/pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include "../src/status_to_string.hh"
 #include "../src/grp_driver_replicator.hh"
 
diff --git a/test/test_swarm_tofu.cc b/test/test_swarm_tofu.cc
index 259ff42..7eb5920 100644
--- a/test/test_swarm_tofu.cc
+++ b/test/test_swarm_tofu.cc
@@ -6,7 +6,7 @@
 // libpEpAdapter
 #include "../src/Adapter.hh"
 #include "../src/group_manager_api.h"
-#include "../src/pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include "../src/status_to_string.hh"
 #include "../src/grp_driver_replicator.hh"