diff --git a/map/map_tests/search_api_tests.cpp b/map/map_tests/search_api_tests.cpp
index 20b03d2484..99aa934cf3 100644
--- a/map/map_tests/search_api_tests.cpp
+++ b/map/map_tests/search_api_tests.cpp
@@ -1,6 +1,6 @@
 // NOTE: the purpose of this test is to test interaction between
 // SearchAPI and search engine. If you would like to test search
-// engine behaviour, please, consider to implement one more search
+// engine behaviour, please, consider implementing another search
 // integration test.
 
 #include "testing/testing.hpp"
@@ -73,7 +73,7 @@ protected:
   SearchAPI m_api;
 };
 
-UNIT_CLASS_TEST(SearchAPITest, MultipleViewportRequests)
+UNIT_CLASS_TEST(SearchAPITest, MultipleViewportsRequests)
 {
   TestCafe cafe1(m2::PointD(0, 0), "cafe 1", "en");
   TestCafe cafe2(m2::PointD(0, 0), "cafe 2", "en");
diff --git a/search/search_integration_tests/helpers.cpp b/search/search_integration_tests/helpers.cpp
index 2234345340..220a5ee403 100644
--- a/search/search_integration_tests/helpers.cpp
+++ b/search/search_integration_tests/helpers.cpp
@@ -15,8 +15,7 @@ SearchTest::SearchTest()
   : m_scopedLog(LDEBUG)
   , m_engine(m_index, make_unique<storage::CountryInfoGetterForTesting>(), Engine::Params{})
 {
-  SetViewport(m2::RectD(MercatorBounds::minX, MercatorBounds::minY, MercatorBounds::maxX,
-                        MercatorBounds::maxY));
+  SetViewport(MercatorBounds::FullRect());
 }
 
 void SearchTest::RegisterCountry(string const & name, m2::RectD const & rect)
@@ -91,7 +90,7 @@ size_t SearchTest::CountFeatures(m2::RectD const & rect)
 }
 
 // static
-void SearchTest::OnMwmBuilded(MwmInfo const & info)
+void SearchTest::OnMwmBuilt(MwmInfo const & info)
 {
   switch (info.GetType())
   {
diff --git a/search/search_integration_tests/helpers.hpp b/search/search_integration_tests/helpers.hpp
index 169060716a..615b13c47d 100644
--- a/search/search_integration_tests/helpers.hpp
+++ b/search/search_integration_tests/helpers.hpp
@@ -49,7 +49,7 @@ public:
   size_t CountFeatures(m2::RectD const & rect);
 
 protected:
-  void OnMwmBuilded(MwmInfo const & /* info */) override;
+  void OnMwmBuilt(MwmInfo const & /* info */) override;
 
   my::ScopedLogLevelChanger m_scopedLog;
 
diff --git a/search/search_tests_support/test_with_custom_mwms.hpp b/search/search_tests_support/test_with_custom_mwms.hpp
index 618da2311c..fe5f967e95 100644
--- a/search/search_tests_support/test_with_custom_mwms.hpp
+++ b/search/search_tests_support/test_with_custom_mwms.hpp
@@ -56,7 +56,7 @@ public:
     auto const id = result.first;
     auto const info = id.GetInfo();
     CHECK(info.get(), ());
-    OnMwmBuilded(*info);
+    OnMwmBuilt(*info);
     return id;
   }
 
@@ -84,7 +84,7 @@ public:
 protected:
   static void Cleanup(platform::LocalCountryFile const & file);
 
-  virtual void OnMwmBuilded(MwmInfo const & /* info */) {}
+  virtual void OnMwmBuilt(MwmInfo const & /* info */) {}
 
   Index m_index;
   std::vector<platform::LocalCountryFile> m_files;