diff --git a/repertory/repertory_test/src/file_manager_test.cpp b/repertory/repertory_test/src/file_manager_test.cpp
index c7fad7cc..4a98fb8a 100644
--- a/repertory/repertory_test/src/file_manager_test.cpp
+++ b/repertory/repertory_test/src/file_manager_test.cpp
@@ -199,23 +199,19 @@ TEST_F(file_manager_test, can_create_and_close_file) {
 
   event_consumer ec3(filesystem_item_closed::name, [&](const i_event &evt) {
     const auto &evt2 = dynamic_cast<const filesystem_item_closed &>(evt);
-    EXPECT_STREQ("/test_create.txt",
-                 evt2.get_api_path().get<std::string>().c_str());
-    EXPECT_STREQ(source_path.c_str(),
-                 evt2.get_source().get<std::string>().c_str());
-    EXPECT_STREQ("0", evt2.get_directory().get<std::string>().c_str());
+    EXPECT_STREQ("/test_create.txt", evt2.api_path.c_str());
+    EXPECT_STREQ(source_path.c_str(), evt2.source_path.c_str());
+    EXPECT_FALSE(evt2.directory);
   });
 
   event_consumer ec4(
       filesystem_item_handle_closed::name, [&](const i_event &evt) {
         const auto &evt2 =
             dynamic_cast<const filesystem_item_handle_closed &>(evt);
-        EXPECT_STREQ("/test_create.txt",
-                     evt2.get_api_path().get<std::string>().c_str());
-        EXPECT_STREQ(source_path.c_str(),
-                     evt2.get_source().get<std::string>().c_str());
-        EXPECT_STREQ("0", evt2.get_directory().get<std::string>().c_str());
-        EXPECT_STREQ("1", evt2.get_handle().get<std::string>().c_str());
+        EXPECT_STREQ("/test_create.txt", evt2.api_path.c_str());
+        EXPECT_STREQ(source_path.c_str(), evt2.source_path.c_str());
+        EXPECT_FALSE(evt2.directory);
+        EXPECT_EQ(std::uint64_t(1U), evt2.handle);
       });
 
   mgr.close(handle);
@@ -277,23 +273,19 @@ TEST_F(file_manager_test, can_open_and_close_file) {
     event_consumer consumer(
         filesystem_item_opened::name, [&](const i_event &evt) {
           const auto &evt2 = dynamic_cast<const filesystem_item_opened &>(evt);
-          EXPECT_STREQ("/test_open.txt",
-                       evt2.get_api_path().get<std::string>().c_str());
-          EXPECT_STREQ(source_path.c_str(),
-                       evt2.get_source().get<std::string>().c_str());
-          EXPECT_STREQ("0", evt2.get_directory().get<std::string>().c_str());
+          EXPECT_STREQ("/test_open.txt", evt2.api_path.c_str());
+          EXPECT_STREQ(source_path.c_str(), evt2.source_path.c_str());
+          EXPECT_FALSE(evt2.directory);
         });
 
     event_consumer ec2(
         filesystem_item_handle_opened::name, [&](const i_event &evt) {
           const auto &evt2 =
               dynamic_cast<const filesystem_item_handle_opened &>(evt);
-          EXPECT_STREQ("/test_open.txt",
-                       evt2.get_api_path().get<std::string>().c_str());
-          EXPECT_STREQ(source_path.c_str(),
-                       evt2.get_source().get<std::string>().c_str());
-          EXPECT_STREQ("0", evt2.get_directory().get<std::string>().c_str());
-          EXPECT_STREQ("1", evt2.get_handle().get<std::string>().c_str());
+          EXPECT_STREQ("/test_open.txt", evt2.api_path.c_str());
+          EXPECT_STREQ(source_path.c_str(), evt2.source_path.c_str());
+          EXPECT_FALSE(evt2.directory);
+          EXPECT_EQ(std::uint64_t(1U), evt2.handle);
         });
 
     std::shared_ptr<i_open_file> open_file;
@@ -311,23 +303,19 @@ TEST_F(file_manager_test, can_open_and_close_file) {
 
   event_consumer ec3(filesystem_item_closed::name, [&](const i_event &evt) {
     const auto &evt2 = dynamic_cast<const filesystem_item_closed &>(evt);
-    EXPECT_STREQ("/test_open.txt",
-                 evt2.get_api_path().get<std::string>().c_str());
-    EXPECT_STREQ(source_path.c_str(),
-                 evt2.get_source().get<std::string>().c_str());
-    EXPECT_STREQ("0", evt2.get_directory().get<std::string>().c_str());
+    EXPECT_STREQ("/test_open.txt", evt2.api_path.c_str());
+    EXPECT_STREQ(source_path.c_str(), evt2.source_path.c_str());
+    EXPECT_FALSE(evt2.directory);
   });
 
   event_consumer ec4(
       filesystem_item_handle_closed::name, [&](const i_event &evt) {
         const auto &evt2 =
             dynamic_cast<const filesystem_item_handle_closed &>(evt);
-        EXPECT_STREQ("/test_open.txt",
-                     evt2.get_api_path().get<std::string>().c_str());
-        EXPECT_STREQ(source_path.c_str(),
-                     evt2.get_source().get<std::string>().c_str());
-        EXPECT_STREQ("0", evt2.get_directory().get<std::string>().c_str());
-        EXPECT_STREQ("1", evt2.get_handle().get<std::string>().c_str());
+        EXPECT_STREQ("/test_open.txt", evt2.api_path.c_str());
+        EXPECT_STREQ(source_path.c_str(), evt2.source_path.c_str());
+        EXPECT_FALSE(evt2.directory);
+        EXPECT_EQ(std::uint64_t(1U), evt2.handle);
       });
 
   mgr.close(handle);
@@ -418,8 +406,7 @@ TEST_F(file_manager_test,
   event_consumer consumer(
       download_resume_added::name, [&source_path](const i_event &evt) {
         const auto &evt2 = dynamic_cast<const download_resume_added &>(evt);
-        EXPECT_STREQ("/test_write_partial_download.txt",
-                     evt2.get_api_path().get<std::string>().c_str());
+        EXPECT_STREQ("/test_write_partial_download.txt", evt2.api_path.c_str());
         EXPECT_STREQ(source_path.c_str(),
                      evt2.get_dest_path().get<std::string>().c_str());
       });
@@ -542,8 +529,7 @@ TEST_F(file_manager_test,
   event_consumer es2(
       download_restored::name, [&source_path](const i_event &evt) {
         const auto &evt2 = dynamic_cast<const download_restored &>(evt);
-        EXPECT_STREQ("/test_write_partial_download.txt",
-                     evt2.get_api_path().get<std::string>().c_str());
+        EXPECT_STREQ("/test_write_partial_download.txt", evt2.api_path.c_str());
         EXPECT_STREQ(source_path.c_str(),
                      evt2.get_dest_path().get<std::string>().c_str());
       });
@@ -575,18 +561,14 @@ TEST_F(file_manager_test, upload_occurs_after_write_if_fully_downloaded) {
   event_consumer consumer(
       "file_upload_queued", [&source_path](const i_event &evt) {
         const auto &evt2 = dynamic_cast<const file_upload_queued &>(evt);
-        EXPECT_STREQ("/test_write_full_download.txt",
-                     evt2.get_api_path().get<std::string>().c_str());
-        EXPECT_STREQ(source_path.c_str(),
-                     evt2.get_source().get<std::string>().c_str());
+        EXPECT_STREQ("/test_write_full_download.txt", evt2.api_path.c_str());
+        EXPECT_STREQ(source_path.c_str(), evt2.source_path.c_str());
       });
   event_consumer es2(
       file_upload_completed::name, [&source_path](const i_event &evt) {
         const auto &evt2 = dynamic_cast<const file_upload_completed &>(evt);
-        EXPECT_STREQ("/test_write_full_download.txt",
-                     evt2.get_api_path().get<std::string>().c_str());
-        EXPECT_STREQ(source_path.c_str(),
-                     evt2.get_source().get<std::string>().c_str());
+        EXPECT_STREQ("/test_write_full_download.txt", evt2.api_path.c_str());
+        EXPECT_STREQ(source_path.c_str(), evt2.source_path.c_str());
       });
 
   auto now = utils::time::get_time_now();
@@ -1466,8 +1448,7 @@ TEST_F(file_manager_test, file_is_closed_after_download_timeout) {
 
   event_consumer consumer(item_timeout::name, [](const i_event &evt) {
     const auto &evt2 = dynamic_cast<const item_timeout &>(evt);
-    EXPECT_STREQ("/test_download_timeout.txt",
-                 evt2.get_api_path().get<std::string>().c_str());
+    EXPECT_STREQ("/test_download_timeout.txt", evt2.api_path.c_str());
   });
 
   auto now = utils::time::get_time_now();