diff --git a/routing/routing_tests/features_road_graph_test.cpp b/routing/routing_tests/features_road_graph_test.cpp
index d2c0f54905..f3eef06a92 100644
--- a/routing/routing_tests/features_road_graph_test.cpp
+++ b/routing/routing_tests/features_road_graph_test.cpp
@@ -1,18 +1,17 @@
 #include "../../testing/testing.hpp"
 
-#include "../../base/logging.hpp"
+#include "features_road_graph_test.hpp"
 
 #include "../../indexer/classificator_loader.hpp"
-#include "../../indexer/index.hpp"
 #include "../../indexer/feature.hpp"
 #include "../../indexer/ftypes_matcher.hpp"
 
-#include "../features_road_graph.hpp"
+#include "../../base/logging.hpp"
 
 
 using namespace routing;
 
-namespace
+namespace routing_test
 {
 
 class EqualPos
@@ -27,207 +26,206 @@ public:
   }
 };
 
-class Name2IdMapping
-{
-  map<string, uint32_t> m_name2Id;
-  map<uint32_t, string> m_id2Name;
-
-public:
-  void operator()(FeatureType const & ft)
-  {
-    static ftypes::IsStreetChecker const checker;
-    if (!checker(ft))
-      return;
-
-    string name;
-    bool hasName = ft.GetName(0, name);
-    ASSERT(hasName, ());
-
-    m_name2Id[name] = ft.GetID().m_offset;
-    m_id2Name[ft.GetID().m_offset] = name;
-  }
-
-  uint32_t GetId(string const & name)
-  {
-    ASSERT(m_name2Id.find(name) != m_name2Id.end(), ());
-    return m_name2Id[name];
-  }
-
-  string const & GetName(uint32_t id)
-  {
-    ASSERT(m_id2Name.find(id) != m_id2Name.end(), ());
-    return m_id2Name[id];
-  }
-};
-
 bool TestResult(IRoadGraph::TurnsVectorT const & vec, RoadPos const & pos, double d)
 {
   return find_if(vec.begin(), vec.end(), EqualPos(pos, d)) != vec.end();
 }
 
-void FeatureID2Name(IRoadGraph::TurnsVectorT & vec, Name2IdMapping & mapping)
+
+
+void Name2IdMapping::operator()(FeatureType const & ft)
 {
-  for (size_t i = 0; i < vec.size(); ++i)
-  {
-    PossibleTurn & t = vec[i];
-    string name = mapping.GetName(t.m_pos.GetFeatureId());
-    int id = 0;
-    bool isInt = strings::to_int(name, id);
-    ASSERT(isInt, ());
+  static ftypes::IsStreetChecker const checker;
+  if (!checker(ft))
+    return;
 
-    t.m_pos = RoadPos(static_cast<uint32_t>(id), t.m_pos.IsForward(), t.m_pos.GetPointId());
-  }
+  string name;
+  bool hasName = ft.GetName(0, name);
+  ASSERT(hasName, ());
+
+  m_name2Id[name] = ft.GetID().m_offset;
+  m_id2Name[ft.GetID().m_offset] = name;
 }
 
+uint32_t Name2IdMapping::GetId(string const & name)
+{
+  ASSERT(m_name2Id.find(name) != m_name2Id.end(), ());
+  return m_name2Id[name];
+}
+
+string const & Name2IdMapping::GetName(uint32_t id)
+{
+  ASSERT(m_id2Name.find(id) != m_id2Name.end(), ());
+  return m_id2Name[id];
 }
 
 
-UNIT_TEST(FRG_Smoke)
+FeatureRoadGraphTester::FeatureRoadGraphTester(string const & name)
 {
   classificator::Load();
 
-  // ----- test 1 -----
+  m2::RectD rect;
+  if (!m_index.Add(name, rect))
   {
-    Index index;
-    m2::RectD rect;
-    if (!index.Add("route_test1.mwm", rect))
-    {
-      LOG(LERROR, ("MWM file not found"));
-      return;
-    }
-
-    FeatureRoadGraph graph(&index, 0);
-    Name2IdMapping mapping;
-    index.ForEachInRect(mapping, MercatorBounds::FullRect(), graph.GetStreetReadScale());
-
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("0"), true, 1), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 0, ());
-    }
-
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("0"), false, 1), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 7, ());
-      TEST(TestResult(vec, RoadPos(0, false, 2), 5), ());
-      TEST(TestResult(vec, RoadPos(0, false, 3), 10), ());
-      TEST(TestResult(vec, RoadPos(1, true, 1), 5), ());
-      TEST(TestResult(vec, RoadPos(1, false, 2), 5), ());
-      TEST(TestResult(vec, RoadPos(2, true, 0), 10), ());
-      TEST(TestResult(vec, RoadPos(3, false, 0), 15), ());
-      TEST(TestResult(vec, RoadPos(3, true, 2), 15), ());
-    }
-
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("1"), true, 0), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 0, ());
-    }
-
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("1"), false, 0), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 3, ());
-      TEST(TestResult(vec, RoadPos(1, false, 2), 10), ());
-      TEST(TestResult(vec, RoadPos(0, true, 1), 10), ());
-      TEST(TestResult(vec, RoadPos(0, false, 2), 10), ());
-    }
-
+    LOG(LERROR, ("MWM file not found"));
+    return;
   }
 
-  // ----- test 2 -----
+  m_graph.reset(new FeatureRoadGraph(&m_index, 0));
+
+  m_index.ForEachInRect(m_mapping, MercatorBounds::FullRect(), m_graph->GetStreetReadScale());
+}
+
+void FeatureRoadGraphTester::FeatureID2Name(routing::RoadPos & pos)
+{
+  string const & name = m_mapping.GetName(pos.GetFeatureId());
+  int id = 0;
+  VERIFY(strings::to_int(name, id), (name));
+
+  pos = RoadPos(static_cast<uint32_t>(id), pos.IsForward(), pos.GetPointId());
+}
+
+void FeatureRoadGraphTester::FeatureID2Name(IRoadGraph::TurnsVectorT & vec)
+{
+  for (size_t i = 0; i < vec.size(); ++i)
+    FeatureID2Name(vec[i].m_pos);
+}
+
+void FeatureRoadGraphTester::FeatureID2Name(vector<routing::RoadPos> & vec)
+{
+  for (size_t i = 0; i < vec.size(); ++i)
+    FeatureID2Name(vec[i]);
+}
+
+void FeatureRoadGraphTester::Name2FeatureID(vector<routing::RoadPos> & vec)
+{
+  for (size_t i = 0; i < vec.size(); ++i)
+    vec[i] = RoadPos(m_mapping.GetId(strings::to_string(vec[i].GetFeatureId())),
+                     vec[i].IsForward(),
+                     vec[i].GetPointId());
+}
+
+void FeatureRoadGraphTester::GetPossibleTurns(RoadPos const & pos, IRoadGraph::TurnsVectorT & vec)
+{
+  m_graph->GetPossibleTurns(RoadPos(m_mapping.GetId(strings::to_string(pos.GetFeatureId())),
+                                    pos.IsForward(), pos.GetPointId()), vec);
+  FeatureID2Name(vec);
+}
+
+}
+
+
+using namespace routing_test;
+
+UNIT_TEST(FRG_Test_MWM1)
+{
+  FeatureRoadGraphTester tester("route_test1.mwm");
+
   {
-    Index index;
-    m2::RectD rect;
-    if (!index.Add("route_test2.mwm", rect))
-    {
-      LOG(LERROR, ("MWM file not found"));
-      return;
-    }
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(0, true, 1), vec);
+    TEST_EQUAL(vec.size(), 0, ());
+  }
 
-    FeatureRoadGraph graph(&index, 0);
-    Name2IdMapping mapping;
-    index.ForEachInRect(mapping, MercatorBounds::FullRect(), graph.GetStreetReadScale());
+  {
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(0, false, 1), vec);
+    TEST_EQUAL(vec.size(), 7, ());
+    TEST(TestResult(vec, RoadPos(0, false, 2), 5), ());
+    TEST(TestResult(vec, RoadPos(0, false, 3), 10), ());
+    TEST(TestResult(vec, RoadPos(1, true, 1), 5), ());
+    TEST(TestResult(vec, RoadPos(1, false, 2), 5), ());
+    TEST(TestResult(vec, RoadPos(2, true, 0), 10), ());
+    TEST(TestResult(vec, RoadPos(3, false, 0), 15), ());
+    TEST(TestResult(vec, RoadPos(3, true, 2), 15), ());
+  }
 
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("0"), false, 0), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 8, ());
-      TEST(TestResult(vec, RoadPos(0, false, 1), -1), ());
-      TEST(TestResult(vec, RoadPos(0, false, 2), -1), ());
-      TEST(TestResult(vec, RoadPos(0, false, 3), -1), ());
-      TEST(TestResult(vec, RoadPos(0, false, 4), -1), ());
-      TEST(TestResult(vec, RoadPos(2, true, 1), -1), ());
-      TEST(TestResult(vec, RoadPos(5, false, 0), -1), ());
-      TEST(TestResult(vec, RoadPos(6, false, 0), -1), ());
-      TEST(TestResult(vec, RoadPos(4, false, 0), -1), ());
-    }
+  {
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(1, true, 0), vec);
+    TEST_EQUAL(vec.size(), 0, ());
+  }
 
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("8"), true, 0), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 2, ());
-      TEST(TestResult(vec, RoadPos(1, true, 1), -1), ());
-      TEST(TestResult(vec, RoadPos(8, true, 5), -1), ());
-    }
-
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("2"), true, 1), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 4, ());
-      TEST(TestResult(vec, RoadPos(3, true, 0), -1), ());
-      TEST(TestResult(vec, RoadPos(3, false, 1), -1), ());
-      TEST(TestResult(vec, RoadPos(2, true, 0), -1), ());
-      TEST(TestResult(vec, RoadPos(8, true, 4), -1), ());
-    }
-
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("3"), false, 0), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 5, ());
-      TEST(TestResult(vec, RoadPos(3, false, 1), -1), ());
-      TEST(TestResult(vec, RoadPos(3, false, 2), -1), ());
-      TEST(TestResult(vec, RoadPos(2, true, 0), -1), ());
-      TEST(TestResult(vec, RoadPos(6, true, 0), -1), ());
-      TEST(TestResult(vec, RoadPos(6, false, 1), -1), ());
-    }
-
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("7"), false, 0), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 0, ());
-    }
-
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("7"), true, 0), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 1, ());
-      TEST(TestResult(vec, RoadPos(8, true, 1), -1), ());
-    }
-
-    {
-      IRoadGraph::TurnsVectorT vec;
-      graph.GetPossibleTurns(RoadPos(mapping.GetId("8"), true, 3), vec);
-      FeatureID2Name(vec, mapping);
-      TEST_EQUAL(vec.size(), 7, ());
-      TEST(TestResult(vec, RoadPos(8, true, 2), -1), ());
-      TEST(TestResult(vec, RoadPos(5, true, 0), -1), ());
-      TEST(TestResult(vec, RoadPos(5, false, 1), -1), ());
-      TEST(TestResult(vec, RoadPos(7, false, 0), -1), ());
-      TEST(TestResult(vec, RoadPos(8, true, 1), -1), ());
-      TEST(TestResult(vec, RoadPos(1, true, 1), -1), ());
-      TEST(TestResult(vec, RoadPos(8, true, 5), -1), ());
-    }
+  {
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(1, false, 0), vec);
+    TEST_EQUAL(vec.size(), 3, ());
+    TEST(TestResult(vec, RoadPos(1, false, 2), 10), ());
+    TEST(TestResult(vec, RoadPos(0, true, 1), 10), ());
+    TEST(TestResult(vec, RoadPos(0, false, 2), 10), ());
+  }
+}
+
+UNIT_TEST(FRG_Test_MWM2)
+{
+  FeatureRoadGraphTester tester("route_test2.mwm");
+
+  {
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(0, false, 0), vec);
+    TEST_EQUAL(vec.size(), 8, ());
+    TEST(TestResult(vec, RoadPos(0, false, 1), -1), ());
+    TEST(TestResult(vec, RoadPos(0, false, 2), -1), ());
+    TEST(TestResult(vec, RoadPos(0, false, 3), -1), ());
+    TEST(TestResult(vec, RoadPos(0, false, 4), -1), ());
+    TEST(TestResult(vec, RoadPos(2, true, 1), -1), ());
+    TEST(TestResult(vec, RoadPos(5, false, 0), -1), ());
+    TEST(TestResult(vec, RoadPos(6, false, 0), -1), ());
+    TEST(TestResult(vec, RoadPos(4, false, 0), -1), ());
+  }
+
+  {
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(8, true, 0), vec);
+    TEST_EQUAL(vec.size(), 2, ());
+    TEST(TestResult(vec, RoadPos(1, true, 1), -1), ());
+    TEST(TestResult(vec, RoadPos(8, true, 5), -1), ());
+  }
+
+  {
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(2, true, 1), vec);
+    TEST_EQUAL(vec.size(), 4, ());
+    TEST(TestResult(vec, RoadPos(3, true, 0), -1), ());
+    TEST(TestResult(vec, RoadPos(3, false, 1), -1), ());
+    TEST(TestResult(vec, RoadPos(2, true, 0), -1), ());
+    TEST(TestResult(vec, RoadPos(8, true, 4), -1), ());
+  }
+
+  {
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(3, false, 0), vec);
+    TEST_EQUAL(vec.size(), 5, ());
+    TEST(TestResult(vec, RoadPos(3, false, 1), -1), ());
+    TEST(TestResult(vec, RoadPos(3, false, 2), -1), ());
+    TEST(TestResult(vec, RoadPos(2, true, 0), -1), ());
+    TEST(TestResult(vec, RoadPos(6, true, 0), -1), ());
+    TEST(TestResult(vec, RoadPos(6, false, 1), -1), ());
+  }
+
+  {
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(7, false, 0), vec);
+    TEST_EQUAL(vec.size(), 0, ());
+  }
+
+  {
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(7, true, 0), vec);
+    TEST_EQUAL(vec.size(), 1, ());
+    TEST(TestResult(vec, RoadPos(8, true, 1), -1), ());
+  }
+
+  {
+    IRoadGraph::TurnsVectorT vec;
+    tester.GetPossibleTurns(RoadPos(8, true, 3), vec);
+    TEST_EQUAL(vec.size(), 7, ());
+    TEST(TestResult(vec, RoadPos(8, true, 2), -1), ());
+    TEST(TestResult(vec, RoadPos(5, true, 0), -1), ());
+    TEST(TestResult(vec, RoadPos(5, false, 1), -1), ());
+    TEST(TestResult(vec, RoadPos(7, false, 0), -1), ());
+    TEST(TestResult(vec, RoadPos(8, true, 1), -1), ());
+    TEST(TestResult(vec, RoadPos(1, true, 1), -1), ());
+    TEST(TestResult(vec, RoadPos(8, true, 5), -1), ());
   }
 }
diff --git a/routing/routing_tests/features_road_graph_test.hpp b/routing/routing_tests/features_road_graph_test.hpp
new file mode 100644
index 0000000000..ab6edad60b
--- /dev/null
+++ b/routing/routing_tests/features_road_graph_test.hpp
@@ -0,0 +1,45 @@
+#pragma once
+#include "../features_road_graph.hpp"
+
+#include "../../indexer/index.hpp"
+
+#include "../../std/scoped_ptr.hpp"
+
+
+namespace routing_test
+{
+
+class Name2IdMapping
+{
+  map<string, uint32_t> m_name2Id;
+  map<uint32_t, string> m_id2Name;
+
+public:
+  void operator()(FeatureType const & ft);
+
+  uint32_t GetId(string const & name);
+
+  string const & GetName(uint32_t id);
+};
+
+class FeatureRoadGraphTester
+{
+  scoped_ptr<routing::FeatureRoadGraph> m_graph;
+  Name2IdMapping m_mapping;
+  Index m_index;
+
+  void FeatureID2Name(routing::RoadPos & pos);
+
+public:
+  FeatureRoadGraphTester(string const & name);
+
+  routing::FeatureRoadGraph * GetGraph() { return m_graph.get(); }
+
+  void FeatureID2Name(routing::IRoadGraph::TurnsVectorT & vec);
+  void FeatureID2Name(vector<routing::RoadPos> & vec);
+  void Name2FeatureID(vector<routing::RoadPos> & vec);
+
+  void GetPossibleTurns(routing::RoadPos const & pos, routing::IRoadGraph::TurnsVectorT & vec);
+};
+
+}
diff --git a/routing/routing_tests/routing_tests.pro b/routing/routing_tests/routing_tests.pro
index 4b976880d9..e9b6522fc1 100644
--- a/routing/routing_tests/routing_tests.pro
+++ b/routing/routing_tests/routing_tests.pro
@@ -22,6 +22,5 @@ SOURCES += \
 
 HEADERS += \
   road_graph_builder.hpp \
-
-
+  features_road_graph_test.hpp \