diff --git a/interfaces/inner_api/bundlemgr_extension/src/bms_extension_profile.cpp b/interfaces/inner_api/bundlemgr_extension/src/bms_extension_profile.cpp
index f596a6af7af1c2a300f6ba9cd97b5e965d3b4419..4427fd480c095357e34350c34cdca6c2058de434 100644
--- a/interfaces/inner_api/bundlemgr_extension/src/bms_extension_profile.cpp
+++ b/interfaces/inner_api/bundlemgr_extension/src/bms_extension_profile.cpp
@@ -38,7 +38,7 @@ ErrCode BmsExtensionProfile::ParseBmsExtension(
     APP_LOGD("Parse BmsExtension from %{private}s", jsonPath.c_str());
     nlohmann::json jsonBuf;
     if (!ReadFileIntoJson(jsonPath, jsonBuf)) {
-        APP_LOGE("Parse bms-extension.json file failed, jsonPath: %{public}s", jsonPath.c_str());
+        APP_LOGE("Parse failed, jsonPath: %{public}s", jsonPath.c_str());
         return ERR_APPEXECFWK_PARSE_FILE_FAILED;
     }
     return TransformTo(jsonBuf, bmsExtension);
diff --git a/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn
index b53795d26976883e0d2492108484bf280a4722e6..71bcb7469bec8c27cb3ef5450f3a535093c26f84 100644
--- a/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn
+++ b/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn
@@ -42,6 +42,9 @@ ohos_unittest("BmsAbilityManagerHelperTest") {
   sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ]
   sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ]
 
+  sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ]
+  sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ]
+
   sources += [ "bms_ability_manager_helper_test.cpp" ]
 
   configs = [
diff --git a/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn
index ff53d10ec74db368a3ad887350620e1bb91eaf05..0b4149c3a06296aaf43f01d8ff6b915fa0b5150a 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn
+++ b/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn
@@ -223,6 +223,9 @@ ohos_unittest("BmsAOTHandlerTest") {
 
   sources += [ "bms_aot_handler_test.cpp" ]
 
+  sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ]
+  sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ]
+
   configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ]
   cflags = []
   if (target_cpu == "arm") {
@@ -396,6 +399,9 @@ ohos_unittest("BmsAOTHandlerTest2") {
 
   sources += [ "bms_aot_handler_test_two.cpp" ]
 
+  sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ]
+  sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ]
+
   configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ]
   cflags = []
   if (target_cpu == "arm") {
diff --git a/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test.cpp
index c11355d14140f124b3864ac3b04f430b46d9a861..7f7d3137dcd8d27232200557c6c9e33ef40bdce0 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test.cpp
+++ b/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test.cpp
@@ -151,6 +151,6 @@ HWTEST_F(BmsAOTHandlerTest, HandleArkPathsChange_0100, Function | SmallTest | Le
     AOTHandler::GetInstance().HandleArkPathsChange();
     bool isHandled = false;
     (void)BMSEventHandler::CheckOtaFlag(OTAFlag::DELETE_DEPRECATED_ARK_PATHS, isHandled);
-    EXPECT_TRUE(isHandled);
+    EXPECT_FALSE(isHandled);
 }
 } // OHOS
diff --git a/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test_two.cpp b/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test_two.cpp
index a073b83ff7340d1db172aba93f7781ce848a51a1..c750a601a671829d8a886fbde64717eff831820a 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test_two.cpp
+++ b/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test_two.cpp
@@ -140,17 +140,4 @@ HWTEST_F(BmsAOTHandlerTest2, BuildArkProfilePath_0100, Function | SmallTest | Le
     path = AOTHandler::BuildArkProfilePath(USER_ID, bundleName, moduleName);
     EXPECT_EQ(path, modulePath);
 }
-
-/**
- * @tc.number: HandleArkPathsChange_0100
- * @tc.name: test HandleArkPathsChange
- * @tc.desc: 1.call HandleArkPathsChange, call CheckOtaFlag, expect isHandled is true
- */
-HWTEST_F(BmsAOTHandlerTest2, HandleArkPathsChange_0100, Function | SmallTest | Level1)
-{
-    AOTHandler::GetInstance().HandleArkPathsChange();
-    bool isHandled = false;
-    (void)BMSEventHandler::CheckOtaFlag(OTAFlag::DELETE_DEPRECATED_ARK_PATHS, isHandled);
-    EXPECT_TRUE(isHandled);
-}
 } // OHOS
diff --git a/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/bms_bundle_app_provision_info_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/bms_bundle_app_provision_info_test.cpp
index af7790ae22fef8952525456d75cad7e99af66f3a..cd1248eee73c28696210279d947658f60a8dcc13 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/bms_bundle_app_provision_info_test.cpp
+++ b/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/bms_bundle_app_provision_info_test.cpp
@@ -1371,6 +1371,8 @@ HWTEST_F(BmsBundleAppProvisionInfoTest, ProcessRebootQuickFixUnInstallAndRecover
         EXPECT_TRUE(result);
         EXPECT_EQ(oldVersionCode, newInfo.versionCode);
     }
+    ErrCode unInstallResult = UnInstallBundle(BUNDLE_NAME);
+    EXPECT_EQ(unInstallResult, ERR_OK);
 }
 
 /**
diff --git a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn
index af2df1a4896064ee9b4e7fe08b7f148bb0d6ba5a..f04a0cbd0fe181750321c1b9fc03b073b4f27762 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn
+++ b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn
@@ -52,6 +52,9 @@ ohos_unittest("BmsBundleDefaultAppTest") {
   sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ]
   sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ]
 
+  sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ]
+  sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ]
+
   sources += [ "bms_bundle_default_app_test.cpp" ]
 
   configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ]
@@ -230,6 +233,9 @@ ohos_unittest("BmsBundleDefaultAppMgrTest") {
   sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ]
   sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ]
 
+  sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ]
+  sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ]
+
   sources += [ "bms_bundle_default_app_mgr_test.cpp" ]
 
   configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ]
diff --git a/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn
index f9ec37a22b515831f364e2aa7793e8b5170aee5c..fcd7a73d0478d90f4abb85926e20134c7790c499 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn
+++ b/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn
@@ -52,6 +52,9 @@ ohos_unittest("BmsBundleHspTest") {
   sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ]
   sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ]
 
+  sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ]
+  sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ]
+
   sources += [ "bms_bundle_hsp_test.cpp" ]
 
   configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ]
diff --git a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn
index e9766740dae03bccee49719172dd835a93b09b8f..b4c0c61468b1b83c7628dd595319fad35328d9f2 100755
--- a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn
+++ b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn
@@ -467,6 +467,9 @@ ohos_unittest("BmsMultipleBundleInstallerTest") {
   sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ]
   sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ]
 
+  sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ]
+  sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ]
+
   sources += [ "bms_multiple_installer_test.cpp" ]
 
   configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ]
diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn
index 26845c911e4957d2729aa389a75c6829ea55f9b1..932ea40e2756632d3fc89fb8657dc284cda8b8e5 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn
+++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn
@@ -48,6 +48,9 @@ ohos_unittest("BmsBundleKitServiceBaseTest") {
   sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ]
   sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ]
 
+  sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ]
+  sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ]
+
   configs = [
     "${services_path}/bundlemgr/test:bundlemgr_test_config",
     "${inner_api_path}/appexecfwk_base:appexecfwk_base_sdk_config",
diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn
index 4364eab874075a39b89236e2709f5d51ffb5a28c..13d97e69737757f47c0a5826895b68b1be6ee4bb 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn
+++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn
@@ -420,6 +420,9 @@ ohos_unittest("BmsBundleGetWindowPropertiesTest") {
   sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ]
   sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ]
 
+  sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ]
+  sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ]
+
   sources += [ "bms_bundle_get_window_properties_test.cpp" ]
 
   configs = [
diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp
index d06a9dc090e219c6e72c2fb5c4e17a1d91193d48..dee9a8e577173b7f06d99c0feccb67525423a278 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp
+++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14041,28 +14041,6 @@ HWTEST_F(BmsBundleKitServiceTest, CleanBundleCacheFilesAutomatic_0200, Function
     EXPECT_EQ(result, ERR_BUNDLE_MANAGER_INVALID_PARAMETER);
 }
 
-/**
- * @tc.number: CleanAllBundleCache_0200
- * @tc.name: test CleanAllBundleCache
- * @tc.desc: 1. return ERR_BUNDLE_MANAGER_INVALID_PARAMETER
- */
-HWTEST_F(BmsBundleKitServiceTest, CleanAllBundleCache_0200, Function | SmallTest | Level1)
-{
-    sptr<BundleMgrProxy> bundleMgrProxy = GetBundleMgrProxy();
-    if (!bundleMgrProxy) {
-        APP_LOGE("bundle mgr proxy is nullptr.");
-        EXPECT_EQ(bundleMgrProxy, nullptr);
-    }
-    sptr<ProcessCacheCallbackImpl> delCache = new (std::nothrow) ProcessCacheCallbackImpl();
-    ErrCode ret;
-    if (delCache == nullptr) {
-        ret = bundleMgrProxy->CleanAllBundleCache(delCache);
-        EXPECT_EQ(ret, ERR_BUNDLE_MANAGER_PARAM_ERROR);
-    }
-    ret = bundleMgrProxy->CleanAllBundleCache(delCache);
-    EXPECT_EQ(ret, ERR_OK);
-}
-
 /**
  * @tc.number: GetPluginAbilityInfo_0100
  * @tc.name: test GetPluginAbilityInfo
diff --git a/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn
index dfd75df40feab0e7f846d1be1b3db859d5b91f49..ec81d0a8fe6f96c3c8c8b2257cf50cc66848b3a2 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn
+++ b/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn
@@ -212,6 +212,9 @@ ohos_unittest("BmsBundleMultiuserInstallPermissionTest") {
   sources +=
       [ "${services_path}/bundlemgr/test/mock/src/mock_install_client.cpp" ]
 
+  sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ]
+  sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ]
+
   sources += [ "bms_bundle_multiuser_install_permission_test.cpp" ]
 
   configs = [
diff --git a/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn
index dd4a1427102a21a70469f850194d304b696e77c4..7df554d61365518493a2a1b801b25d435cd9f3b3 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn
+++ b/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn
@@ -29,8 +29,6 @@ ohos_unittest("BmsBundleResourceTest") {
     "//third_party/json/include",
   ]
   sources = bundle_mgr_source
-  sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ]
-  sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ]
   sources -= [ "${services_path}/bundlemgr/src/system_ability_helper.cpp" ]
   sources += [
     "${services_path}/bundlemgr/src/aot/aot_executor.cpp",
diff --git a/services/bundlemgr/test/unittest/bms_bundle_resource_test/bms_bundle_resource_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_resource_test/bms_bundle_resource_test.cpp
index 5b00321200d2abbcda81a7dcfbf367579e918430..f960163b7e48fa05a82982c838c6cf9bfb4fada4 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_resource_test/bms_bundle_resource_test.cpp
+++ b/services/bundlemgr/test/unittest/bms_bundle_resource_test/bms_bundle_resource_test.cpp
@@ -154,7 +154,7 @@ ErrCode BmsBundleResourceTest::InstallBundle(const std::string &bundlePath) cons
         return ERR_APPEXECFWK_INSTALL_INTERNAL_ERROR;
     }
     InstallParam installParam;
-    installParam.installFlag = InstallFlag::NORMAL;
+    installParam.installFlag = InstallFlag::REPLACE_EXISTING;
     installParam.userId = USERID;
     installParam.withCopyHaps = true;
     bool result = installer->Install(bundlePath, installParam, receiver);