diff --git a/unit_tests/server/parameters_parser.cpp b/unit_tests/server/parameters_parser.cpp
index 448b624e4..4e451cefa 100644
--- a/unit_tests/server/parameters_parser.cpp
+++ b/unit_tests/server/parameters_parser.cpp
@@ -90,11 +90,14 @@ BOOST_AUTO_TEST_CASE(invalid_table_urls)
 
 BOOST_AUTO_TEST_CASE(valid_route_hint)
 {
-    auto hint = engine::Hint::FromBase64("ZgYAgP___38EAAAAIAAAAD4AAAAdAAAABAAAACAAAAA-"
-                                         "AAAAHQAAABQAAABqaHEAt4KbAjtocQDLgpsCBQAPAJDIe3E=");
-    BOOST_CHECK_EQUAL(
-        hint.phantom.input_location,
-        util::Coordinate(util::FloatLongitude{7.432251}, util::FloatLatitude{43.745995}));
+
+    engine::PhantomNode reference_node;
+    reference_node.input_location =
+        util::Coordinate(util::FloatLongitude{7.432251}, util::FloatLatitude{43.745995});
+    engine::Hint reference_hint{reference_node, 0x1337};
+    auto encoded_hint = reference_hint.ToBase64();
+    auto hint = engine::Hint::FromBase64(encoded_hint);
+    BOOST_CHECK_EQUAL(hint.phantom.input_location, reference_hint.phantom.input_location);
 }
 
 BOOST_AUTO_TEST_CASE(valid_route_urls)
@@ -166,13 +169,12 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
     CHECK_EQUAL_RANGE(reference_3.coordinates, result_3->coordinates);
     CHECK_EQUAL_RANGE(reference_3.hints, result_3->hints);
 
-    std::vector<boost::optional<engine::Hint>> hints_4 = {
-        engine::Hint::FromBase64("ZgYAgP___38EAAAAIAAAAD4AAAAdAAAABAAAACAAAAA-AAAAHQAAABQAAA"
-                                 "BqaHEAt4KbAjtocQDLgpsCBQAPAJDIe3E="),
-        engine::Hint::FromBase64("ngQAgP___38TAAAAGAAAAC8AAAA4AAAAEwAAABgAAAAvAAAAOAAAABQAAA"
-                                 "CaYXEAvnObAtxhcQC7c5sCBAAPAJDIe3E="),
-        engine::Hint::FromBase64("QAUAgM0FAIAYAAAABAAAAAAAAADxAAAAGAAAAAQAAAAAAAAA8QAAABQAAA"
-                                 "CDPnEAUFabAog-cQBQVpsCAAAPAJDIe3E=")};
+    engine::PhantomNode phantom_1;
+    phantom_1.input_location = coords_1[0];
+    engine::PhantomNode phantom_2;
+    phantom_2.input_location = coords_1[1];
+    std::vector<boost::optional<engine::Hint>> hints_4 = {engine::Hint{phantom_1, 0x1337},
+                                                          engine::Hint{phantom_2, 0x1337}};
     RouteParameters reference_4{false,
                                 false,
                                 false,
@@ -184,13 +186,7 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
                                 std::vector<boost::optional<double>>{},
                                 std::vector<boost::optional<engine::Bearing>>{}};
     auto result_4 = parseParameters<RouteParameters>(
-        "1,2;3,4?steps=false&hints="
-        "ZgYAgP___38EAAAAIAAAAD4AAAAdAAAABAAAACAAAAA-"
-        "AAAAHQAAABQAAABqaHEAt4KbAjtocQDLgpsCBQAPAJDIe3E=;"
-        "ngQAgP___"
-        "38TAAAAGAAAAC8AAAA4AAAAEwAAABgAAAAvAAAAOAAAABQAAACaYXEAvnObAtxhcQC7c5sCBAAPAJDIe3E=;"
-        "QAUAgM0FAIAYAAAABAAAAAAAAADxAAAAGAAAAAQAAAAAAAAA8QAAABQAAACDPnEAUFabAog-"
-        "cQBQVpsCAAAPAJDIe3E=");
+        "1,2;3,4?steps=false&hints=" + hints_4[0]->ToBase64() + ";" + hints_4[1]->ToBase64());
     BOOST_CHECK(result_4);
     BOOST_CHECK_EQUAL(reference_4.steps, result_4->steps);
     BOOST_CHECK_EQUAL(reference_4.alternatives, result_4->alternatives);
@@ -288,13 +284,13 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
                                               {util::FloatLongitude{3}, util::FloatLatitude{4}},
                                               {util::FloatLongitude{5}, util::FloatLatitude{6}},
                                               {util::FloatLongitude{7}, util::FloatLatitude{8}}};
+    engine::PhantomNode phantom_3;
+    phantom_3.input_location = coords_3[0];
+    engine::PhantomNode phantom_4;
+    phantom_4.input_location = coords_3[2];
     std::vector<boost::optional<engine::Hint>> hints_10 = {
-        engine::Hint::FromBase64("ZgYAgP___38EAAAAIAAAAD4AAAAdAAAABAAAACAAAAA-"
-                                 "AAAAHQAAABQAAABqaHEAt4KbAjtocQDLgpsCBQAPAJDIe3E="),
-        boost::none,
-        engine::Hint::FromBase64("QAUAgM0FAIAYAAAABAAAAAAAAADxAAAAGAAAAAQAAAAAAAAA8QAAABQAAACDPnEAU"
-                                 "FabAog-cQBQVpsCAAAPAJDIe3E="),
-        boost::none};
+        engine::Hint{phantom_3, 0x1337}, boost::none, engine::Hint{phantom_4, 0x1337}, boost::none};
+
     RouteParameters reference_10{false,
                                  false,
                                  false,
@@ -305,12 +301,9 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
                                  hints_10,
                                  std::vector<boost::optional<double>>{},
                                  std::vector<boost::optional<engine::Bearing>>{}};
-    auto result_10 =
-        parseParameters<RouteParameters>("1,2;3,4;5,6;7,8?steps=false&hints="
-                                         "ZgYAgP___38EAAAAIAAAAD4AAAAdAAAABAAAACAAAAA-"
-                                         "AAAAHQAAABQAAABqaHEAt4KbAjtocQDLgpsCBQAPAJDIe3E=;;"
-                                         "QAUAgM0FAIAYAAAABAAAAAAAAADxAAAAGAAAAAQAAAAAAAAA8QAAABQAA"
-                                         "ACDPnEAUFabAog-cQBQVpsCAAAPAJDIe3E=;");
+    auto result_10 = parseParameters<RouteParameters>("1,2;3,4;5,6;7,8?steps=false&hints=" +
+                                                      hints_10[0]->ToBase64() + ";;" +
+                                                      hints_10[2]->ToBase64() + ";");
     BOOST_CHECK(result_10);
     BOOST_CHECK_EQUAL(reference_10.steps, result_10->steps);
     BOOST_CHECK_EQUAL(reference_10.alternatives, result_10->alternatives);