diff --git a/compiler/test/ut/ui_state_management/application_state_management/@storageLink/@storageLink.ts b/compiler/test/ut/ui_state_management/application_state_management/@storageLink/@storageLink.ts
index ccfbbab..8671287 100644
--- a/compiler/test/ut/ui_state_management/application_state_management/@storageLink/@storageLink.ts
+++ b/compiler/test/ut/ui_state_management/application_state_management/@storageLink/@storageLink.ts
@@ -57,8 +57,8 @@ let envLang = AppStorage.Prop('languageCode');
 class MyComponent extends View {
     constructor(compilerAssignedUniqueChildId, parent, params) {
         super(compilerAssignedUniqueChildId, parent);
-        this.__varA = AppStorage.GetOrCreate().setAndLink('varA', 2, this);
-        this.__lang = AppStorage.GetOrCreate().setAndProp('languageCode', 'en', this);
+        this.__varA = AppStorage.SetAndLink('varA', 2, this, "varA");
+        this.__lang = AppStorage.SetAndProp('languageCode', 'en', this, "lang");
         this.label = 'count';
         this.updateWithValueParams(params);
     }
diff --git a/compiler/test/ut/ui_state_management/application_state_management/@storageProp/@storageProp.ts b/compiler/test/ut/ui_state_management/application_state_management/@storageProp/@storageProp.ts
index b37354d..24ac7c5 100644
--- a/compiler/test/ut/ui_state_management/application_state_management/@storageProp/@storageProp.ts
+++ b/compiler/test/ut/ui_state_management/application_state_management/@storageProp/@storageProp.ts
@@ -57,8 +57,8 @@ let envLang = AppStorage.Prop('languageCode');
 class MyComponent extends View {
     constructor(compilerAssignedUniqueChildId, parent, params) {
         super(compilerAssignedUniqueChildId, parent);
-        this.__varA = AppStorage.GetOrCreate().setAndLink('varA', 2, this);
-        this.__lang = AppStorage.GetOrCreate().setAndProp('languageCode', 'en', this);
+        this.__varA = AppStorage.SetAndLink('varA', 2, this, "varA");
+        this.__lang = AppStorage.SetAndProp('languageCode', 'en', this, "lang");
         this.label = 'count';
         this.updateWithValueParams(params);
     }
diff --git a/compiler/test/ut/ui_state_management/application_state_management/appStorage/appStorage.ts b/compiler/test/ut/ui_state_management/application_state_management/appStorage/appStorage.ts
index 39f2aa9..00804ec 100644
--- a/compiler/test/ut/ui_state_management/application_state_management/appStorage/appStorage.ts
+++ b/compiler/test/ut/ui_state_management/application_state_management/appStorage/appStorage.ts
@@ -57,8 +57,8 @@ let envLang = AppStorage.Prop('languageCode');
 class MyComponent extends View {
     constructor(compilerAssignedUniqueChildId, parent, params) {
         super(compilerAssignedUniqueChildId, parent);
-        this.__varA = AppStorage.GetOrCreate().setAndLink('varA', 2, this);
-        this.__lang = AppStorage.GetOrCreate().setAndProp('languageCode', 'en', this);
+        this.__varA = AppStorage.SetAndLink('varA', 2, this, "varA");
+        this.__lang = AppStorage.SetAndProp('languageCode', 'en', this, "lang");
         this.label = 'count';
         this.updateWithValueParams(params);
     }
diff --git a/compiler/test/ut/ui_state_management/others/@watch/@watch.ts b/compiler/test/ut/ui_state_management/others/@watch/@watch.ts
index 618a3be..c9b3ce6 100644
--- a/compiler/test/ut/ui_state_management/others/@watch/@watch.ts
+++ b/compiler/test/ut/ui_state_management/others/@watch/@watch.ts
@@ -76,9 +76,9 @@ class CompA extends View {
         this.__totalPurchase = new ObservedPropertySimple(0, this, "totalPurchase");
         this.__defArray = new ObservedPropertyObject(['c', 'g', 't', 'z'], this, "defArray");
         this.__resultTip = new ObservedPropertySimple('', this, "resultTip");
-        this.updateWithValueParams(params);
         this.declareWatch("shopBasket", this.onBasketUpdated);
         this.declareWatch("defArray", this.onPutItem);
+        this.updateWithValueParams(params);
     }
     updateWithValueParams(params) {
         if (params.shopBasket !== undefined) {