diff --git a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_audio_sender_engine_test.cpp b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_audio_sender_engine_test.cpp
index 78fe2f499e0aed08f4b89849dbd7aed96c682444..bb5774939e5512e0531e3f6e7a08c3c6714ce7d8 100644
--- a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_audio_sender_engine_test.cpp
+++ b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_audio_sender_engine_test.cpp
@@ -148,11 +148,10 @@ HWTEST_F(AvAudioSenderEngineTest, Start_002, testing::ext::TestSize.Level1)
     std::string ownerName = "001";
     std::string peerDevId = "pEid";
     auto sender = std::make_shared<AVAudioSenderEngine>(ownerName, peerDevId);
-    sender->currentState_ = StateId::CH_CREATED;
-    sender->pipeline_ = std::make_shared<Pipeline::Pipeline>();
+    sender->currentState_ = StateId::IDLE;
+    sender->pipeline_ = nullptr;
     int32_t ret = sender->Start();
-    sender->Stop();
-    EXPECT_EQ(DH_AVT_SUCCESS, ret);
+    EXPECT_EQ(ERR_DH_AVT_START_FAILED, ret);
 }
 
 HWTEST_F(AvAudioSenderEngineTest, Start_003, testing::ext::TestSize.Level1)
@@ -162,7 +161,7 @@ HWTEST_F(AvAudioSenderEngineTest, Start_003, testing::ext::TestSize.Level1)
     auto sender = std::make_shared<AVAudioSenderEngine>(ownerName, peerDevId);
     sender->currentState_ = StateId::CH_CREATED;
     sender->pipeline_ = std::make_shared<Pipeline::Pipeline>();
-    sender->dhFwkKit_ = std::make_shared<DistributedHardwareFwkKit>();
+    sender->dhFwkKit_ = nullptr;
     int32_t ret = sender->Start();
     sender->Stop();
     EXPECT_EQ(DH_AVT_SUCCESS, ret);
@@ -173,10 +172,12 @@ HWTEST_F(AvAudioSenderEngineTest, Start_004, testing::ext::TestSize.Level1)
     std::string ownerName = "001";
     std::string peerDevId = "pEid";
     auto sender = std::make_shared<AVAudioSenderEngine>(ownerName, peerDevId);
-    sender->currentState_ = StateId::IDLE;
-    sender->pipeline_ = nullptr;
+    sender->currentState_ = StateId::CH_CREATED;
+    sender->pipeline_ = std::make_shared<Pipeline::Pipeline>();
+    sender->dhFwkKit_ = std::make_shared<DistributedHardwareFwkKit>();
     int32_t ret = sender->Start();
-    EXPECT_EQ(ERR_DH_AVT_START_FAILED, ret);
+    sender->Stop();
+    EXPECT_EQ(ERR_DH_AVT_CREATE_CHANNEL_FAILED, ret);
 }
 
 HWTEST_F(AvAudioSenderEngineTest, Stop_001, testing::ext::TestSize.Level1)
diff --git a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_sender_engine_test.cpp b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_sender_engine_test.cpp
index 4c746afd0d0456cad12baac23ed82c71ea0ab188..9de8c94ebc33b7ba9ce97ced5eeb195c4b8876bc 100644
--- a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_sender_engine_test.cpp
+++ b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_sender_engine_test.cpp
@@ -162,10 +162,10 @@ HWTEST_F(AvSenderEngineTest, Start_002, testing::ext::TestSize.Level1)
     std::string peerDevId = "pEid";
     auto sender = std::make_shared<AVSenderEngine>(ownerName, peerDevId);
     sender->currentState_ = StateId::CH_CREATED;
-    sender->pipeline_ = std::make_shared<OHOS::Media::Pipeline::PipelineCore>();
+    sender->pipeline_ = nullptr;
     int32_t ret = sender->Start();
     sender->Stop();
-    EXPECT_EQ(DH_AVT_SUCCESS, ret);
+    EXPECT_EQ(ERR_DH_AVT_START_FAILED, ret);
 }
 
 HWTEST_F(AvSenderEngineTest, Start_003, testing::ext::TestSize.Level1)
@@ -175,7 +175,7 @@ HWTEST_F(AvSenderEngineTest, Start_003, testing::ext::TestSize.Level1)
     auto sender = std::make_shared<AVSenderEngine>(ownerName, peerDevId);
     sender->currentState_ = StateId::CH_CREATED;
     sender->pipeline_ = std::make_shared<OHOS::Media::Pipeline::PipelineCore>();
-    sender->dhFwkKit_ = std::make_shared<DistributedHardwareFwkKit>();
+    sender->dhFwkKit_ = nullptr;
     int32_t ret = sender->Start();
     sender->Stop();
     EXPECT_EQ(DH_AVT_SUCCESS, ret);
@@ -187,10 +187,11 @@ HWTEST_F(AvSenderEngineTest, Start_004, testing::ext::TestSize.Level1)
     std::string peerDevId = "pEid";
     auto sender = std::make_shared<AVSenderEngine>(ownerName, peerDevId);
     sender->currentState_ = StateId::CH_CREATED;
-    sender->pipeline_ = nullptr;
+    sender->pipeline_ = std::make_shared<OHOS::Media::Pipeline::PipelineCore>();
+    sender->dhFwkKit_ = std::make_shared<DistributedHardwareFwkKit>();
     int32_t ret = sender->Start();
     sender->Stop();
-    EXPECT_EQ(ERR_DH_AVT_START_FAILED, ret);
+    EXPECT_EQ(ERR_DH_AVT_CREATE_CHANNEL_FAILED, ret);
 }
 
 HWTEST_F(AvSenderEngineTest, Stop_001, testing::ext::TestSize.Level1)
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp
index a202349415aeee9c1c1f8603ec0f7137186d103c..a1734f0a1ae608cee3df5c0e6385ea4542cd81cc 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp
@@ -1082,32 +1082,52 @@ HWTEST_F(ComponentManagerTest, UpdateBusinessState_003, TestSize.Level1)
 
 HWTEST_F(ComponentManagerTest, GetDHSubtypeByDHId_001, TestSize.Level1)
 {
-    std::string peeruuid = "123456789";
     std::string dhid = "audio_132";
-    std::string deviceId = Sha256(peeruuid);
     DHSubtype dhSubtype;
+    auto ret = ComponentManager::GetInstance().GetDHSubtypeByDHId(dhSubtype, NETWORK_TEST, dhid);
+    EXPECT_EQ(ret, ERR_DH_FWK_BAD_OPERATION);
+
+    std::string deviceId = Sha256(UUID_TEST);
+    DHContext::GetInstance().AddOnlineDevice(UDID_TEST, UUID_TEST, NETWORK_TEST);
+    std::shared_ptr<CapabilityInfo> capInfo = std::make_shared<CapabilityInfo>(
+        dhid, deviceId, "devName_test", DEV_TYPE_TEST, DHType::AUDIO, "attrs", "");
+    std::string key = deviceId + "###" + dhid;
+    LocalCapabilityInfoManager::GetInstance()->globalCapInfoMap_[key] = capInfo;
+    ret = ComponentManager::GetInstance().GetDHSubtypeByDHId(dhSubtype, NETWORK_TEST, dhid);
+    EXPECT_EQ(ret, ERR_DH_FWK_BAD_OPERATION);
+    DHContext::GetInstance().devIdEntrySet_.clear();
+}
+
+HWTEST_F(ComponentManagerTest, GetDHSubtypeByDHId_002, TestSize.Level1)
+{
+    DHSubtype dhSubtype;
+    std::string dhid = "camera_132";
+    std::string deviceId = Sha256(UUID_TEST);
+    DHContext::GetInstance().AddOnlineDevice(UDID_TEST, UUID_TEST, NETWORK_TEST);
+
     std::shared_ptr<CapabilityInfo> capInfo1 = std::make_shared<CapabilityInfo>(
         dhid, deviceId, "devName_test", DEV_TYPE_TEST, DHType::AUDIO, "attrs", "mic");
     std::string key = deviceId + "###" + dhid;
     LocalCapabilityInfoManager::GetInstance()->globalCapInfoMap_[key] = capInfo1;
-    auto ret = ComponentManager::GetInstance().GetDHSubtypeByDHId(dhSubtype, deviceId, dhid);
-    EXPECT_EQ(DHSubtype::AUDIO_MIC, dhSubtype);
+    auto ret = ComponentManager::GetInstance().GetDHSubtypeByDHId(dhSubtype, NETWORK_TEST, dhid);
     EXPECT_EQ(ret, DH_FWK_SUCCESS);
-    dhid = "camera_132";
+
     std::shared_ptr<CapabilityInfo> capInfo2 = std::make_shared<CapabilityInfo>(
         dhid, deviceId, "devName_test", DEV_TYPE_TEST, DHType::CAMERA, "attrs", "camera");
     key = deviceId + "###" + dhid;
     LocalCapabilityInfoManager::GetInstance()->globalCapInfoMap_[key] = capInfo2;
-    ret = ComponentManager::GetInstance().GetDHSubtypeByDHId(dhSubtype, deviceId, dhid);
-    EXPECT_EQ(DHSubtype::CAMERA, dhSubtype);
+    ret = ComponentManager::GetInstance().GetDHSubtypeByDHId(dhSubtype, NETWORK_TEST, dhid);
     EXPECT_EQ(ret, DH_FWK_SUCCESS);
+
     dhid = "unknown_132";
     std::shared_ptr<CapabilityInfo> capInfo3 = std::make_shared<CapabilityInfo>(
         dhid, deviceId, "devName_test", DEV_TYPE_TEST, DHType::UNKNOWN, "attrs", "unknown");
     key = deviceId + "###" + dhid;
     LocalCapabilityInfoManager::GetInstance()->globalCapInfoMap_[key] = capInfo3;
-    ret = ComponentManager::GetInstance().GetDHSubtypeByDHId(dhSubtype, deviceId, dhid);
+    ret = ComponentManager::GetInstance().GetDHSubtypeByDHId(dhSubtype, NETWORK_TEST, dhid);
     EXPECT_EQ(ret, ERR_DH_FWK_BAD_OPERATION);
+    LocalCapabilityInfoManager::GetInstance()->globalCapInfoMap_.clear();
+    DHContext::GetInstance().devIdEntrySet_.clear();
 }
 
 HWTEST_F(ComponentManagerTest, InitAVSyncSharedMemory_001, TestSize.Level1)
@@ -1123,17 +1143,20 @@ HWTEST_F(ComponentManagerTest, DeinitAVSyncSharedMemory_001, TestSize.Level1)
 
 HWTEST_F(ComponentManagerTest, GetDHIdByDHSubtype_001, TestSize.Level1)
 {
-    std::string peeruuid = "123456789";
+    std::string networkId = "networkId_123456";
     std::string dhid = "audio_132";
-    std::string deviceId = Sha256(peeruuid);
+    std::string deviceId = Sha256(UUID_TEST);
     std::shared_ptr<CapabilityInfo> capInfo1 = std::make_shared<CapabilityInfo>(
         dhid, deviceId, "devName_test", DEV_TYPE_TEST, DHType::AUDIO, "attrs", "mic");
     std::string key = deviceId + "###" + dhid;
     BusinessState state = BusinessState::IDLE;
     LocalCapabilityInfoManager::GetInstance()->globalCapInfoMap_[key] = capInfo1;
-    ComponentManager::GetInstance().dhBizStates_.emplace(std::make_pair(deviceId, dhid), state);
-    auto ret = ComponentManager::GetInstance().GetDHIdByDHSubtype(DHSubtype::AUDIO_MIC, deviceId, dhid);
+    ComponentManager::GetInstance().dhBizStates_.emplace(std::make_pair(networkId, dhid), state);
+    DHContext::GetInstance().AddOnlineDevice(UDID_TEST, UUID_TEST, networkId);
+    auto ret = ComponentManager::GetInstance().GetDHIdByDHSubtype(DHSubtype::AUDIO_MIC, networkId, dhid);
     EXPECT_EQ(ret, DH_FWK_SUCCESS);
+
+    deviceId = "deviceId_test";
     ret = ComponentManager::GetInstance().GetDHIdByDHSubtype(DHSubtype::CAMERA, deviceId, dhid);
     EXPECT_EQ(ret, ERR_DH_FWK_BAD_OPERATION);
 }
@@ -1315,11 +1338,14 @@ HWTEST_F(ComponentManagerTest, QueryBusinessState_001, TestSize.Level1)
 
 HWTEST_F(ComponentManagerTest, QueryBusinessState_002, TestSize.Level1)
 {
-    BusinessState ret = ComponentManager::GetInstance().QueryBusinessState(NETWORK_TEST, DH_ID_TEST);
+    std::string uuid = "uuid_123";
+    std::string dhId = "camera_1";
+    ComponentManager::GetInstance().dhBizStates_.emplace(std::make_pair(uuid, dhId), BusinessState::IDLE);
+    BusinessState ret = ComponentManager::GetInstance().QueryBusinessState(uuid, dhId);
     EXPECT_EQ(BusinessState::IDLE, ret);
 
     ComponentManager::GetInstance().dhBizStates_.clear();
-    ret = ComponentManager::GetInstance().QueryBusinessState(NETWORK_TEST, DH_ID_TEST);
+    ret = ComponentManager::GetInstance().QueryBusinessState(uuid, dhId);
     EXPECT_EQ(BusinessState::UNKNOWN, ret);
 }