diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp
index a44fde1b6f..3aae88d45d 100644
--- a/indexer/feature_data.hpp
+++ b/indexer/feature_data.hpp
@@ -73,11 +73,6 @@ namespace feature
         m_types[m_size++] = type;
     }
 
-    inline void operator() (uint32_t type)
-    {
-      Add(type);
-    }
-
     /// @name Selectors.
     //@{
     inline EGeomType GetGeoType() const { return m_geoType; }
diff --git a/indexer/indexer_tests/checker_test.cpp b/indexer/indexer_tests/checker_test.cpp
index 703ed22ad0..c08e550817 100644
--- a/indexer/indexer_tests/checker_test.cpp
+++ b/indexer/indexer_tests/checker_test.cpp
@@ -148,14 +148,14 @@ UNIT_TEST(GetHighwayClassTest)
   Classificator const & c = classif();
 
   feature::TypesHolder types1;
-  types1(c.GetTypeByPath({"highway", "motorway_link", "tunnel"}));
+  types1.Add(c.GetTypeByPath({"highway", "motorway_link", "tunnel"}));
   TEST_EQUAL(ftypes::GetHighwayClass(types1), ftypes::HighwayClass::Trunk, ());
 
   feature::TypesHolder types2;
-  types2(c.GetTypeByPath({"highway", "unclassified"}));
+  types2.Add(c.GetTypeByPath({"highway", "unclassified"}));
   TEST_EQUAL(ftypes::GetHighwayClass(types2), ftypes::HighwayClass::LivingStreet, ());
 
   feature::TypesHolder types3;
-  types3(c.GetTypeByPath({"highway"}));
+  types3.Add(c.GetTypeByPath({"highway"}));
   TEST_EQUAL(ftypes::GetHighwayClass(types3), ftypes::HighwayClass::Error, ());
 }
diff --git a/indexer/indexer_tests/editable_map_object_test.cpp b/indexer/indexer_tests/editable_map_object_test.cpp
index 40a455f1c6..f8b4aebbd6 100644
--- a/indexer/indexer_tests/editable_map_object_test.cpp
+++ b/indexer/indexer_tests/editable_map_object_test.cpp
@@ -244,14 +244,7 @@ UNIT_TEST(EditableMapObject_GetNamesDataSource)
 
 UNIT_TEST(EditableMapObject_SetInternet)
 {
-  try
-  {
-    classificator::Load();
-  }
-  catch (RootException const & e)
-  {
-    LOG(LERROR, ("Classificator read error: ", e.what()));
-  }
+  classificator::Load();
 
   EditableMapObject emo;
   auto const wifiType = classif().GetTypeByPath({"internet_access", "wlan"});
@@ -260,13 +253,13 @@ UNIT_TEST(EditableMapObject_SetInternet)
   auto types = emo.GetTypes();
   TEST(types.Has(wifiType), ());
 
-  auto const setInternetAndCheck = [wifiType](EditableMapObject & emo, osm::Internet internet, bool wifiExpected)
+  auto const setInternetAndCheck = [wifiType](EditableMapObject & emo, osm::Internet internet, bool hasWifi)
   {
     emo.SetInternet(internet);
 
     TEST_EQUAL(emo.GetInternet(), internet, ());
     auto const & types = emo.GetTypes();
-    TEST_EQUAL(types.Has(wifiType), wifiExpected, ());
+    TEST_EQUAL(types.Has(wifiType), hasWifi, ());
   };
 
   setInternetAndCheck(emo, osm::Internet::No, false);
@@ -274,9 +267,6 @@ UNIT_TEST(EditableMapObject_SetInternet)
   setInternetAndCheck(emo, osm::Internet::Wired, false);
   setInternetAndCheck(emo, osm::Internet::Wlan, true);
   setInternetAndCheck(emo, osm::Internet::Unknown, false);
-  setInternetAndCheck(emo, osm::Internet::No, false);
-  setInternetAndCheck(emo, osm::Internet::Wlan, true);
-
 
   EditableMapObject bunkerEmo;
   bunkerEmo.SetType(classif().GetTypeByPath({"military", "bunker"}));
diff --git a/map/style_tests/classificator_tests.cpp b/map/style_tests/classificator_tests.cpp
index 726508ebaf..ae49ffa73d 100644
--- a/map/style_tests/classificator_tests.cpp
+++ b/map/style_tests/classificator_tests.cpp
@@ -57,7 +57,7 @@ public:
     if (p->IsDrawableAny())
     {
       TypesHolder holder(m_geomType);
-      holder(type);
+      holder.Add(type);
 
       pair<int, int> const range = GetDrawableScaleRangeForRules(holder, m_rules);
       if (range.first == -1 || range.second == -1)
diff --git a/routing/routing_tests/vehicle_model_test.cpp b/routing/routing_tests/vehicle_model_test.cpp
index 4763ed78cd..c95133c04b 100644
--- a/routing/routing_tests/vehicle_model_test.cpp
+++ b/routing/routing_tests/vehicle_model_test.cpp
@@ -45,7 +45,7 @@ void CheckSpeed(initializer_list<uint32_t> const & types, double expectedSpeed)
   TestVehicleModel vehicleModel;
   feature::TypesHolder h;
   for (uint32_t t : types)
-    h(t);
+    h.Add(t);
 
   TEST_EQUAL(vehicleModel.GetMinTypeSpeed(h), expectedSpeed, ());
 }
@@ -55,7 +55,7 @@ void CheckOneWay(initializer_list<uint32_t> const & types, bool expectedValue)
   TestVehicleModel vehicleModel;
   feature::TypesHolder h;
   for (uint32_t t : types)
-    h(t);
+    h.Add(t);
 
   TEST_EQUAL(vehicleModel.HasOneWayType(h), expectedValue, ());
 }