diff --git a/include/util/static_graph.hpp b/include/util/static_graph.hpp
index 3b3af310c..8dee24a23 100644
--- a/include/util/static_graph.hpp
+++ b/include/util/static_graph.hpp
@@ -74,7 +74,7 @@ template <typename EdgeDataT> struct SortableEdgeWithData : SortableEdgeWithData
 
     template <typename... Ts>
     SortableEdgeWithData(NodeIterator source, NodeIterator target, Ts &&... data)
-        : Base{source, target}, data(std::forward<Ts>(data)...)
+        : Base{source, target}, data{std::forward<Ts>(data)...}
     {
     }
 };
diff --git a/unit_tests/util/cell_storage.cpp b/unit_tests/util/cell_storage.cpp
index 79abf4cf5..6c0d833f5 100644
--- a/unit_tests/util/cell_storage.cpp
+++ b/unit_tests/util/cell_storage.cpp
@@ -55,14 +55,14 @@ auto makeGraph(const std::vector<MockEdge> &mock_edges)
         bool forward;
         bool backward;
     };
-    using Edge = util::StaticGraph<EdgeData>::InputEdge;
+    using Edge = static_graph_details::SortableEdgeWithData<EdgeData>;
     std::vector<Edge> edges;
     std::size_t max_id = 0;
     for (const auto &m : mock_edges)
     {
         max_id = std::max<std::size_t>(max_id, std::max(m.start, m.target));
-        edges.push_back(Edge{m.start, m.target, EdgeData{true, false}});
-        edges.push_back(Edge{m.target, m.start, EdgeData{false, true}});
+        edges.push_back(Edge{m.start, m.target, true, false});
+        edges.push_back(Edge{m.target, m.start, false, true});
     }
     std::sort(edges.begin(), edges.end());
     return util::StaticGraph<EdgeData>(max_id + 1, edges);
diff --git a/unit_tests/util/static_graph.cpp b/unit_tests/util/static_graph.cpp
index 506ffd18c..681313c1d 100644
--- a/unit_tests/util/static_graph.cpp
+++ b/unit_tests/util/static_graph.cpp
@@ -60,8 +60,7 @@ template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomArrayEntryFixture
         std::uniform_int_distribution<> node_udist(0, NUM_NODES - 1);
         for (unsigned i = 0; i < NUM_EDGES; i++)
         {
-            edges.emplace_back(
-                TestEdgeArrayEntry{static_cast<unsigned>(node_udist(g)), TestData{i}});
+            edges.emplace_back(TestEdgeArrayEntry{static_cast<unsigned>(node_udist(g)), EdgeID{i}});
         }
 
         for (unsigned i = 0; i < NUM_NODES; i++)
@@ -96,8 +95,8 @@ BOOST_FIXTURE_TEST_CASE(array_test, TestRandomArrayEntryFixture)
 
 BOOST_AUTO_TEST_CASE(target_test)
 {
-    std::vector<TestInputEdge> input_edges = {TestInputEdge{0, 1, TestData{1}},
-                                              TestInputEdge{3, 0, TestData{2}}};
+    std::vector<TestInputEdge> input_edges = {TestInputEdge{0, 1, EdgeID{1}},
+                                              TestInputEdge{3, 0, EdgeID{2}}};
     TestStaticGraph simple_graph = TestStaticGraph(4, input_edges);
 
     auto target = simple_graph.GetTarget(simple_graph.FindEdge(3, 0));
@@ -114,11 +113,11 @@ BOOST_AUTO_TEST_CASE(find_test)
      *  (3) -3-> (4)
      *      <-4-
      */
-    std::vector<TestInputEdge> input_edges = {TestInputEdge{0, 1, TestData{1}},
-                                              TestInputEdge{3, 0, TestData{2}},
-                                              TestInputEdge{3, 0, TestData{5}},
-                                              TestInputEdge{3, 4, TestData{3}},
-                                              TestInputEdge{4, 3, TestData{4}}};
+    std::vector<TestInputEdge> input_edges = {TestInputEdge{0, 1, EdgeID{1}},
+                                              TestInputEdge{3, 0, EdgeID{2}},
+                                              TestInputEdge{3, 0, EdgeID{5}},
+                                              TestInputEdge{3, 4, EdgeID{3}},
+                                              TestInputEdge{4, 3, EdgeID{4}}};
     TestStaticGraph simple_graph(5, input_edges);
 
     auto eit = simple_graph.FindEdge(0, 1);