1 files changed, 4 insertions, 4 deletions
diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp
index 334f00745da..1ab30303d2c 100644
--- a/messagebus_test/src/tests/trace/trace.cpp
+++ b/messagebus_test/src/tests/trace/trace.cpp
@@ -100,14 +100,14 @@ Test::Main()
     Reply::UP reply;
     SourceSession::UP ss = mb.getMessageBus().createSourceSession(src, SourceSessionParams());
     for (int i = 0; i < 50; ++i) {
-        Message::UP msg(new SimpleMessage("test"));
+        auto msg = std::make_unique<SimpleMessage>("test");
         msg->getTrace().setLevel(1);
         ss->send(std::move(msg), "test");
         reply = src.getReply(10s);
         if (reply) {
-            reply->getTrace().getRoot().normalize();
+            reply->getTrace().normalize();
             // resending breaks the trace, so retry until it has expected form
-            if (!reply->hasErrors() && reply->getTrace().getRoot().encode() == expect.encode()) {
+            if (!reply->hasErrors() && reply->getTrace().encode() == expect.encode()) {
                 break;
             }
         }
@@ -116,7 +116,7 @@ Test::Main()
     }
 
     EXPECT_TRUE(!reply->hasErrors());
-    EXPECT_EQUAL(reply->getTrace().getRoot().encode(), expect.encode());
+    EXPECT_EQUAL(reply->getTrace().encode(), expect.encode());
     EXPECT_TRUE(system((ctl_script + " stop all").c_str()) == 0);
     TEST_DONE();
 }