12 files changed, 23 insertions, 24 deletions
diff --git a/src/components/application_manager/test/application_impl_test.cc b/src/components/application_manager/test/application_impl_test.cc
index 62d7b70a3f..a128f9c4fc 100644
--- a/src/components/application_manager/test/application_impl_test.cc
+++ b/src/components/application_manager/test/application_impl_test.cc
@@ -96,7 +96,7 @@ class ApplicationImplTest : public ::testing::Test {
 
 
   }
-  virtual void TearDown() OVERRIDE {
+  void TearDown() OVERRIDE {
     delete app_impl;
   }
   HmiStatePtr CreateTestHmiState();
diff --git a/src/components/application_manager/test/event_engine_test.cc b/src/components/application_manager/test/event_engine_test.cc
index b203374e46..c3ab82f016 100644
--- a/src/components/application_manager/test/event_engine_test.cc
+++ b/src/components/application_manager/test/event_engine_test.cc
@@ -110,7 +110,7 @@ class EventEngineTest : public testing::Test {
         hmi_apis::FunctionID::eType::VR_IsReady;
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() OVERRIDE {
     delete event_dispatcher_instance_;
     delete event_;
   }
@@ -120,7 +120,7 @@ class EventEngineTest : public testing::Test {
                        const smart_objects::SmartObject& so) {
     // Arrange
     event_dispatcher_instance_->add_observer(event_id, correlation_id,
-                                             &event_observer_mock_);
+                                             event_observer_mock_);
     event_->set_smart_object(so);
     EXPECT_CALL(event_observer_mock_, on_event(_)).Times(calls_number);
     event_dispatcher_instance_->raise_event(*event_);
diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc
index 5321ac62f1..3f40ae9ab2 100644
--- a/src/components/application_manager/test/hmi_capabilities_test.cc
+++ b/src/components/application_manager/test/hmi_capabilities_test.cc
@@ -72,7 +72,7 @@ class HMICapabilitiesTest : public ::testing::Test {
     hmi_capabilities_test->Init(&last_state_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() OVERRIDE {
     hmi_capabilities_test.reset();
   }
   static void TearDownTestCase() {
diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h
index 7f24c07793..03d0fdc4bd 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application.h
@@ -112,7 +112,7 @@ class MockApplication : public ::application_manager::Application {
   MOCK_METHOD0(increment_delete_file_in_none_count, void());
   MOCK_METHOD0(increment_list_files_in_none_count, void());
   MOCK_METHOD1(set_app_icon_path, bool(const std::string& file_name));
-  MOCK_METHOD1(set_app_allowed, void(const bool& allowed));
+  MOCK_METHOD1(set_app_allowed, void(const bool allowed));
   MOCK_METHOD1(set_device, void(connection_handler::DeviceHandle device));
   MOCK_CONST_METHOD0(get_grammar_id, uint32_t());
   MOCK_METHOD1(set_grammar_id, void(uint32_t value));
diff --git a/src/components/application_manager/test/include/application_manager/mock_application_manager.h b/src/components/application_manager/test/include/application_manager/mock_application_manager.h
index 04289ebbe9..9fe15b169e 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application_manager.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application_manager.h
@@ -154,7 +154,7 @@ class MockApplicationManager : public application_manager::ApplicationManager {
       MOCK_METHOD4(SaveBinary,
           mobile_apis::Result::eType(const std::vector<uint8_t>& binary_data, const std::string& file_path, const std::string& file_name, const int64_t offset));
       MOCK_METHOD1(SetAllAppsAllowed,
-          void(const bool& allowed));
+          void(const bool allowed));
       MOCK_METHOD1(set_driver_distraction,
           void(bool is_distracting));
       MOCK_METHOD6(StartAudioPassThruThread,
diff --git a/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h b/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h
index 2ea0cb60a9..c92f78c29e 100644
--- a/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h
+++ b/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h
@@ -50,12 +50,12 @@ class MockEventDispatcher : public ::application_manager::event_engine::EventDis
   MOCK_METHOD3(add_observer,
       void(const ::application_manager::event_engine::Event::EventID& event_id,
            int32_t hmi_correlation_id,
-           ::application_manager::event_engine::EventObserver* const observer));
+           ::application_manager::event_engine::EventObserver& observer));
   MOCK_METHOD2(remove_observer,
       void(const ::application_manager::event_engine::Event::EventID& event_id,
-           ::application_manager::event_engine::EventObserver* const observer));
+           ::application_manager::event_engine::EventObserver& observer));
   MOCK_METHOD1(remove_observer,
-      void(::application_manager::event_engine::EventObserver* const observer));
+      void(::application_manager::event_engine::EventObserver& observer));
 };
 
 
diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
index 799d59f003..d58213bb02 100644
--- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h
+++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
@@ -102,8 +102,7 @@ class MockMessageHelper {
                     uint32_t correlation_id,
                     ApplicationManager &app_mngr));
   MOCK_METHOD1(SendGetSystemInfoRequest, void(ApplicationManager &app_mngr));
-//  MOCK_METHOD2(SendDecryptCertificateToHMI, void(const std::string& file_name,
-//                                                 ApplicationManager &app_mngr));
+
   MOCK_METHOD4(SendPolicyUpdate,
                void(const std::string& file_path,
                     int timeout,
diff --git a/src/components/application_manager/test/policy_event_observer_test.cc b/src/components/application_manager/test/policy_event_observer_test.cc
index 4bc7f6a1e6..c58f903c57 100644
--- a/src/components/application_manager/test/policy_event_observer_test.cc
+++ b/src/components/application_manager/test/policy_event_observer_test.cc
@@ -70,7 +70,7 @@ class PolicyEventObserverTest : public ::testing::Test {
                                                      mock_event_dispatcher_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() OVERRIDE {
     delete policy_event_observer_;
     DeleteEvent();
   }
diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc
index c61d4a1546..aa338f9000 100644
--- a/src/components/application_manager/test/policy_handler_test.cc
+++ b/src/components/application_manager/test/policy_handler_test.cc
@@ -89,8 +89,8 @@ class PolicyHandlerTest : public ::testing::Test {
         rpc_("fake_rpc"),
         priority_("fake_priority"),        
         default_hmi_("fake_hmi")
-        ,kPreloadPTFile("sdl_preloaded_pt.json")
-        ,kAppStorageFolder("storage") {}
+        ,kPreloadPTFile_("sdl_preloaded_pt.json")
+        ,kAppStorageFolder_("storage") {}
 
  protected:
   NiceMock<MockPolicySettings> policy_settings_;
@@ -105,8 +105,8 @@ class PolicyHandlerTest : public ::testing::Test {
   const std::string rpc_;
   std::string priority_;
   std::string default_hmi_;
-  const std::string kPreloadPTFile;
-  const std::string kAppStorageFolder;
+  const std::string kPreloadPTFile_;
+  const std::string kAppStorageFolder_;
 
 
   virtual void SetUp() OVERRIDE {
@@ -118,7 +118,7 @@ class PolicyHandlerTest : public ::testing::Test {
     ASSERT_TRUE(pm_.valid());
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() OVERRIDE {
     ON_CALL(mock_event_dispatcher_, remove_observer(_,_));
   }
 
@@ -126,8 +126,8 @@ class PolicyHandlerTest : public ::testing::Test {
 
   void EnablePolicy() {
     ON_CALL(policy_settings_, enable_policy()).WillByDefault(Return(true));
-    ON_CALL(policy_settings_, preloaded_pt_file()).WillByDefault(ReturnRef(kPreloadPTFile));
-    ON_CALL(policy_settings_, app_storage_folder()).WillByDefault(ReturnRef(kAppStorageFolder));
+    ON_CALL(policy_settings_, preloaded_pt_file()).WillByDefault(ReturnRef(kPreloadPTFile_));
+    ON_CALL(policy_settings_, app_storage_folder()).WillByDefault(ReturnRef(kAppStorageFolder_));
   }
 
   void EnablePolicyAndPolicyManagerMock() {
@@ -504,8 +504,8 @@ TEST_F(PolicyHandlerTest, Test_OnPendingPermissionChange_method) {
   // Arrange
   EnablePolicyAndPolicyManagerMock();
   // Check expectations
-  uint32_t app_id = 123;
-  std::string policy_app_id("mobile_app_id");
+  const uint32_t app_id = 123;
+  const std::string policy_app_id("mobile_app_id");
 
   utils::SharedPtr<application_manager_test::MockApplication> application =
           utils::MakeShared<application_manager_test::MockApplication>();
diff --git a/src/components/application_manager/test/resumption/resumption_data_db_test.cc b/src/components/application_manager/test/resumption/resumption_data_db_test.cc
index adc5447beb..df4adb53ad 100644
--- a/src/components/application_manager/test/resumption/resumption_data_db_test.cc
+++ b/src/components/application_manager/test/resumption/resumption_data_db_test.cc
@@ -74,7 +74,7 @@ class ResumptionDataDBTest : public ResumptionDataTest {
     grammar_id_ = 16;
   }
 
-  virtual void TearDown() {
+  void TearDown() OVERRIDE {
     utils::dbms::SQLQuery query(test_db());
     EXPECT_TRUE(query.Prepare(remove_all_tables));
     EXPECT_TRUE(query.Exec());
diff --git a/src/components/application_manager/test/resumption_sql_queries_test.cc b/src/components/application_manager/test/resumption_sql_queries_test.cc
index 46402b3a80..1136651d11 100644
--- a/src/components/application_manager/test/resumption_sql_queries_test.cc
+++ b/src/components/application_manager/test/resumption_sql_queries_test.cc
@@ -128,7 +128,7 @@ class ResumptionSqlQueriesTest : public ::testing::Test {
     string file_to_delete = kDatabaseName + ".sqlite";
     file_system::DeleteFile(file_to_delete);
   }
-  void TearDown() { DeleteTablesData(); }
+  void TearDown() OVERRIDE { DeleteTablesData(); }
 
   void CheckDeleteQuery(const string& count_query, const string& query_to_check,
                         pair<int, string> app_info, pair<int, string> dev_info,
diff --git a/src/components/application_manager/test/state_controller/include/application_mock.h b/src/components/application_manager/test/state_controller/include/application_mock.h
index 3f1e96bb24..8d01795fe8 100644
--- a/src/components/application_manager/test/state_controller/include/application_mock.h
+++ b/src/components/application_manager/test/state_controller/include/application_mock.h
@@ -304,7 +304,7 @@ class MockApplication : public application_manager::Application {
   MOCK_METHOD1(set_app_icon_path,
       bool(const std::string& file_name));
   MOCK_METHOD1(set_app_allowed,
-      void(const bool& allowed));
+      void(const bool allowed));
   MOCK_METHOD1(set_device,
       void(connection_handler::DeviceHandle device));
   MOCK_CONST_METHOD0(get_grammar_id,