TransportManager test update after removing all singletones

26 files changed, 432 insertions, 401 deletions

diff --git a/src/components/include/test/transport_manager/mock_transport_manager_mme_settings.h b/src/components/include/test/transport_manager/mock_transport_manager_mme_settings.h
new file mode 100644
index 0000000000..812c60689f
--- /dev/null
+++ b/src/components/include/test/transport_manager/mock_transport_manager_mme_settings.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_MME_SETTINGS_H
+#define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_MME_SETTINGS_H
+
+#include <gmock/gmock.h>
+#include "protocol_handler/protocol_handler.h"
+#include "transport_manager/transport_manager_mme_settings.h"
+
+namespace test {
+namespace components {
+namespace transport_manager_test {
+
+class MockTransportManagerMMESettings
+    : public ::transport_manager::TransportManagerMMESettings {
+ public:
+  MOCK_CONST_METHOD0(event_mq_name, const std::string&());
+  MOCK_CONST_METHOD0(ack_mq_name, const std::string&());
+  MOCK_CONST_METHOD0(iap2_hub_connect_attempts, uint32_t());
+  MOCK_CONST_METHOD0(default_hub_protocol_index, uint32_t());
+  MOCK_CONST_METHOD0(iap_legacy_protocol_mask, const std::string&());
+  MOCK_CONST_METHOD0(iap_hub_protocol_mask, const std::string&());
+  MOCK_CONST_METHOD0(iap_pool_protocol_mask, const std::string&());
+  MOCK_CONST_METHOD0(iap_system_config, const std::string&());
+  MOCK_CONST_METHOD0(iap2_system_config, const std::string&());
+  MOCK_CONST_METHOD0(iap_hub_connection_wait_timeout, uint32_t());
+
+};
+
+}  // namespace transport_manager_test
+}  // namespace components
+}  // namespace test
+
+#endif  // SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_MME_SETTINGS_H
diff --git a/src/components/include/test/transport_manager/mock_transport_manager_settings.h b/src/components/include/test/transport_manager/mock_transport_manager_settings.h
new file mode 100644
index 0000000000..100f1cbf37
--- /dev/null
+++ b/src/components/include/test/transport_manager/mock_transport_manager_settings.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2016, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_SETTINGS_H
+#define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_SETTINGS_H
+
+#include <gmock/gmock.h>
+#include "protocol_handler/protocol_handler.h"
+#include "transport_manager/transport_manager_settings.h"
+#include "mock_transport_manager_mme_settings.h"
+
+namespace test {
+namespace components {
+namespace transport_manager_test {
+
+class MockTransportManagerSettings
+    : public ::transport_manager::TransportManagerSettings{
+ public:
+  MOCK_CONST_METHOD0(use_last_state, bool());
+  MOCK_CONST_METHOD0(transport_manager_disconnect_timeout, uint32_t());
+  MOCK_CONST_METHOD0(transport_manager_tcp_adapter_port, uint16_t());
+
+
+  // from mme settings
+  MOCK_CONST_METHOD0(event_mq_name, const std::string&());
+  MOCK_CONST_METHOD0(ack_mq_name, const std::string&());
+  MOCK_CONST_METHOD0(iap2_hub_connect_attempts, uint32_t());
+  MOCK_CONST_METHOD0(default_hub_protocol_index, uint32_t());
+  MOCK_CONST_METHOD0(iap_legacy_protocol_mask, const std::string&());
+  MOCK_CONST_METHOD0(iap_hub_protocol_mask, const std::string&());
+  MOCK_CONST_METHOD0(iap_pool_protocol_mask, const std::string&());
+  MOCK_CONST_METHOD0(iap_system_config, const std::string&());
+  MOCK_CONST_METHOD0(iap2_system_config, const std::string&());
+  MOCK_CONST_METHOD0(iap_hub_connection_wait_timeout, uint32_t());
+};
+
+}  // namespace transport_manager_test
+}  // namespace components
+}  // namespace test
+
+#endif  // SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_SETTINGS_H
diff --git a/src/components/transport_manager/test/CMakeLists.txt b/src/components/transport_manager/test/CMakeLists.txt
index 251877cfd4..4b4c33c0a9 100644
--- a/src/components/transport_manager/test/CMakeLists.txt
+++ b/src/components/transport_manager/test/CMakeLists.txt
@@ -40,7 +40,6 @@ include_directories(
   ${COMPONENTS_DIR}/utils/include
   ${COMPONENTS_DIR}/connection_handler/include
   ${JSONCPP_INCLUDE_DIRECTORY}
-  ${CMAKE_BINARY_DIR}
 )
 
 set(LIBRARIES
diff --git a/src/components/transport_manager/test/include/client_connection_listener_mock.h b/src/components/transport_manager/test/include/transport_manager/client_connection_listener_mock.h
index 6378e69932..6378e69932 100644
--- a/src/components/transport_manager/test/include/client_connection_listener_mock.h
+++ b/src/components/transport_manager/test/include/transport_manager/client_connection_listener_mock.h
diff --git a/src/components/transport_manager/test/include/connection_mock.h b/src/components/transport_manager/test/include/transport_manager/connection_mock.h
index 8c8bc7c1f4..8c8bc7c1f4 100644
--- a/src/components/transport_manager/test/include/connection_mock.h
+++ b/src/components/transport_manager/test/include/transport_manager/connection_mock.h
diff --git a/src/components/transport_manager/test/include/device_mock.h b/src/components/transport_manager/test/include/transport_manager/device_mock.h
index aac28fac11..aac28fac11 100644
--- a/src/components/transport_manager/test/include/device_mock.h
+++ b/src/components/transport_manager/test/include/transport_manager/device_mock.h
diff --git a/src/components/transport_manager/test/include/device_scanner_mock.h b/src/components/transport_manager/test/include/transport_manager/device_scanner_mock.h
index d751994e9a..d751994e9a 100644
--- a/src/components/transport_manager/test/include/device_scanner_mock.h
+++ b/src/components/transport_manager/test/include/transport_manager/device_scanner_mock.h
diff --git a/src/components/transport_manager/test/include/mock_telemetry_observer.h b/src/components/transport_manager/test/include/transport_manager/mock_telemetry_observer.h
index e2c41f658e..e2c41f658e 100644
--- a/src/components/transport_manager/test/include/mock_telemetry_observer.h
+++ b/src/components/transport_manager/test/include/transport_manager/mock_telemetry_observer.h
diff --git a/src/components/transport_manager/test/include/mock_transport_adapter_listener.h b/src/components/transport_manager/test/include/transport_manager/mock_transport_adapter_listener.h
index 5b68cadaa3..e94e38e6d5 100644
--- a/src/components/transport_manager/test/include/mock_transport_adapter_listener.h
+++ b/src/components/transport_manager/test/include/transport_manager/mock_transport_adapter_listener.h
@@ -46,7 +46,7 @@ using transport_manager::transport_adapter::TransportAdapterListener;
 
 namespace test {
 namespace components {
-namespace transport_manager {
+namespace transport_manager_test {
 using namespace ::protocol_handler;
 
 class MockTransportAdapterListener : public TransportAdapterListener {
diff --git a/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_impl.h b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_impl.h
index 8e01b319ab..6d499b71c1 100644
--- a/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_impl.h
+++ b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_impl.h
@@ -34,21 +34,28 @@
 #define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_IMPL_H_
 
 #include "gmock/gmock.h"
+#include "config_profile/profile.h"
 #include "transport_manager/transport_manager_impl.h"
+#include "transport_manager/mock_transport_manager_settings.h"
+#include "transport_manager/transport_manager_settings.h"
 
 namespace test {
 namespace components {
 namespace transport_manager_test {
 
 class MockTransportManagerImpl
-    : public transport_manager::TransportManagerImpl {
+    : public ::transport_manager::TransportManagerImpl {
  public:
+
+  explicit MockTransportManagerImpl(MockTransportManagerSettings& settings):
+        ::transport_manager::TransportManagerImpl(settings) {}
+
   int TestReceiveEventFromDevice(
-      const transport_manager::TransportAdapterEvent& event) {
-    return TransportManagerImpl::ReceiveEventFromDevice(event);
+      const ::transport_manager::TransportAdapterEvent& event) {
+    return ::transport_manager::TransportManagerImpl::ReceiveEventFromDevice(event);
   }
 
-  void TestHandle(transport_manager::TransportAdapterEvent test_event) {
+  void TestHandle(::transport_manager::TransportAdapterEvent test_event) {
     Handle(test_event);
   }
 
diff --git a/src/components/transport_manager/test/include/raw_message_matcher.h b/src/components/transport_manager/test/include/transport_manager/raw_message_matcher.h
index 89f1cdd182..89f1cdd182 100644
--- a/src/components/transport_manager/test/include/raw_message_matcher.h
+++ b/src/components/transport_manager/test/include/transport_manager/raw_message_matcher.h
diff --git a/src/components/transport_manager/test/include/server_connection_factory_mock.h b/src/components/transport_manager/test/include/transport_manager/server_connection_factory_mock.h
index 73f0715438..73f0715438 100644
--- a/src/components/transport_manager/test/include/server_connection_factory_mock.h
+++ b/src/components/transport_manager/test/include/transport_manager/server_connection_factory_mock.h
diff --git a/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h b/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h
index 010b6c9f4f..f5531a8003 100644
--- a/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h
+++ b/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h
@@ -35,6 +35,7 @@
 
 #include "gmock/gmock.h"
 #include "transport_manager/tcp/tcp_transport_adapter.h"
+#include "transport_manager/transport_manager_settings.h"
 
 namespace test {
 namespace components {
@@ -44,11 +45,9 @@ using namespace ::transport_manager::transport_adapter;
 
 class MockTCPTransportAdapter : public TcpTransportAdapter {
  public:
-  MockTCPTransportAdapter(uint16_t port, resumption::LastState& last_state)
-    : TcpTransportAdapter(port,last_state) {
-    ::profile::Profile::instance()->config_file_name(
-        "smartDeviceLink_test.ini");
-  }
+  MockTCPTransportAdapter(uint16_t port, resumption::LastState& last_state,
+                           const transport_manager::TransportManagerSettings& settings)
+    : TcpTransportAdapter(port,last_state, settings) {}
   MOCK_CONST_METHOD2(FindEstablishedConnection,
                      ConnectionSPtr(const DeviceUID& device_handle,
                                     const ApplicationHandle& app_handle));
diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h
index 7b52c4f4a5..7823c37fc8 100644
--- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h
@@ -35,6 +35,7 @@
 
 #include "gmock/gmock.h"
 #include "transport_manager/transport_adapter/transport_adapter_impl.h"
+#include "transport_manager/transport_manager_settings.h"
 
 using ::transport_manager::transport_adapter::TransportAdapterImpl;
 using ::transport_manager::transport_adapter::DeviceScanner;
@@ -54,9 +55,10 @@ class MockTransportAdapterImpl : public TransportAdapterImpl {
   MockTransportAdapterImpl(DeviceScanner* device_scanner,
                        ServerConnectionFactory* server_connection_factory,
                        ClientConnectionListener* client_connection_listener,
-                       resumption::LastState& last_state)
+                       resumption::LastState& last_state,
+                        const transport_manager::TransportManagerSettings& settings)
       : TransportAdapterImpl(device_scanner, server_connection_factory,
-                             client_connection_listener,last_state) {
+                             client_connection_listener,last_state, settings) {
   }
 
   ConnectionSPtr FindStatedConnection(const DeviceUID& device_handle,
diff --git a/src/components/transport_manager/test/include/transport_adapter_controller_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter_controller_mock.h
index c0c7155e43..c0c7155e43 100644
--- a/src/components/transport_manager/test/include/transport_adapter_controller_mock.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter_controller_mock.h
diff --git a/src/components/transport_manager/test/include/transport_adapter_listener_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter_listener_mock.h
index a2577ad9ee..a2577ad9ee 100644
--- a/src/components/transport_manager/test/include/transport_adapter_listener_mock.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter_listener_mock.h
diff --git a/src/components/transport_manager/test/include/transport_adapter_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter_mock.h
index 599cec29df..c50d7ce97b 100644
--- a/src/components/transport_manager/test/include/transport_adapter_mock.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter_mock.h
@@ -40,7 +40,7 @@ namespace test {
 namespace components {
 namespace transport_manager_test {
 
-class TransportAdapterMock
+class MockTransportAdapter
     : public ::transport_manager::transport_adapter::TransportAdapter {
  public:
   MOCK_CONST_METHOD0(GetDeviceType,
diff --git a/src/components/transport_manager/test/include/transport_manager_impl_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_manager_impl_mock.h
index bb73f1fa49..bb73f1fa49 100644
--- a/src/components/transport_manager/test/include/transport_manager_impl_mock.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_manager_impl_mock.h
diff --git a/src/components/transport_manager/test/include/transport_manager_listener_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_manager_listener_mock.h
index 5ae6495db2..5ae6495db2 100644
--- a/src/components/transport_manager/test/include/transport_manager_listener_mock.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_manager_listener_mock.h
diff --git a/src/components/transport_manager/test/tcp_client_listener_test.cc b/src/components/transport_manager/test/tcp_client_listener_test.cc
index d47279d23d..48af5e5242 100644
--- a/src/components/transport_manager/test/tcp_client_listener_test.cc
+++ b/src/components/transport_manager/test/tcp_client_listener_test.cc
@@ -31,7 +31,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "include/transport_adapter_mock.h"
+#include "transport_manager/transport_adapter_mock.h"
 #include "transport_manager/tcp/tcp_client_listener.h"
 #include "transport_manager/mock_transport_manager.h"
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
diff --git a/src/components/transport_manager/test/tcp_transport_adapter_test.cc b/src/components/transport_manager/test/tcp_transport_adapter_test.cc
index 28998ba7cc..cb42993c13 100644
--- a/src/components/transport_manager/test/tcp_transport_adapter_test.cc
+++ b/src/components/transport_manager/test/tcp_transport_adapter_test.cc
@@ -33,12 +33,15 @@
 #include "gtest/gtest.h"
 #include "transport_manager/tcp/tcp_transport_adapter.h"
 #include "transport_manager/transport_adapter/connection.h"
-#include "config_profile/profile.h"
 #include "resumption/last_state.h"
 #include "protocol/raw_message.h"
-#include "include/transport_adapter_listener_mock.h"
-#include "include/device_mock.h"
-#include "include/connection_mock.h"
+#include "transport_manager/transport_adapter_listener_mock.h"
+#include "transport_manager/device_mock.h"
+#include "transport_manager/connection_mock.h"
+#include "transport_manager/tcp/mock_tcp_transport_adapter.h"
+#include "transport_manager/mock_transport_manager_settings.h"
+
+#include "utils/make_shared.h"
 
 namespace test {
 namespace components {
@@ -51,39 +54,11 @@ using namespace ::protocol_handler;
 using namespace ::transport_manager;
 using namespace transport_manager::transport_adapter;
 
-class TestTCPTransportAdapter : public TcpTransportAdapter {
- public:
-  TestTCPTransportAdapter(uint16_t port, resumption::LastState& last_state)
-    : TcpTransportAdapter(port, last_state) {
-    ::profile::Profile::instance()->config_file_name(
-        "smartDeviceLink_test.ini");
-  }
-  MOCK_CONST_METHOD2(FindEstablishedConnection,
-                     ConnectionSPtr(const DeviceUID& device_handle,
-                                    const ApplicationHandle& app_handle));
-
-  MOCK_CONST_METHOD1(FindDevice, DeviceSptr(const DeviceUID& device_handle));
-  MOCK_METHOD2(Connect,
-               TransportAdapter::Error(const DeviceUID& device_handle,
-                                       const ApplicationHandle& app_handle));
-  void CallStore() { Store(); }
-  bool CallRestore() { return Restore(); }
-};
-
 class TcpAdapterTest : public ::testing::Test {
  protected:
   TcpAdapterTest():last_state_("app_storage_folder",
                                "app_info_storage"){}
-  static void SetUpTestCase() {
-    ::profile::Profile::instance()->config_file_name(
-        "smartDeviceLink_test.ini");
-  }
-   virtual void SetUp() {
-  }
-
-  virtual void TearDown() {
-  }
-
+  MockTransportManagerSettings transport_manager_settings;
   resumption::LastState  last_state_;
   const uint32_t port = 12345;
   const std::string string_port = "12345";
@@ -91,7 +66,7 @@ class TcpAdapterTest : public ::testing::Test {
 
 TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) {
   // Prepare
-  TestTCPTransportAdapter transport_adapter(port, last_state_);
+  MockTCPTransportAdapter transport_adapter(port, last_state_, transport_manager_settings);
   std::string uniq_id = "unique_device_name";
   utils::SharedPtr<MockTCPDevice> mockdev = new MockTCPDevice(port, uniq_id);
   transport_adapter.AddDevice(mockdev);
@@ -129,7 +104,7 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) {
 
 TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndOneApplication) {
   // Prepare
-  TestTCPTransportAdapter transport_adapter(port, last_state_);
+  MockTCPTransportAdapter transport_adapter(port, last_state_, transport_manager_settings);
   const uint32_t count_dev = 10;
   utils::SharedPtr<MockTCPDevice> mockdev[count_dev];
   std::string uniq_id[count_dev];
@@ -181,7 +156,7 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndOneApplication) {
 
 TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndSeveralApplications) {
   // Prepare
-  TestTCPTransportAdapter transport_adapter(port, last_state_);
+  MockTCPTransportAdapter transport_adapter(port, last_state_, transport_manager_settings);
   const uint32_t count_dev = 10;
 
   utils::SharedPtr<MockTCPDevice> mockdev[count_dev];
@@ -239,7 +214,7 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndSeveralApplications) {
 
 TEST_F(TcpAdapterTest, StoreData_ConnectionNotExist_DataNotStored) {
   // Prepare
-  TestTCPTransportAdapter transport_adapter(port, last_state_);
+  MockTCPTransportAdapter transport_adapter(port, last_state_, transport_manager_settings);
   std::string uniq_id = "unique_device_name";
   utils::SharedPtr<MockTCPDevice> mockdev = new MockTCPDevice(port, uniq_id);
   transport_adapter.AddDevice(mockdev);
@@ -268,13 +243,13 @@ TEST_F(TcpAdapterTest, RestoreData_DataNotStored) {
       last_state_
           .dictionary["TransportManager"]["TcpAdapter"];
   tcp_adapter_dictionary = Json::Value();
-  TestTCPTransportAdapter transport_adapter(port, last_state_);
+  MockTCPTransportAdapter transport_adapter(port, last_state_, transport_manager_settings);
   EXPECT_CALL(transport_adapter, Connect(_, _)).Times(0);
   EXPECT_TRUE(transport_adapter.CallRestore());
 }
 
 TEST_F(TcpAdapterTest, StoreDataWithOneDevice_RestoreData) {
-  TestTCPTransportAdapter transport_adapter(port, last_state_);
+  MockTCPTransportAdapter transport_adapter(port, last_state_, transport_manager_settings);
   std::string uniq_id = "unique_device_name";
   utils::SharedPtr<MockTCPDevice> mockdev = new MockTCPDevice(port, uniq_id);
   transport_adapter.AddDevice(mockdev);
@@ -307,7 +282,7 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDevice_RestoreData) {
 }
 
 TEST_F(TcpAdapterTest, StoreDataWithSeveralDevices_RestoreData) {
-  TestTCPTransportAdapter transport_adapter(port, last_state_);
+  MockTCPTransportAdapter transport_adapter(port, last_state_, transport_manager_settings);
   const uint32_t count_dev = 10;
 
   utils::SharedPtr<MockTCPDevice> mockdev[count_dev];
diff --git a/src/components/transport_manager/test/transport_adapter_listener_test.cc b/src/components/transport_manager/test/transport_adapter_listener_test.cc
index 52778d1c9f..445e1a98b4 100644
--- a/src/components/transport_manager/test/transport_adapter_listener_test.cc
+++ b/src/components/transport_manager/test/transport_adapter_listener_test.cc
@@ -31,7 +31,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "include/transport_adapter_mock.h"
+#include "transport_manager/transport_adapter_mock.h"
 #include "transport_manager/transport_adapter/transport_adapter_listener_impl.h"
 #include "transport_manager/mock_transport_manager.h"
 
@@ -53,7 +53,7 @@ class TransportAdapterListenerTest : public ::testing::Test {
   const int app_handle;
   const std::string dev_id;
   MockTransportManager tr_mock;
-  TransportAdapterMock adapter_mock;
+  MockTransportAdapter adapter_mock;
   TransportAdapterListenerImpl transport_listener;
 };
 
diff --git a/src/components/transport_manager/test/transport_adapter_test.cc b/src/components/transport_manager/test/transport_adapter_test.cc
index 6c103dd49b..fc128630a7 100644
--- a/src/components/transport_manager/test/transport_adapter_test.cc
+++ b/src/components/transport_manager/test/transport_adapter_test.cc
@@ -31,12 +31,14 @@
  */
 
 #include "gtest/gtest.h"
-#include "include/device_scanner_mock.h"
-#include "include/client_connection_listener_mock.h"
-#include "include/server_connection_factory_mock.h"
-#include "include/device_mock.h"
-#include "include/connection_mock.h"
-#include "include/transport_adapter_listener_mock.h"
+#include "transport_manager/device_scanner_mock.h"
+#include "transport_manager/client_connection_listener_mock.h"
+#include "transport_manager/server_connection_factory_mock.h"
+#include "transport_manager/device_mock.h"
+#include "transport_manager/connection_mock.h"
+#include "transport_manager/transport_adapter_listener_mock.h"
+#include "transport_manager/transport_adapter/mock_transport_adapter_impl.h"
+#include "transport_manager/mock_transport_manager_settings.h"
 
 #include "transport_manager/transport_adapter/transport_adapter_impl.h"
 #include "transport_manager/transport_adapter/transport_adapter_listener.h"
@@ -53,48 +55,23 @@ namespace transport_manager_test {
 
 using ::testing::Return;
 using ::testing::_;
-
+using ::testing::NiceMock;
 using namespace ::transport_manager;
 using namespace ::protocol_handler;
 
-
-class TestTransportAdapter : public TransportAdapterImpl {
- public:
-  TestTransportAdapter(DeviceScanner* device_scanner,
-                       ServerConnectionFactory* server_connection_factory,
-                       ClientConnectionListener* client_connection_listener,
-                       resumption::LastState& last_state)
-      : TransportAdapterImpl(device_scanner, server_connection_factory,
-                             client_connection_listener, last_state) {
-  }
-
-  ConnectionSPtr FindStatedConnection(const DeviceUID& device_handle,
-                                        const ApplicationHandle& app_handle) {
-    return this->FindEstablishedConnection(device_handle, app_handle);
-  }
-  virtual ~TestTransportAdapter(){};
-
-  virtual DeviceType GetDeviceType() const { return UNKNOWN; }
-
-  MOCK_CONST_METHOD0(Store, void());
-  MOCK_METHOD0(Restore, bool());
-};
-
 class TransportAdapterTest : public ::testing::Test {
  protected:
   TransportAdapterTest(): last_state_("app_storage_folder",
                                       "app_info_storage"){}
 
-  static void SetUpTestCase() {
-    profile::Profile::instance()->config_file_name("smartDeviceLink_test.ini");
-  }
-
   void SetUp() OVERRIDE {
     dev_id = "device_id";
     uniq_id = "unique_device_id";
     app_handle = 1;
+    ON_CALL(transport_manager_settings, use_last_state()).WillByDefault(Return(true));
   }
 
+  NiceMock<MockTransportManagerSettings> transport_manager_settings;
   resumption::LastState  last_state_;
   std::string dev_id;
   std::string uniq_id;
@@ -105,8 +82,7 @@ TEST_F(TransportAdapterTest, Init) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(dev_mock, serverMock, clientMock, last_state_);
-
+  MockTransportAdapterImpl transport_adapter(dev_mock, serverMock, clientMock, last_state_, transport_manager_settings);
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(*clientMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -123,7 +99,7 @@ TEST_F(TransportAdapterTest, Init) {
 TEST_F(TransportAdapterTest, SearchDevices_WithoutScanner) {
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock, clientMock, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock, clientMock, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*clientMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -138,7 +114,7 @@ TEST_F(TransportAdapterTest, SearchDevices_WithoutScanner) {
 
 TEST_F(TransportAdapterTest, SearchDevices_DeviceNotInitialized) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
-  TestTransportAdapter transport_adapter(dev_mock, NULL, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(dev_mock, NULL, NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -152,7 +128,7 @@ TEST_F(TransportAdapterTest, SearchDevices_DeviceNotInitialized) {
 
 TEST_F(TransportAdapterTest, SearchDevices_DeviceInitialized) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
-  TestTransportAdapter transport_adapter(dev_mock, NULL, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(dev_mock, NULL, NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -166,7 +142,7 @@ TEST_F(TransportAdapterTest, SearchDevices_DeviceInitialized) {
 }
 
 TEST_F(TransportAdapterTest, SearchDeviceDone_DeviceExisting) {
-  TestTransportAdapter transport_adapter(NULL, NULL, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, NULL, NULL, last_state_, transport_manager_settings);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
 
@@ -182,7 +158,7 @@ TEST_F(TransportAdapterTest, SearchDeviceDone_DeviceExisting) {
 }
 
 TEST_F(TransportAdapterTest, SearchDeviceFailed) {
-  TestTransportAdapter transport_adapter(NULL, NULL, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, NULL, NULL, last_state_, transport_manager_settings);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
 
@@ -195,7 +171,7 @@ TEST_F(TransportAdapterTest, SearchDeviceFailed) {
 }
 
 TEST_F(TransportAdapterTest, AddDevice) {
-  TestTransportAdapter transport_adapter(NULL, NULL, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, NULL, NULL, last_state_, transport_manager_settings);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
 
@@ -212,7 +188,7 @@ TEST_F(TransportAdapterTest, AddDevice) {
 
 TEST_F(TransportAdapterTest, Connect_ServerNotSupported) {
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
-  TestTransportAdapter transport_adapter(NULL, NULL, clientMock, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, NULL, clientMock, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*clientMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -228,7 +204,7 @@ TEST_F(TransportAdapterTest, Connect_ServerNotSupported) {
 
 TEST_F(TransportAdapterTest, Connect_ServerNotInitialized) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock, NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -246,7 +222,7 @@ TEST_F(TransportAdapterTest, Connect_ServerNotInitialized) {
 
 TEST_F(TransportAdapterTest, Connect_Success) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock, NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -265,7 +241,7 @@ TEST_F(TransportAdapterTest, Connect_Success) {
 
 TEST_F(TransportAdapterTest, Connect_DeviceAddedTwice) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock, NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -288,7 +264,7 @@ TEST_F(TransportAdapterTest, Connect_DeviceAddedTwice) {
 }
 
 TEST_F(TransportAdapterTest, ConnectDevice_ServerNotAdded_DeviceAdded) {
-  TestTransportAdapter transport_adapter(NULL, NULL, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, NULL, NULL, last_state_, transport_manager_settings);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
 
@@ -311,8 +287,7 @@ TEST_F(TransportAdapterTest, ConnectDevice_ServerNotAdded_DeviceAdded) {
 
 TEST_F(TransportAdapterTest, ConnectDevice_DeviceNotAdded) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock, NULL, last_state_);
-
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock, NULL, last_state_, transport_manager_settings);
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
@@ -329,7 +304,7 @@ TEST_F(TransportAdapterTest, ConnectDevice_DeviceNotAdded) {
 
 TEST_F(TransportAdapterTest, ConnectDevice_DeviceAdded) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock, NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -360,7 +335,7 @@ TEST_F(TransportAdapterTest, ConnectDevice_DeviceAdded) {
 
 TEST_F(TransportAdapterTest, ConnectDevice_DeviceAddedTwice) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock, NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -400,7 +375,7 @@ TEST_F(TransportAdapterTest, ConnectDevice_DeviceAddedTwice) {
 
 TEST_F(TransportAdapterTest, Disconnect_ConnectDoneSuccess) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock, NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock, NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -431,7 +406,7 @@ TEST_F(TransportAdapterTest, Disconnect_ConnectDoneSuccess) {
 
 TEST_F(TransportAdapterTest, DisconnectDevice_DeviceAddedConnectionCreated) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock,NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock,NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -468,7 +443,7 @@ TEST_F(TransportAdapterTest, DisconnectDevice_DeviceAddedConnectionCreated) {
 
 TEST_F(TransportAdapterTest, DeviceDisconnected) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock,NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock,NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -511,7 +486,7 @@ TEST_F(TransportAdapterTest, DeviceDisconnected) {
 
 TEST_F(TransportAdapterTest, AbortedConnectSuccess) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock,NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock,NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -536,7 +511,7 @@ TEST_F(TransportAdapterTest, AbortedConnectSuccess) {
 TEST_F(TransportAdapterTest, SendData) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(dev_mock, serverMock,NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(dev_mock, serverMock,NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -572,7 +547,7 @@ TEST_F(TransportAdapterTest, SendData_ConnectionNotEstablished) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(dev_mock, serverMock, clientMock, last_state_);
+  MockTransportAdapterImpl transport_adapter(dev_mock, serverMock, clientMock, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(*clientMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -605,7 +580,7 @@ TEST_F(TransportAdapterTest, SendData_ConnectionNotEstablished) {
 TEST_F(TransportAdapterTest, StartClientListening_ClientNotInitialized) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
-  TestTransportAdapter transport_adapter(dev_mock, NULL, clientMock, last_state_);
+  MockTransportAdapterImpl transport_adapter(dev_mock, NULL, clientMock, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(*clientMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -625,7 +600,7 @@ TEST_F(TransportAdapterTest, StartClientListening_ClientNotInitialized) {
 TEST_F(TransportAdapterTest, StartClientListening) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
-  TestTransportAdapter transport_adapter(dev_mock, NULL, clientMock, last_state_);
+  MockTransportAdapterImpl transport_adapter(dev_mock, NULL, clientMock, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(*clientMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -647,7 +622,7 @@ TEST_F(TransportAdapterTest, StopClientListening_Success) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(dev_mock, serverMock, clientMock, last_state_);
+  MockTransportAdapterImpl transport_adapter(dev_mock, serverMock, clientMock, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(*clientMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -677,7 +652,7 @@ TEST_F(TransportAdapterTest, FindNewApplicationsRequest) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(dev_mock, serverMock, clientMock, last_state_);
+  MockTransportAdapterImpl transport_adapter(dev_mock, serverMock, clientMock, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(*clientMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -697,7 +672,7 @@ TEST_F(TransportAdapterTest, FindNewApplicationsRequest) {
 }
 
 TEST_F(TransportAdapterTest, GetDeviceAndApplicationLists) {
-  TestTransportAdapter transport_adapter(NULL, NULL,NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, NULL,NULL, last_state_, transport_manager_settings);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
 
@@ -719,7 +694,7 @@ TEST_F(TransportAdapterTest, GetDeviceAndApplicationLists) {
 
 TEST_F(TransportAdapterTest, FindEstablishedConnection) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  TestTransportAdapter transport_adapter(NULL, serverMock,NULL, last_state_);
+  MockTransportAdapterImpl transport_adapter(NULL, serverMock,NULL, last_state_, transport_manager_settings);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
diff --git a/src/components/transport_manager/test/transport_manager_default_test.cc b/src/components/transport_manager/test/transport_manager_default_test.cc
index 4e0bd94845..4531b662a7 100644
--- a/src/components/transport_manager/test/transport_manager_default_test.cc
+++ b/src/components/transport_manager/test/transport_manager_default_test.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Ford Motor Company
+ * Copyright (c) 2016, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,15 +32,36 @@
 #include "gtest/gtest.h"
 #include "transport_manager/transport_manager.h"
 #include "transport_manager/transport_manager_default.h"
+#include "resumption/last_state.h"
+#include "transport_manager/mock_transport_manager_settings.h"
+#include "resumption/last_state.h"
 
 namespace test {
-namespace test_transport_manager_instance {
-TEST(TestTransportManagerDefault, CreateOnlyInstance) {
-  transport_manager::TransportManager* instance =
-      transport_manager::TransportManagerDefault::instance();
-  ASSERT_EQ(instance, transport_manager::TransportManagerDefault::instance());
-  transport_manager::TransportManagerDefault::destroy();
+namespace components {
+namespace transport_manager_test {
+
+using ::testing::Return;
+TEST(TestTransportManagerDefault, Init_LastStateNotUsed) {
+  MockTransportManagerSettings transport_manager_settings;
+  transport_manager::TransportManagerDefault transport_manager(transport_manager_settings);
+  resumption::LastState last_state("app_storage_folder", "app_info_storage");
+
+  EXPECT_CALL(transport_manager_settings,use_last_state()).WillRepeatedly(Return(false));
+  EXPECT_CALL(transport_manager_settings, transport_manager_tcp_adapter_port()).WillRepeatedly(Return(1u));
+  transport_manager.Init(last_state);
+}
+
+//TODO(VVeremjova) APPLINK-22021
+TEST(TestTransportManagerDefault, DISABLED_Init_LastStateUsed) {
+  MockTransportManagerSettings transport_manager_settings;
+  transport_manager::TransportManagerDefault transport_manager(transport_manager_settings);
+  resumption::LastState last_state("app_storage_folder", "app_info_storage");
+
+  EXPECT_CALL(transport_manager_settings, use_last_state()).WillRepeatedly(Return(true));
+  EXPECT_CALL(transport_manager_settings, transport_manager_tcp_adapter_port()).WillRepeatedly(Return(1u));
+  transport_manager.Init(last_state);
 }
 
+}  // namespace transport_manager_test
+}  // namespace components
 }  // namespace test
-}  // namespace test_transport_manager_instance
diff --git a/src/components/transport_manager/test/transport_manager_impl_test.cc b/src/components/transport_manager/test/transport_manager_impl_test.cc
index 3047f26bb8..b022a72bf0 100644
--- a/src/components/transport_manager/test/transport_manager_impl_test.cc
+++ b/src/components/transport_manager/test/transport_manager_impl_test.cc
@@ -36,17 +36,18 @@
 #include "transport_manager/common.h"
 #include "transport_manager/transport_manager_impl.h"
 
-#include "include/transport_adapter_mock.h"
-#include "include/transport_manager_listener_mock.h"
-#include "include/transport_adapter_listener_mock.h"
-#include "include/mock_telemetry_observer.h"
-
-#include "transport_manager/transport_adapter/transport_adapter_event.h"
+#include "transport_manager/mock_telemetry_observer.h"
+#include "transport_manager/transport_manager_listener_mock.h"
+#include "transport_manager/mock_transport_adapter_listener.h"
+#include "transport_manager/mock_telemetry_observer.h"
+#include "transport_manager/transport_adapter_mock.h"
 #include "transport_manager/mock_transport_manager_impl.h"
-#include "telemetry_monitor/mock_telemetry_observer.h"
+#include "transport_manager/mock_transport_manager_settings.h"
 #include "utils/make_shared.h"
 #include "utils/shared_ptr.h"
+
 #include "resumption/last_state.h"
+#include "utils/make_shared.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
@@ -67,23 +68,25 @@ const std::string kAppInfoFolder = "app_info_folder";
 class TransportManagerImplTest : public ::testing::Test {
  protected:
   TransportManagerImplTest()
-      : device_handle_(1)
+      : tm_(settings)
+      ,  device_handle_(1)
       , mac_address_("MA:CA:DR:ES:S")
-      , dev_info_(device_handle_, mac_address_, "TestDeviceName", "BTMAC")
-      , last_state_(kAppStorageFolder, kAppInfoFolder) {}
+      , dev_info_(device_handle_, mac_address_, "TestDeviceName", "BTMAC") {}
 
   void SetUp() OVERRIDE {
-    mock_transport_manager_.Init(last_state_);
-    mock_adapter_ = new TransportAdapterMock();
-    mock_transport_manager_listener_ = MakeShared<TransportManagerListenerMock>();
+    resumption::LastState  last_state_("app_storage_folder",
+                                       "app_info_storage");
+    tm_.Init(last_state_);
+    mock_adapter_ = new MockTransportAdapter();
+    tm_listener_ = MakeShared<TransportManagerListenerMock>();
 
 #ifdef TELEMETRY_MONITOR
-    mock_transport_manager_.SetTelemetryObserver(&mock_metric_observer_);
+    tm_.SetTelemetryObserver(&mock_metric_observer_);
 #endif  // TELEMETRY_MONITOR
-    EXPECT_EQ(E_SUCCESS, mock_transport_manager_.AddEventListener(mock_transport_manager_listener_.get()));
+    EXPECT_EQ(E_SUCCESS, tm_.AddEventListener(tm_listener_.get()));
     EXPECT_CALL(*mock_adapter_, AddListener(_));
     EXPECT_CALL(*mock_adapter_, IsInitialised()).WillOnce(Return(true));
-    EXPECT_EQ(E_SUCCESS, mock_transport_manager_.AddTransportAdapter(mock_adapter_));
+    EXPECT_EQ(E_SUCCESS, tm_.AddTransportAdapter(mock_adapter_));
 
     connection_key_ = 1;
     error_ = MakeShared<BaseError>();
@@ -120,11 +123,11 @@ class TransportManagerImplTest : public ::testing::Test {
         .Times(AtLeast(1))
         .WillRepeatedly(Return(dev_info_.connection_type()));
 
-    EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceFound(dev_info_));
-    EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceAdded(dev_info_));
-    EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceListUpdated(vector_dev_info));
+    EXPECT_CALL(*tm_listener_, OnDeviceFound(dev_info_));
+    EXPECT_CALL(*tm_listener_, OnDeviceAdded(dev_info_));
+    EXPECT_CALL(*tm_listener_, OnDeviceListUpdated(vector_dev_info));
 
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
     device_list_.pop_back();
   }
 
@@ -144,10 +147,10 @@ class TransportManagerImplTest : public ::testing::Test {
     EXPECT_CALL(*mock_adapter_, GetConnectionType())
         .WillOnce(Return(dev_info_.connection_type()));
 
-    EXPECT_CALL(*mock_transport_manager_listener_,
+    EXPECT_CALL(*tm_listener_,
                 OnConnectionEstablished(dev_info_, connection_key_));
 
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
   }
 
   void HandleConnectionFailed() {
@@ -166,9 +169,9 @@ class TransportManagerImplTest : public ::testing::Test {
     EXPECT_CALL(*mock_adapter_, GetConnectionType())
         .WillOnce(Return(dev_info_.connection_type()));
 
-    EXPECT_CALL(*mock_transport_manager_listener_, OnConnectionFailed(dev_info_, _));
+    EXPECT_CALL(*tm_listener_, OnConnectionFailed(dev_info_, _));
 
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
   }
 
   void HandleSendDone() {
@@ -181,11 +184,11 @@ class TransportManagerImplTest : public ::testing::Test {
                                      test_message_,
                                      error_);
 #ifdef TELEMETRY_MONITOR
-    EXPECT_CALL(mock_metric_observer_, StopRawMsg(_));
+    EXPECT_CALL(mock_metric_observer_, StopRawMsg(test_event.event_data.get()));
 #endif  // TELEMETRY_MONITOR
-    EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageSend(test_message_));
+    EXPECT_CALL(*tm_listener_, OnTMMessageSend(test_message_));
 
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
   }
 
   void HandleReceiveDone() {
@@ -200,9 +203,9 @@ class TransportManagerImplTest : public ::testing::Test {
 #ifdef TELEMETRY_MONITOR
     EXPECT_CALL(mock_metric_observer_, StopRawMsg(_));
 #endif  // TELEMETRY_MONITOR
-    EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageReceived(test_message_));
+    EXPECT_CALL(*tm_listener_, OnTMMessageReceived(test_message_));
 
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
   }
 
   void HandleSendFailed() {
@@ -218,7 +221,7 @@ class TransportManagerImplTest : public ::testing::Test {
 #ifdef TELEMETRY_MONITOR
     EXPECT_CALL(mock_metric_observer_, StopRawMsg(_));
 #endif  // TELEMETRY_MONITOR
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
   }
 
   void HandleSearchDone() {
@@ -232,9 +235,9 @@ class TransportManagerImplTest : public ::testing::Test {
                                      test_message_,
                                      error_);
 
-    EXPECT_CALL(*mock_transport_manager_listener_, OnScanDevicesFinished());
+    EXPECT_CALL(*tm_listener_, OnScanDevicesFinished());
 
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
   }
 
   void HandleSearchFail() {
@@ -248,9 +251,9 @@ class TransportManagerImplTest : public ::testing::Test {
                                      test_message_,
                                      error_);
 
-    EXPECT_CALL(*mock_transport_manager_listener_, OnScanDevicesFailed(_));
+    EXPECT_CALL(*tm_listener_, OnScanDevicesFailed(_));
 
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
   }
 
   void HandleFindNewApplicationsRequest() {
@@ -265,9 +268,9 @@ class TransportManagerImplTest : public ::testing::Test {
                                      test_message_,
                                      error_);
 
-    EXPECT_CALL(*mock_transport_manager_listener_, OnFindNewApplicationsRequest());
+    EXPECT_CALL(*tm_listener_, OnFindNewApplicationsRequest());
 
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
   }
 
   void HandleConnectionClosed() {
@@ -281,9 +284,9 @@ class TransportManagerImplTest : public ::testing::Test {
                                      test_message_,
                                      error_);
 
-    EXPECT_CALL(*mock_transport_manager_listener_, OnConnectionClosed(application_id_));
+    EXPECT_CALL(*tm_listener_, OnConnectionClosed(application_id_));
 
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
   }
 
   void HandleDisconnectionFailed() {
@@ -297,23 +300,23 @@ class TransportManagerImplTest : public ::testing::Test {
                                      test_message_,
                                      error_);
 
-    EXPECT_CALL(*mock_transport_manager_listener_, OnDisconnectFailed(device_handle_, _));
+    EXPECT_CALL(*tm_listener_, OnDisconnectFailed(device_handle_, _));
 
-    mock_transport_manager_.TestHandle(test_event);
+    tm_.TestHandle(test_event);
   }
 
   void UninitializeTM() {
     EXPECT_CALL(*mock_adapter_, Terminate());
-    ASSERT_EQ(E_SUCCESS, mock_transport_manager_.Stop());
+    ASSERT_EQ(E_SUCCESS, tm_.Stop());
   }
-
-  MockTransportManagerImpl mock_transport_manager_;
+  MockTransportManagerSettings settings;
+  MockTransportManagerImpl tm_;
 #ifdef TELEMETRY_MONITOR
-  TMTelemetryObserverMock mock_metric_observer_;
+  MockTMTelemetryObserver mock_metric_observer_;
 #endif  // TELEMETRY_MONITOR
-  TransportAdapterMock* mock_adapter_;
+  MockTransportAdapter* mock_adapter_;
 
-  utils::SharedPtr<TransportManagerListenerMock> mock_transport_manager_listener_;
+  utils::SharedPtr<TransportManagerListenerMock> tm_listener_;
 
   const ApplicationHandle application_id_ = 1;
 
@@ -325,79 +328,65 @@ class TransportManagerImplTest : public ::testing::Test {
   const DeviceInfo dev_info_;
   DeviceList device_list_;
   BaseErrorPtr error_;
-  resumption::LastState last_state_;
 };
 
 TEST_F(TransportManagerImplTest, SearchDevices_AdaptersNotAdded) {
-  ON_CALL(*mock_adapter_, SearchDevices()).WillByDefault(Return(
-        ::transport_manager::transport_adapter::TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.SearchDevices());
-}
-
-TEST_F(TransportManagerImplTest, AddTransportAdapter) {
-
-  TransportAdapterMock* mock_adapter = new TransportAdapterMock();
-  utils::SharedPtr<TransportManagerListenerMock> mock_transport_manager_listener =
-      MakeShared<TransportManagerListenerMock>();
-
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.AddEventListener(mock_transport_manager_listener.get()));
-  EXPECT_CALL(*mock_adapter, AddListener(_));
-  EXPECT_CALL(*mock_adapter, IsInitialised()).WillOnce(Return(false));
-  EXPECT_CALL(*mock_adapter, Init()).WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.AddTransportAdapter(mock_adapter));
+  EXPECT_CALL(*mock_adapter_, SearchDevices()).WillOnce(Return(
+        transport_manager::transport_adapter::TransportAdapter::OK));
+  EXPECT_EQ(E_SUCCESS, tm_.SearchDevices());
 }
 
 TEST_F(TransportManagerImplTest, AddTransportAdapterSecondTime) {
-  EXPECT_EQ(E_ADAPTER_EXISTS, mock_transport_manager_.AddTransportAdapter(mock_adapter_));
+  EXPECT_EQ(E_ADAPTER_EXISTS, tm_.AddTransportAdapter(mock_adapter_));
 }
 
 TEST_F(TransportManagerImplTest, ConnectDevice) {
   HandleDeviceListUpdated();
   EXPECT_CALL(*mock_adapter_, ConnectDevice(mac_address_))
       .WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.ConnectDevice(device_handle_));
+  EXPECT_EQ(E_SUCCESS, tm_.ConnectDevice(device_handle_));
 }
 
 TEST_F(TransportManagerImplTest, ConnectDevice_DeviceNotHandled) {
   EXPECT_CALL(*mock_adapter_, ConnectDevice(mac_address_)).Times(0);
-  EXPECT_EQ(E_INVALID_HANDLE, mock_transport_manager_.ConnectDevice(device_handle_));
+  EXPECT_EQ(E_INVALID_HANDLE, tm_.ConnectDevice(device_handle_));
 }
 
 TEST_F(TransportManagerImplTest, ConnectDevice_DeviceNotConnected) {
   HandleDeviceListUpdated();
   EXPECT_CALL(*mock_adapter_, ConnectDevice(mac_address_))
       .WillOnce(Return(TransportAdapter::FAIL));
-  EXPECT_EQ(E_INTERNAL_ERROR, mock_transport_manager_.ConnectDevice(device_handle_));
+  EXPECT_EQ(E_INTERNAL_ERROR, tm_.ConnectDevice(device_handle_));
 }
 
 TEST_F(TransportManagerImplTest, DisconnectDevice) {
   HandleDeviceListUpdated();
   EXPECT_CALL(*mock_adapter_, ConnectDevice(mac_address_))
       .WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.ConnectDevice(device_handle_));
+  EXPECT_EQ(E_SUCCESS, tm_.ConnectDevice(device_handle_));
 
   EXPECT_CALL(*mock_adapter_, DisconnectDevice(mac_address_))
       .WillOnce(Return(TransportAdapter::OK));
 
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.DisconnectDevice(device_handle_));
+  EXPECT_EQ(E_SUCCESS, tm_.DisconnectDevice(device_handle_));
 }
 
 TEST_F(TransportManagerImplTest, DisconnectDevice_ConnectionFailed) {
   HandleDeviceListUpdated();
   EXPECT_CALL(*mock_adapter_, ConnectDevice(mac_address_))
       .WillOnce(Return(TransportAdapter::FAIL));
-  EXPECT_EQ(E_INTERNAL_ERROR, mock_transport_manager_.ConnectDevice(device_handle_));
+  EXPECT_EQ(E_INTERNAL_ERROR, tm_.ConnectDevice(device_handle_));
 
   EXPECT_CALL(*mock_adapter_, DisconnectDevice(mac_address_))
       .WillOnce(Return(TransportAdapter::FAIL));
 
   // Even with fail, we get Success
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.DisconnectDevice(device_handle_));
+  EXPECT_EQ(E_SUCCESS, tm_.DisconnectDevice(device_handle_));
 }
 
 TEST_F(TransportManagerImplTest, DisconnectDevice_DeviceNotConnected) {
   EXPECT_CALL(*mock_adapter_, DisconnectDevice(mac_address_)).Times(0);
-  EXPECT_EQ(E_INVALID_HANDLE, mock_transport_manager_.DisconnectDevice(device_handle_));
+  EXPECT_EQ(E_INVALID_HANDLE, tm_.DisconnectDevice(device_handle_));
 }
 
 TEST_F(TransportManagerImplTest, Disconnect) {
@@ -407,7 +396,7 @@ TEST_F(TransportManagerImplTest, Disconnect) {
   EXPECT_CALL(*mock_adapter_, Disconnect(mac_address_, application_id_))
       .WillOnce(Return(TransportAdapter::OK));
   // Assert
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.Disconnect(connection_key_));
+  EXPECT_EQ(E_SUCCESS, tm_.Disconnect(connection_key_));
 }
 
 TEST_F(TransportManagerImplTest, Disconnect_DisconnectionFailed) {
@@ -418,14 +407,13 @@ TEST_F(TransportManagerImplTest, Disconnect_DisconnectionFailed) {
       .WillOnce(Return(TransportAdapter::FAIL));
   // Assert
   // Even with fail, we get Success
-  EXPECT_EQ(E_SUCCESS,  mock_transport_manager_.Disconnect(connection_key_));
+  EXPECT_EQ(E_SUCCESS,  tm_.Disconnect(connection_key_));
 }
 
 TEST_F(TransportManagerImplTest, Disconnect_ConnectionNotExist) {
-  EXPECT_CALL(*mock_adapter_, Disconnect(mac_address_, application_id_))
-      .Times(0);
+  EXPECT_CALL(*mock_adapter_, Disconnect(mac_address_, application_id_)).Times(0);
   // Assert
-  EXPECT_EQ(E_INVALID_HANDLE, mock_transport_manager_.Disconnect(connection_key_));
+  EXPECT_EQ(E_INVALID_HANDLE, tm_.Disconnect(connection_key_));
 }
 
 TEST_F(TransportManagerImplTest, Disconnect_ConnectionDoesNotExists) {
@@ -434,12 +422,12 @@ TEST_F(TransportManagerImplTest, Disconnect_ConnectionDoesNotExists) {
 
   EXPECT_CALL(*mock_adapter_, ConnectDevice(mac_address_))
       .WillRepeatedly(Return(TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.ConnectDevice(device_handle_));
+  EXPECT_EQ(E_SUCCESS, tm_.ConnectDevice(device_handle_));
 
   EXPECT_CALL(*mock_adapter_, Disconnect(mac_address_, application_id_))
       .WillRepeatedly(Return(TransportAdapter::OK));
   // Assert
-  EXPECT_EQ(E_INVALID_HANDLE, mock_transport_manager_.Disconnect(connection_key_));
+  EXPECT_EQ(E_INVALID_HANDLE, tm_.Disconnect(connection_key_));
 }
 
 TEST_F(TransportManagerImplTest, DisconnectForce_TMIsInitialized) {
@@ -449,7 +437,17 @@ TEST_F(TransportManagerImplTest, DisconnectForce_TMIsInitialized) {
   EXPECT_CALL(*mock_adapter_, Disconnect(mac_address_, application_id_))
       .WillRepeatedly(Return(TransportAdapter::OK));
   // Assert
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.DisconnectForce(connection_key_));
+  EXPECT_EQ(E_SUCCESS, tm_.DisconnectForce(connection_key_));
+}
+
+TEST_F(TransportManagerImplTest, DisconnectForce_) {
+  // Arrange
+  HandleConnection();
+
+  EXPECT_CALL(*mock_adapter_, Disconnect(mac_address_, application_id_))
+      .WillRepeatedly(Return(TransportAdapter::OK));
+  // Assert
+  EXPECT_EQ(E_SUCCESS, tm_.DisconnectForce(connection_key_));
 }
 
 TEST_F(TransportManagerImplTest, SearchDevices_DeviceConnected) {
@@ -457,7 +455,7 @@ TEST_F(TransportManagerImplTest, SearchDevices_DeviceConnected) {
 
   EXPECT_CALL(*mock_adapter_, SearchDevices())
       .WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.SearchDevices());
+  EXPECT_EQ(E_SUCCESS, tm_.SearchDevices());
 
   HandleSearchDone();
 }
@@ -467,7 +465,7 @@ TEST_F(TransportManagerImplTest, SearchDevices_DeviceNotFound) {
 
   EXPECT_CALL(*mock_adapter_, SearchDevices())
       .WillOnce(Return(TransportAdapter::FAIL));
-  EXPECT_EQ(E_ADAPTERS_FAIL, mock_transport_manager_.SearchDevices());
+  EXPECT_EQ(E_ADAPTERS_FAIL, tm_.SearchDevices());
 }
 
 TEST_F(TransportManagerImplTest, SearchDevices_AdapterNotSupported) {
@@ -475,7 +473,7 @@ TEST_F(TransportManagerImplTest, SearchDevices_AdapterNotSupported) {
 
   EXPECT_CALL(*mock_adapter_, SearchDevices())
       .WillOnce(Return(TransportAdapter::NOT_SUPPORTED));
-  EXPECT_EQ(E_ADAPTERS_FAIL, mock_transport_manager_.SearchDevices());
+  EXPECT_EQ(E_ADAPTERS_FAIL, tm_.SearchDevices());
 }
 
 TEST_F(TransportManagerImplTest, SearchDevices_AdapterWithBadState) {
@@ -483,7 +481,7 @@ TEST_F(TransportManagerImplTest, SearchDevices_AdapterWithBadState) {
 
   EXPECT_CALL(*mock_adapter_, SearchDevices())
       .WillOnce(Return(TransportAdapter::BAD_STATE));
-  EXPECT_EQ(E_ADAPTERS_FAIL, mock_transport_manager_.SearchDevices());
+  EXPECT_EQ(E_ADAPTERS_FAIL, tm_.SearchDevices());
 }
 
 TEST_F(TransportManagerImplTest, SendMessageToDevice) {
@@ -493,43 +491,50 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice) {
   EXPECT_CALL(*mock_adapter_,
               SendData(mac_address_, application_id_, test_message_))
       .WillOnce(Return(TransportAdapter::OK));
+
 #ifdef TELEMETRY_MONITOR
-  EXPECT_CALL(mock_metric_observer_, StartRawMsg(_));
+    EXPECT_CALL(mock_metric_observer_, StartRawMsg(test_message_.get()));
 #endif  // TELEMETRY_MONITOR
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.SendMessageToDevice(test_message_));
-  testing::Mock::AsyncVerifyAndClearExpectations(10000);
+
+  EXPECT_EQ(E_SUCCESS, tm_.SendMessageToDevice(test_message_));
+  testing::Mock::AsyncVerifyAndClearExpectations(1000);
 }
 
 TEST_F(TransportManagerImplTest, SendMessageToDevice_SendingFailed) {
   // Arrange
   HandleConnection();
-#ifdef TELEMETRY_MONITOR
-  EXPECT_CALL(mock_metric_observer_, StartRawMsg(_));
-#endif  // TELEMETRY_MONITOR
+
+  MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver();
+  tm_.SetTelemetryObserver(mock_metric_observer);
+  EXPECT_CALL(*mock_metric_observer, StartRawMsg(_));
+
   EXPECT_CALL(*mock_adapter_,
               SendData(mac_address_, application_id_, test_message_))
       .WillOnce(Return(TransportAdapter::FAIL));
 
-  EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageSendFailed(_, test_message_));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.SendMessageToDevice(test_message_));
-#ifdef TELEMETRY_MONITOR
-  EXPECT_CALL(mock_metric_observer_, StopRawMsg(_)).Times(0);
-#endif  // TELEMETRY_MONITOR
-  testing::Mock::AsyncVerifyAndClearExpectations(10000);
+  EXPECT_CALL(*tm_listener_, OnTMMessageSendFailed(_, test_message_));
+  EXPECT_EQ(E_SUCCESS, tm_.SendMessageToDevice(test_message_));
+
+  EXPECT_CALL(*mock_metric_observer, StopRawMsg(_)).Times(0);
+
+  delete mock_metric_observer;
+  testing::Mock::AsyncVerifyAndClearExpectations(1000);
 }
 
 TEST_F(TransportManagerImplTest, SendMessageToDevice_StartTimeObserver) {
   // Arrange
   HandleConnection();
 
+  MockTMTelemetryObserver* mock_metric_observer = new MockTMTelemetryObserver();
+  tm_.SetTelemetryObserver(mock_metric_observer);
   EXPECT_CALL(*mock_adapter_,
               SendData(mac_address_, application_id_, test_message_))
       .WillOnce(Return(TransportAdapter::OK));
-#ifdef TELEMETRY_MONITOR
-  EXPECT_CALL(mock_metric_observer_, StartRawMsg(_));
-#endif  // TELEMETRY_MONITOR
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.SendMessageToDevice(test_message_));
-  testing::Mock::AsyncVerifyAndClearExpectations(10000);
+  EXPECT_CALL(*mock_metric_observer, StartRawMsg(_));
+
+  EXPECT_EQ(E_SUCCESS, tm_.SendMessageToDevice(test_message_));
+  delete mock_metric_observer;
+  testing::Mock::AsyncVerifyAndClearExpectations(1000);
 }
 
 TEST_F(TransportManagerImplTest, SendMessageToDevice_SendDone) {
@@ -539,30 +544,27 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_SendDone) {
   EXPECT_CALL(*mock_adapter_,
               SendData(mac_address_, application_id_, test_message_))
       .WillOnce(Return(TransportAdapter::OK));
-#ifdef TELEMETRY_MONITOR
-  EXPECT_CALL(mock_metric_observer_, StartRawMsg(_));
-#endif  // TELEMETRY_MONITOR
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.SendMessageToDevice(test_message_));
+  EXPECT_CALL(mock_metric_observer_, StartRawMsg(test_message_.get()));
+  EXPECT_EQ(E_SUCCESS, tm_.SendMessageToDevice(test_message_));
+
   HandleSendDone();
 
-  testing::Mock::AsyncVerifyAndClearExpectations(10000);
+  testing::Mock::AsyncVerifyAndClearExpectations(1000);
 }
 
 TEST_F(TransportManagerImplTest, SendMessageFailed_GetHandleSendFailed) {
   // Arrange
   HandleConnection();
-#ifdef TELEMETRY_MONITOR
-  EXPECT_CALL(mock_metric_observer_, StartRawMsg(_));
-#endif  // TELEMETRY_MONITOR
+
   EXPECT_CALL(*mock_adapter_,
               SendData(mac_address_, application_id_, test_message_))
       .WillOnce(Return(TransportAdapter::FAIL));
-
-  EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageSendFailed(_, test_message_));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.SendMessageToDevice(test_message_));
+  EXPECT_CALL(mock_metric_observer_, StartRawMsg(test_message_.get()));
+  EXPECT_CALL(*tm_listener_, OnTMMessageSendFailed(_, test_message_));
+  EXPECT_EQ(E_SUCCESS, tm_.SendMessageToDevice(test_message_));
 
   HandleSendFailed();
-  testing::Mock::AsyncVerifyAndClearExpectations(10000);
+  testing::Mock::AsyncVerifyAndClearExpectations(1000);
 }
 
 TEST_F(TransportManagerImplTest, RemoveDevice_DeviceWasAdded) {
@@ -570,47 +572,47 @@ TEST_F(TransportManagerImplTest, RemoveDevice_DeviceWasAdded) {
   HandleDeviceListUpdated();
   EXPECT_CALL(*mock_adapter_, ConnectDevice(mac_address_))
       .WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.ConnectDevice(device_handle_));
+  EXPECT_EQ(E_SUCCESS, tm_.ConnectDevice(device_handle_));
 
   // Assert
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.RemoveDevice(device_handle_));
+  EXPECT_EQ(E_SUCCESS, tm_.RemoveDevice(device_handle_));
 }
 
 TEST_F(TransportManagerImplTest, SetVisibilityOn_StartClientListening) {
   EXPECT_CALL(*mock_adapter_, StartClientListening())
       .WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.Visibility(true));
+  EXPECT_EQ(::transport_manager::E_SUCCESS, tm_.Visibility(true));
 }
 
 TEST_F(TransportManagerImplTest, SetVisibilityOff_StopClientListening) {
   EXPECT_CALL(*mock_adapter_, StopClientListening())
       .WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.Visibility(false));
+  EXPECT_EQ(::transport_manager::E_SUCCESS, tm_.Visibility(false));
 }
 
 TEST_F(TransportManagerImplTest, StopTransportManager) {
   HandleDeviceListUpdated();
   EXPECT_CALL(*mock_adapter_, ConnectDevice(mac_address_))
       .WillRepeatedly(Return(TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.ConnectDevice(device_handle_));
+  EXPECT_EQ(E_SUCCESS, tm_.ConnectDevice(device_handle_));
 
   EXPECT_CALL(*mock_adapter_, DisconnectDevice(mac_address_))
       .WillRepeatedly(Return(TransportAdapter::OK));
 
   EXPECT_CALL(*mock_adapter_, Terminate());
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.Stop());
+  EXPECT_EQ(E_SUCCESS, tm_.Stop());
 }
 
 TEST_F(TransportManagerImplTest, Reinit) {
   EXPECT_CALL(*mock_adapter_, Terminate());
   EXPECT_CALL(*mock_adapter_, Init()).WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.Reinit());
+  EXPECT_EQ(E_SUCCESS, tm_.Reinit());
 }
 
 TEST_F(TransportManagerImplTest, Reinit_InitAdapterFailed) {
   EXPECT_CALL(*mock_adapter_, Terminate());
   EXPECT_CALL(*mock_adapter_, Init()).WillOnce(Return(TransportAdapter::FAIL));
-  EXPECT_EQ(E_ADAPTERS_FAIL, mock_transport_manager_.Reinit());
+  EXPECT_EQ(E_ADAPTERS_FAIL, tm_.Reinit());
 }
 
 TEST_F(TransportManagerImplTest, UpdateDeviceList_AddNewDevice) {
@@ -621,9 +623,9 @@ TEST_F(TransportManagerImplTest, UpdateDeviceList_AddNewDevice) {
       .WillOnce(Return(dev_info_.name()));
   EXPECT_CALL(*mock_adapter_, GetConnectionType())
       .WillOnce(Return(dev_info_.connection_type()));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceAdded(dev_info_));
+  EXPECT_CALL(*tm_listener_, OnDeviceAdded(dev_info_));
 
-  mock_transport_manager_.UpdateDeviceList(mock_adapter_);
+  tm_.UpdateDeviceList(mock_adapter_);
   device_list_.pop_back();
 }
 
@@ -636,14 +638,14 @@ TEST_F(TransportManagerImplTest, UpdateDeviceList_RemoveDevice) {
       .WillOnce(Return(dev_info_.connection_type()));
   EXPECT_CALL(*mock_adapter_, DeviceName(dev_info_.mac_address()))
       .WillOnce(Return(dev_info_.name()));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceAdded(dev_info_));
-  mock_transport_manager_.UpdateDeviceList(mock_adapter_);
+  EXPECT_CALL(*tm_listener_, OnDeviceAdded(dev_info_));
+  tm_.UpdateDeviceList(mock_adapter_);
   device_list_.pop_back();
 
   // Device list is empty now
   EXPECT_CALL(*mock_adapter_, GetDeviceList()).WillOnce(Return(device_list_));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceRemoved(dev_info_));
-  mock_transport_manager_.UpdateDeviceList(mock_adapter_);
+  EXPECT_CALL(*tm_listener_, OnDeviceRemoved(dev_info_));
+  tm_.UpdateDeviceList(mock_adapter_);
 }
 
 /*
@@ -660,39 +662,31 @@ TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_OnSearchDeviceDone) {
                                    test_message_,
                                    error_);
 
-  EXPECT_CALL(*mock_transport_manager_listener_, OnScanDevicesFinished());
+  EXPECT_CALL(*tm_listener_, OnScanDevicesFinished());
 
-  mock_transport_manager_.TestReceiveEventFromDevice(test_event);
-  testing::Mock::AsyncVerifyAndClearExpectations(10000);
+  tm_.ReceiveEventFromDevice(test_event);
+  testing::Mock::AsyncVerifyAndClearExpectations(1000);
 }
 
 TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_OnSearchDeviceFail) {
   const int type = static_cast<int>(
       TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_FAIL);
 
-  TransportAdapterEvent test_event(type,
-                                   mock_adapter_,
-                                   mac_address_,
-                                   application_id_,
-                                   test_message_,
-                                   error_);
+  TransportAdapterEvent test_event(type, mock_adapter_, mac_address_,
+                                   application_id_, test_message_, error_);
 
-  EXPECT_CALL(*mock_transport_manager_listener_, OnScanDevicesFailed(_));
+  EXPECT_CALL(*tm_listener_, OnScanDevicesFailed(_));
 
-  mock_transport_manager_.TestReceiveEventFromDevice(test_event);
-  testing::Mock::AsyncVerifyAndClearExpectations(10000);
+  tm_.ReceiveEventFromDevice(test_event);
+  testing::Mock::AsyncVerifyAndClearExpectations(1000);
 }
 
 TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_DeviceListUpdated) {
   const int type = static_cast<int>(
       TransportAdapterListenerImpl::EventTypeEnum::ON_DEVICE_LIST_UPDATED);
 
-  TransportAdapterEvent test_event(type,
-                                   mock_adapter_,
-                                   dev_info_.mac_address(),
-                                   application_id_,
-                                   test_message_,
-                                   error_);
+  TransportAdapterEvent test_event(type, mock_adapter_, dev_info_.mac_address(),
+                                   application_id_, test_message_, error_);
   device_list_.push_back(dev_info_.mac_address());
   std::vector<DeviceInfo> vector_dev_info;
   vector_dev_info.push_back(dev_info_);
@@ -707,13 +701,13 @@ TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_DeviceListUpdated) {
       .Times(AtLeast(1))
       .WillRepeatedly(Return(dev_info_.connection_type()));
 
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceFound(dev_info_));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceAdded(dev_info_));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceListUpdated(vector_dev_info));
+  EXPECT_CALL(*tm_listener_, OnDeviceFound(dev_info_));
+  EXPECT_CALL(*tm_listener_, OnDeviceAdded(dev_info_));
+  EXPECT_CALL(*tm_listener_, OnDeviceListUpdated(vector_dev_info));
 
-  mock_transport_manager_.TestReceiveEventFromDevice(test_event);
+  tm_.ReceiveEventFromDevice(test_event);
   device_list_.pop_back();
-  testing::Mock::AsyncVerifyAndClearExpectations(10000);
+  testing::Mock::AsyncVerifyAndClearExpectations(1000);
 }
 
 TEST_F(TransportManagerImplTest, CheckEvents) {
@@ -749,8 +743,8 @@ TEST_F(TransportManagerImplTest, CheckReceiveFailedEvent) {
   // Check before act
   HandleConnection();
   // Act and Assert
-  EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageReceiveFailed(_));
-  mock_transport_manager_.TestHandle(test_event);
+  EXPECT_CALL(*tm_listener_, OnTMMessageReceiveFailed(_));
+  tm_.TestHandle(test_event);
 }
 
 TEST_F(TransportManagerImplTest, CheckUnexpectedDisconnect) {
@@ -767,8 +761,8 @@ TEST_F(TransportManagerImplTest, CheckUnexpectedDisconnect) {
   // Check before act
   HandleConnection();
   // Act and Assert
-  EXPECT_CALL(*mock_transport_manager_listener_, OnUnexpectedDisconnect(connection_key_, _));
-  mock_transport_manager_.TestHandle(test_event);
+  EXPECT_CALL(*tm_listener_, OnUnexpectedDisconnect(connection_key_, _));
+  tm_.TestHandle(test_event);
 }
 
 TEST_F(TransportManagerImplTest, ConnectDevice_TMIsNotInitialized) {
@@ -776,7 +770,7 @@ TEST_F(TransportManagerImplTest, ConnectDevice_TMIsNotInitialized) {
   UninitializeTM();
   // Act and Assert
   EXPECT_CALL(*mock_adapter_, ConnectDevice(_)).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, mock_transport_manager_.ConnectDevice(device_handle_));
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.ConnectDevice(device_handle_));
 }
 
 TEST_F(TransportManagerImplTest, DisconnectDevice_TMIsNotInitialized) {
@@ -784,7 +778,7 @@ TEST_F(TransportManagerImplTest, DisconnectDevice_TMIsNotInitialized) {
   UninitializeTM();
   // Act and Assert
   EXPECT_CALL(*mock_adapter_, DisconnectDevice(_)).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, mock_transport_manager_.DisconnectDevice(device_handle_));
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.DisconnectDevice(device_handle_));
 }
 
 TEST_F(TransportManagerImplTest, Disconnect_TMIsNotInitialized) {
@@ -792,7 +786,7 @@ TEST_F(TransportManagerImplTest, Disconnect_TMIsNotInitialized) {
   UninitializeTM();
   // Act and Assert
   EXPECT_CALL(*mock_adapter_, Disconnect(_, _)).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, mock_transport_manager_.Disconnect(connection_key_));
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.Disconnect(connection_key_));
 }
 
 TEST_F(TransportManagerImplTest, DisconnectForce_TMIsNotInitialized) {
@@ -800,14 +794,14 @@ TEST_F(TransportManagerImplTest, DisconnectForce_TMIsNotInitialized) {
   UninitializeTM();
   // Act and Assert
   EXPECT_CALL(*mock_adapter_, Disconnect(_, _)).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, mock_transport_manager_.DisconnectForce(connection_key_));
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.DisconnectForce(connection_key_));
 }
 
 TEST_F(TransportManagerImplTest, DisconnectForce_ConnectionNotExist) {
   // SetUp does not add connections
   // Act and Assert
   EXPECT_CALL(*mock_adapter_, Disconnect(_, _)).Times(0);
-  EXPECT_EQ(E_INVALID_HANDLE, mock_transport_manager_.DisconnectForce(connection_key_));
+  EXPECT_EQ(E_INVALID_HANDLE, tm_.DisconnectForce(connection_key_));
 }
 
 TEST_F(TransportManagerImplTest, Stop_TMIsNotInitialized) {
@@ -816,7 +810,7 @@ TEST_F(TransportManagerImplTest, Stop_TMIsNotInitialized) {
   // Act and Assert
   EXPECT_CALL(*mock_adapter_, DisconnectDevice(_)).Times(0);
   EXPECT_CALL(*mock_adapter_, Terminate()).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, mock_transport_manager_.Stop());
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.Stop());
 }
 
 TEST_F(TransportManagerImplTest, SendMessageToDevice_TMIsNotInitialized) {
@@ -824,16 +818,16 @@ TEST_F(TransportManagerImplTest, SendMessageToDevice_TMIsNotInitialized) {
   UninitializeTM();
   // Act and Assert
   EXPECT_CALL(*mock_adapter_, SendData(_, _, _)).Times(0);
-  EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageSendFailed(_, _)).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, mock_transport_manager_.SendMessageToDevice(test_message_));
+  EXPECT_CALL(*tm_listener_, OnTMMessageSendFailed(_, _)).Times(0);
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.SendMessageToDevice(test_message_));
 }
 
 TEST_F(TransportManagerImplTest, SendMessageToDevice_ConnectionNotExist) {
   // SetUp does not add connections
   // Act and Assert
   EXPECT_CALL(*mock_adapter_, SendData(_, _, _)).Times(0);
-  EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageSendFailed(_, _)).Times(0);
-  EXPECT_EQ(E_INVALID_HANDLE, mock_transport_manager_.SendMessageToDevice(test_message_));
+  EXPECT_CALL(*tm_listener_, OnTMMessageSendFailed(_, _)).Times(0);
+  EXPECT_EQ(E_INVALID_HANDLE, tm_.SendMessageToDevice(test_message_));
 }
 
 TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_TMIsNotInitialized) {
@@ -845,15 +839,15 @@ TEST_F(TransportManagerImplTest, ReceiveEventFromDevice_TMIsNotInitialized) {
   // Check before Act
   UninitializeTM();
   // Act and Assert
-  EXPECT_CALL(*mock_transport_manager_listener_, OnScanDevicesFinished()).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, mock_transport_manager_.ReceiveEventFromDevice(test_event));
+  EXPECT_CALL(*tm_listener_, OnScanDevicesFinished()).Times(0);
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.ReceiveEventFromDevice(test_event));
 }
 
 TEST_F(TransportManagerImplTest, RemoveDevice_TMIsNotInitialized) {
   // Check before Act
   UninitializeTM();
   // Act and Assert
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, mock_transport_manager_.RemoveDevice(device_handle_));
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.RemoveDevice(device_handle_));
 }
 
 TEST_F(TransportManagerImplTest, Visibility_TMIsNotInitialized) {
@@ -863,16 +857,16 @@ TEST_F(TransportManagerImplTest, Visibility_TMIsNotInitialized) {
   UninitializeTM();
   // Act and Assert
   EXPECT_CALL(*mock_adapter_, StartClientListening()).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, mock_transport_manager_.Visibility(visible));
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.Visibility(visible));
 }
 
 TEST_F(TransportManagerImplTest, HandleMessage_ConnectionNotExist) {
   EXPECT_CALL(*mock_adapter_,
               SendData(mac_address_, application_id_, test_message_)).Times(0);
-  EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageSendFailed(_, test_message_));
+  EXPECT_CALL(*tm_listener_, OnTMMessageSendFailed(_, test_message_));
 
-  mock_transport_manager_.TestHandle(test_message_);
-  testing::Mock::AsyncVerifyAndClearExpectations(10000);
+  tm_.TestHandle(test_message_);
+  testing::Mock::AsyncVerifyAndClearExpectations(1000);
 }
 
 TEST_F(TransportManagerImplTest, SearchDevices_TMIsNotInitialized) {
@@ -880,31 +874,31 @@ TEST_F(TransportManagerImplTest, SearchDevices_TMIsNotInitialized) {
   UninitializeTM();
   // Act and Assert
   EXPECT_CALL(*mock_adapter_, SearchDevices()).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, mock_transport_manager_.SearchDevices());
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.SearchDevices());
 }
 
 TEST_F(TransportManagerImplTest, SetVisibilityOn_TransportAdapterNotSupported) {
   EXPECT_CALL(*mock_adapter_, StartClientListening())
       .WillOnce(Return(TransportAdapter::NOT_SUPPORTED));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.Visibility(true));
+  EXPECT_EQ(E_SUCCESS, tm_.Visibility(true));
 }
 
 TEST_F(TransportManagerImplTest,
        SetVisibilityOff_TransportAdapterNotSupported) {
   EXPECT_CALL(*mock_adapter_, StopClientListening())
       .WillOnce(Return(TransportAdapter::NOT_SUPPORTED));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.Visibility(false));
+  EXPECT_EQ(E_SUCCESS, tm_.Visibility(false));
 }
 
 TEST_F(TransportManagerImplTest,
        UpdateDeviceList_AddDevices_TwoTransportAdapters) {
   // Arrange
-  TransportAdapterMock* second_mock_adapter = new TransportAdapterMock();
+  MockTransportAdapter* second_mock_adapter = new MockTransportAdapter();
   device_list_.push_back(dev_info_.mac_address());
   // Check before Act
   EXPECT_CALL(*second_mock_adapter, AddListener(_));
   EXPECT_CALL(*second_mock_adapter, IsInitialised()).WillOnce(Return(true));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.AddTransportAdapter(second_mock_adapter));
+  EXPECT_EQ(E_SUCCESS, tm_.AddTransportAdapter(second_mock_adapter));
 
   // Act and Assert
   EXPECT_CALL(*second_mock_adapter, GetDeviceList())
@@ -913,16 +907,16 @@ TEST_F(TransportManagerImplTest,
       .WillOnce(Return(dev_info_.name()));
   EXPECT_CALL(*second_mock_adapter, GetConnectionType())
       .WillOnce(Return(dev_info_.connection_type()));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceAdded(dev_info_));
-  mock_transport_manager_.UpdateDeviceList(second_mock_adapter);
+  EXPECT_CALL(*tm_listener_, OnDeviceAdded(dev_info_));
+  tm_.UpdateDeviceList(second_mock_adapter);
 
   EXPECT_CALL(*mock_adapter_, GetDeviceList()).WillOnce(Return(device_list_));
   EXPECT_CALL(*mock_adapter_, DeviceName(dev_info_.mac_address()))
       .WillOnce(Return(dev_info_.name()));
   EXPECT_CALL(*mock_adapter_, GetConnectionType())
       .WillOnce(Return(dev_info_.connection_type()));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceAdded(dev_info_));
-  mock_transport_manager_.UpdateDeviceList(mock_adapter_);
+  EXPECT_CALL(*tm_listener_, OnDeviceAdded(dev_info_));
+  tm_.UpdateDeviceList(mock_adapter_);
 
   device_list_.pop_back();
 }
@@ -930,12 +924,12 @@ TEST_F(TransportManagerImplTest,
 TEST_F(TransportManagerImplTest,
        UpdateDeviceList_RemoveDevices_TwoTransportAdapters) {
   // Arrange
-  TransportAdapterMock* second_mock_adapter = new TransportAdapterMock();
+  MockTransportAdapter* second_mock_adapter = new MockTransportAdapter();
   device_list_.push_back(dev_info_.mac_address());
   // Check before Act
   EXPECT_CALL(*second_mock_adapter, AddListener(_));
   EXPECT_CALL(*second_mock_adapter, IsInitialised()).WillOnce(Return(true));
-  EXPECT_EQ(E_SUCCESS, mock_transport_manager_.AddTransportAdapter(second_mock_adapter));
+  EXPECT_EQ(E_SUCCESS, tm_.AddTransportAdapter(second_mock_adapter));
 
   // Act and Assert
   EXPECT_CALL(*second_mock_adapter, GetDeviceList())
@@ -944,27 +938,27 @@ TEST_F(TransportManagerImplTest,
       .WillOnce(Return(dev_info_.name()));
   EXPECT_CALL(*second_mock_adapter, GetConnectionType())
       .WillOnce(Return(dev_info_.connection_type()));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceAdded(dev_info_));
-  mock_transport_manager_.UpdateDeviceList(second_mock_adapter);
+  EXPECT_CALL(*tm_listener_, OnDeviceAdded(dev_info_));
+  tm_.UpdateDeviceList(second_mock_adapter);
 
   EXPECT_CALL(*mock_adapter_, GetDeviceList()).WillOnce(Return(device_list_));
   EXPECT_CALL(*mock_adapter_, DeviceName(dev_info_.mac_address()))
       .WillOnce(Return(dev_info_.name()));
   EXPECT_CALL(*mock_adapter_, GetConnectionType())
       .WillOnce(Return(dev_info_.connection_type()));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceAdded(dev_info_));
-  mock_transport_manager_.UpdateDeviceList(mock_adapter_);
+  EXPECT_CALL(*tm_listener_, OnDeviceAdded(dev_info_));
+  tm_.UpdateDeviceList(mock_adapter_);
 
   device_list_.pop_back();
 
   EXPECT_CALL(*second_mock_adapter, GetDeviceList())
       .WillOnce(Return(device_list_));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceRemoved(dev_info_));
-  mock_transport_manager_.UpdateDeviceList(second_mock_adapter);
+  EXPECT_CALL(*tm_listener_, OnDeviceRemoved(dev_info_));
+  tm_.UpdateDeviceList(second_mock_adapter);
 
   EXPECT_CALL(*mock_adapter_, GetDeviceList()).WillOnce(Return(device_list_));
-  EXPECT_CALL(*mock_transport_manager_listener_, OnDeviceRemoved(dev_info_));
-  mock_transport_manager_.UpdateDeviceList(mock_adapter_);
+  EXPECT_CALL(*tm_listener_, OnDeviceRemoved(dev_info_));
+  tm_.UpdateDeviceList(mock_adapter_);
 }
 
 TEST_F(TransportManagerImplTest,
@@ -982,9 +976,9 @@ TEST_F(TransportManagerImplTest,
                                    error_);
 
   // Act and Assert
-  EXPECT_CALL(*mock_transport_manager_listener_, OnConnectionClosed(_)).Times(0);
+  EXPECT_CALL(*tm_listener_, OnConnectionClosed(_)).Times(0);
 
-  mock_transport_manager_.TestHandle(test_event);
+  tm_.TestHandle(test_event);
 }
 
 TEST_F(TransportManagerImplTest, CheckEventOnSendDone_ConnectionNotExist) {
@@ -1003,9 +997,9 @@ TEST_F(TransportManagerImplTest, CheckEventOnSendDone_ConnectionNotExist) {
   // Act and Assert
   EXPECT_CALL(mock_metric_observer_, StopRawMsg(_));
 #endif  // TELEMETRY_MONITOR
-  EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageSend(_)).Times(0);
+  EXPECT_CALL(*tm_listener_, OnTMMessageSend(_)).Times(0);
 
-  mock_transport_manager_.TestHandle(test_event);
+  tm_.TestHandle(test_event);
 }
 
 TEST_F(TransportManagerImplTest, CheckEventOnReceivedDone_ConnectionNotExist) {
@@ -1023,8 +1017,8 @@ TEST_F(TransportManagerImplTest, CheckEventOnReceivedDone_ConnectionNotExist) {
   // Act and Assert
   EXPECT_CALL(mock_metric_observer_, StopRawMsg(_)).Times(0);
 #endif  // TELEMETRY_MONITOR
-  EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageReceived(_)).Times(0);
-  mock_transport_manager_.TestHandle(test_event);
+  EXPECT_CALL(*tm_listener_, OnTMMessageReceived(_)).Times(0);
+  tm_.TestHandle(test_event);
 }
 
 TEST_F(TransportManagerImplTest, CheckEventOnReceivedFail_ConnectionNotExist) {
@@ -1039,8 +1033,8 @@ TEST_F(TransportManagerImplTest, CheckEventOnReceivedFail_ConnectionNotExist) {
                                    test_message_,
                                    error_);
   // Act and Assert
-  EXPECT_CALL(*mock_transport_manager_listener_, OnTMMessageReceiveFailed(_)).Times(0);
-  mock_transport_manager_.TestHandle(test_event);
+  EXPECT_CALL(*tm_listener_, OnTMMessageReceiveFailed(_)).Times(0);
+  tm_.TestHandle(test_event);
 }
 
 TEST_F(TransportManagerImplTest,
@@ -1056,8 +1050,8 @@ TEST_F(TransportManagerImplTest,
                                    test_message_,
                                    error_);
   // Act and Assert
-  EXPECT_CALL(*mock_transport_manager_listener_, OnUnexpectedDisconnect(_, _)).Times(0);
-  mock_transport_manager_.TestHandle(test_event);
+  EXPECT_CALL(*tm_listener_, OnUnexpectedDisconnect(_, _)).Times(0);
+  tm_.TestHandle(test_event);
 }
 
 }  // namespace transport_manager_test
diff --git a/src/components/transport_manager/test/transport_manager_instance_test.cc b/src/components/transport_manager/test/transport_manager_instance_test.cc
deleted file mode 100644
index b5a251ba5e..0000000000
--- a/src/components/transport_manager/test/transport_manager_instance_test.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2014, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
-    Tests transport manager functionality with single device adapter that behaves correctly and single client
-    Following sequence is tested:
-        - TM created and runned
-        - TM client registered as listener
-        - TM client requests device scaning
-        - single device was returned to TM client with onDeviceListUpdated callback
-        - TM client calls "connect" on found device
-        - device adapter sends onApplicationConnected
-        - TM client receives onApplicationConnected
-        - device adapter sends three data parts that represents single frame
-        - TM client receives single frame with onFrameReceived callback
-        - TM client calls sendFrame with some frame data and user data
-        - TM client receives onFrameSendCompleted
-        - TM client calls DisconnectDevice
-        - TM client receives onApplicationDisconnected
- */
-
-#include <stddef.h>
-#include <stdio.h>
-
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
-#include "../../include/transport_manager/transport_manager.h"
-#include "../include/transport_manager/transport_adapter/transport_adapter.h"
-#include "../include/transport_manager/common.h"
-#include "../include/transport_manager/transport_manager_impl.h"
-#include "../include/transport_manager/transport_manager_default.h"
-#include "../../connection_handler/include/connection_handler/connection_handler.h"
-
-
-namespace test{
-namespace test_transport_manager_instance {
-TEST(test_transport_manager_instance, test_transport_manager_instance)
-{
-  transport_manager::TransportManager *Instance = transport_manager::TransportManagerDefault::instance();
-  ASSERT_EQ(Instance, transport_manager::TransportManagerDefault::instance());
-}
-
-}}