diff --git a/customization/edm_xts_stage/entry/src/main/ets/MainAbility/MainAbility.ts b/customization/edm_xts_stage/entry/src/main/ets/MainAbility/MainAbility.ts
index ed9de5ac32a0385ec7e83d2b09d806008314a5bb..8b12c6e3cc0cd9d0bc26d566cf7435e68dc0f581 100644
--- a/customization/edm_xts_stage/entry/src/main/ets/MainAbility/MainAbility.ts
+++ b/customization/edm_xts_stage/entry/src/main/ets/MainAbility/MainAbility.ts
@@ -16,7 +16,6 @@ export default class MainAbility extends Ability {
         // Main window is created, set main page for this ability
         console.log("[Demo] MainAbility onWindowStageCreate windowStage="+ windowStage)
         globalThis.windowStage = windowStage
-        globalThis.abilityStorage = this.storage
         globalThis.abilityContext = this.context
         windowStage.setUIContent(this.context, "pages/index/index", null)
     }
diff --git a/customization/edm_xts_stage/entry/src/main/ets/pages/index/index.ets b/customization/edm_xts_stage/entry/src/main/ets/pages/index/index.ets
index fa051e9c8ed4d506508c49c315e4770c48d45911..59482e5ec08385149947751f60e9059fc3d979c5 100644
--- a/customization/edm_xts_stage/entry/src/main/ets/pages/index/index.ets
+++ b/customization/edm_xts_stage/entry/src/main/ets/pages/index/index.ets
@@ -14,7 +14,7 @@
  */
 import file from '@system.file';
 
-import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index.ets"
+import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index"
 import testsuite from "../../test/List.test.ets"
 
 
diff --git a/customization/edm_xts_stage/entry/src/main/ets/test/edmCallback.test.ets b/customization/edm_xts_stage/entry/src/main/ets/test/edmCallback.test.ets
index 40023fba0b781654e1036b8fbb33b4b48c4f1128..c264f34d7b11c62ea88341f43d9fa46b55758ab9 100644
--- a/customization/edm_xts_stage/entry/src/main/ets/test/edmCallback.test.ets
+++ b/customization/edm_xts_stage/entry/src/main/ets/test/edmCallback.test.ets
@@ -23,87 +23,87 @@ import enterpriseDeviceManager from '@ohos.enterpriseDeviceManager'
 export default function edmCallbackTest() {
 
   describe('edmCallback_test', function () {
-    /**
-    * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0001
-    * @tc.name test enableAdmin method in callback mode without user id
-    * @tc.desc enable admin in callback mode
-    */
-    it('enableAdmin_test_002', 0, async function (done) {
-        var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
-            enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, OnReceiveEvent);
-        async function OnReceiveEvent(err, datainfo) {
-            console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
-            expect(datainfo).assertTrue();
-
-            var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
-            console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
-            expect(isEnabled).assertTrue();
-
-            retValue = await enterpriseDeviceManager.disableAdmin(WANT1);
-            console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
-            expect(retValue).assertTrue();
-
-            isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
-            console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled);
-            expect(isEnabled).assertFalse();
-            done();
-        }
-    })
-
-    /**
-     * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0004
-     * @tc.name test enableAdmin method in callback mode with ADMIN_TYPE_SUPER param without user id
-     * @tc.desc enable super admin in callback mode
-     */
-    it('enableAdmin_test_004', 0, async function (done) {
-        var retValue = await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1,
-            enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, OnReceiveEvent);
-        async function OnReceiveEvent(err, datainfo) {
-            console.log('enterpriseDeviceManager.enableAdmin : ' + retValue);
-            expect(datainfo).assertTrue();
-
-            var isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME);
-            console.log('enterpriseDeviceManager.isSuperAdmin :' + isEnabled);
-            expect(isEnabled).assertTrue();
-
-            retValue = await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME);
-            console.log('enterpriseDeviceManager.disableSuperAdmin : ' + retValue);
-            expect(retValue).assertTrue();
-
-            isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME);
-            console.log('enterpriseDeviceManager.isSuperAdmin : ' + isEnabled);
-            expect(isEnabled).assertFalse();
-            done();
-        }
-    })
-
-    /**
-     * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0006
-     * @tc.name test enableAdmin method in callback mode without user id
-     * @tc.desc enable admin in callback mode
-     */
-    it('enableAdmin_test_006', 0, async function (done) {
-        console.log(' enableAdmin()');
-        var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
-            enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, OnReceiveEvent);
-        async function OnReceiveEvent(err, datainfo) {
-            console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
-            expect(datainfo).assertTrue();
-
-            var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
-            console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
-            expect(isEnabled).assertTrue();
-
-            retValue = await enterpriseDeviceManager.disableAdmin(WANT1);
-            console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
-            expect(retValue).assertTrue();
-
-            isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
-            console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled);
-            expect(isEnabled).assertFalse();
-            done();
-        }
-    })
+    // /**
+    // * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0001
+    // * @tc.name test enableAdmin method in callback mode without user id
+    // * @tc.desc enable admin in callback mode
+    // */
+    // it('enableAdmin_test_002', 0, async function (done) {
+    //     var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
+    //         enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, OnReceiveEvent);
+    //     async function OnReceiveEvent(err, datainfo) {
+    //         console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
+    //         expect(datainfo).assertTrue();
+
+    //         var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
+    //         console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
+    //         expect(isEnabled).assertTrue();
+
+    //         retValue = await enterpriseDeviceManager.disableAdmin(WANT1);
+    //         console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
+    //         expect(retValue).assertTrue();
+
+    //         isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
+    //         console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled);
+    //         expect(isEnabled).assertFalse();
+    //         done();
+    //     }
+    // })
+
+    // /**
+    //  * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0004
+    //  * @tc.name test enableAdmin method in callback mode with ADMIN_TYPE_SUPER param without user id
+    //  * @tc.desc enable super admin in callback mode
+    //  */
+    // it('enableAdmin_test_004', 0, async function (done) {
+    //     var retValue = await enterpriseDeviceManager.enableAdmin(SELFWANT, ENTINFO1,
+    //         enterpriseDeviceManager.AdminType.ADMIN_TYPE_SUPER, OnReceiveEvent);
+    //     async function OnReceiveEvent(err, datainfo) {
+    //         console.log('enterpriseDeviceManager.enableAdmin : ' + retValue);
+    //         expect(datainfo).assertTrue();
+
+    //         var isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME);
+    //         console.log('enterpriseDeviceManager.isSuperAdmin :' + isEnabled);
+    //         expect(isEnabled).assertTrue();
+
+    //         retValue = await enterpriseDeviceManager.disableSuperAdmin(SELFHAPNAME);
+    //         console.log('enterpriseDeviceManager.disableSuperAdmin : ' + retValue);
+    //         expect(retValue).assertTrue();
+
+    //         isEnabled = await enterpriseDeviceManager.isSuperAdmin(SELFHAPNAME);
+    //         console.log('enterpriseDeviceManager.isSuperAdmin : ' + isEnabled);
+    //         expect(isEnabled).assertFalse();
+    //         done();
+    //     }
+    // })
+
+    // /**
+    //  * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0006
+    //  * @tc.name test enableAdmin method in callback mode without user id
+    //  * @tc.desc enable admin in callback mode
+    //  */
+    // it('enableAdmin_test_006', 0, async function (done) {
+    //     console.log(' enableAdmin()');
+    //     var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
+    //         enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, OnReceiveEvent);
+    //     async function OnReceiveEvent(err, datainfo) {
+    //         console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
+    //         expect(datainfo).assertTrue();
+
+    //         var isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
+    //         console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
+    //         expect(isEnabled).assertTrue();
+
+    //         retValue = await enterpriseDeviceManager.disableAdmin(WANT1);
+    //         console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
+    //         expect(retValue).assertTrue();
+
+    //         isEnabled = await enterpriseDeviceManager.isAdminEnabled(WANT1);
+    //         console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled);
+    //         expect(isEnabled).assertFalse();
+    //         done();
+    //     }
+    // })
 
     /**
      * @tc.number SUB_CUSTOMIZATION_ENTERPRISE_DEVICE_MANAGER_JS_0008
@@ -111,7 +111,7 @@ export default function edmCallbackTest() {
      * @tc.desc enable admin in multi-user
      */
     it('enableAdmin_test_008', 0, async function (done) {
-        var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
+        await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
             enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID, OnReceiveEvent);
         async function OnReceiveEvent(err, datainfo) {
             console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
@@ -121,7 +121,7 @@ export default function edmCallbackTest() {
             console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
             expect(isEnabled).assertTrue();
 
-            retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID);
+            var retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID);
             console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
             expect(retValue).assertTrue();
 
@@ -138,7 +138,7 @@ export default function edmCallbackTest() {
      * @tc.desc enable admin in multi-user
      */
     it('enableAdmin_test_012', 0, async function (done) {
-        var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
+        await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
             enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent);
         async function OnReceiveEvent(err, datainfo) {
             console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
@@ -148,7 +148,7 @@ export default function edmCallbackTest() {
             console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
             expect(isEnabled).assertTrue();
 
-            retValue = await enterpriseDeviceManager.disableAdmin(WANT1, TEST_USER_ID);
+            var retValue = await enterpriseDeviceManager.disableAdmin(WANT1, TEST_USER_ID);
             console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
             expect(retValue).assertTrue();
 
@@ -165,7 +165,7 @@ export default function edmCallbackTest() {
      * @tc.desc enable admin in multi-user
      */
     it('enableAdmin_test_013', 0, async function (done) {
-        var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
+        await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
             enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID, OnReceiveEvent);
         async function OnReceiveEvent(err, datainfo) {
             console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
@@ -175,7 +175,7 @@ export default function edmCallbackTest() {
             console.log('enterpriseDeviceManager.isAdminEnabled :' + isEnabled);
             expect(isEnabled).assertFalse();
 
-            retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID);
+            var retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID);
             console.log('enterpriseDeviceManager.disableAdmin : ' + retValue);
             expect(retValue).assertTrue();
 
@@ -192,7 +192,7 @@ export default function edmCallbackTest() {
      * @tc.desc enable and disable admin in multi-user
      */
     it('enableAdmin_test_014', 0, async function (done) {
-        var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
+        await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
             enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent);
         async function OnReceiveEvent(err, datainfo) {
             console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);
@@ -203,7 +203,7 @@ export default function edmCallbackTest() {
             expect(isEnabled).assertTrue();
 
             try {
-                retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID);
+                var retValue = await enterpriseDeviceManager.disableAdmin(WANT1, DEFAULT_USER_ID);
                 console.log('enterpriseDeviceManager.disableAdmin over');
             } catch (error) {
                 expect(error != null).assertTrue();
@@ -239,7 +239,7 @@ export default function edmCallbackTest() {
         expect(isEnabled).assertTrue();
         console.log('enterpriseDeviceManager.isAdminEnabled : ' + isEnabled);
 
-        retValue = await enterpriseDeviceManager.setEnterpriseInfo(SELFWANT, ENTINFO2, OnReceiveEvent);
+        await enterpriseDeviceManager.setEnterpriseInfo(SELFWANT, ENTINFO2, OnReceiveEvent);
         async function OnReceiveEvent(err, datainfo) {
             console.log('enterpriseDeviceManager.setEnterpriseInfo : ' + datainfo);
             expect(datainfo).assertTrue();
diff --git a/customization/edm_xts_stage/entry/src/main/ets/test/edmPromise.test.ets b/customization/edm_xts_stage/entry/src/main/ets/test/edmPromise.test.ets
index 3bcaab316b7ba020e7e42235ff14286404f2f6dc..f3a4810b69ddae1ec9aaf2efbb7fdfd548de6e33 100644
--- a/customization/edm_xts_stage/entry/src/main/ets/test/edmPromise.test.ets
+++ b/customization/edm_xts_stage/entry/src/main/ets/test/edmPromise.test.ets
@@ -194,7 +194,7 @@ export default function edmPromiseTest() {
     it('enableAdmin_test_015', 0, async function (done) {
         var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
             enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, DEFAULT_USER_ID);
-        var retValue = await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
+        await enterpriseDeviceManager.enableAdmin(WANT1, ENTINFO1,
             enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, TEST_USER_ID, OnReceiveEvent);
         async function OnReceiveEvent(err, datainfo) {
             console.log('enterpriseDeviceManager.enableAdmin ADMIN_TYPE_NORMAL :' + datainfo);