1 files changed, 2 insertions, 5 deletions
diff --git a/ugc/ugc_tests/storage_tests.cpp b/ugc/ugc_tests/storage_tests.cpp
index da2815e5ae..0302fc9cce 100644
--- a/ugc/ugc_tests/storage_tests.cpp
+++ b/ugc/ugc_tests/storage_tests.cpp
@@ -102,7 +102,7 @@ public:
     return FeatureIdForPoint(mercator, ftypes::IsRailwayStationChecker::Instance());
   }
 
-  DataSourceBase & GetDataSource() { return m_dataSource; }
+  DataSource & GetDataSource() { return m_dataSource; }
 
   ~MwmBuilder()
   {
@@ -111,10 +111,7 @@ public:
   }
 
 private:
-  MwmBuilder()
-  {
-    classificator::Load();
-  }
+  MwmBuilder() : m_dataSource(make_unique<FeatureSourceFactory>()) { classificator::Load(); }
 
   MwmSet::MwmId BuildMwm(BuilderFn const & fn)
   {