diff --git a/arkguard/test/grammar/advanced_type/intersection_types.ts b/arkguard/test/grammar/advanced_type/intersection_types.ts
index 182de6165ace90143339ba74036556a7589ed347..6d4457b850202196b45398ef6b5135b1207be64a 100644
--- a/arkguard/test/grammar/advanced_type/intersection_types.ts
+++ b/arkguard/test/grammar/advanced_type/intersection_types.ts
@@ -15,35 +15,36 @@
 
 import assert = require('assert');
 
-function extend<T, U>(first: T, second: U): T & U {
-  let result = <T & U>{};
-  for (let id in first) {
-    (<any>result)[id] = (<any>first)[id];
+function mergeObjects<T, U>(primary: T, secondary: U): T & U {
+  const merged = {} as T & U;
+
+  for (const prop in primary) {
+    merged[prop] = primary[prop] as any;
   }
-  for (let id in second) {
-    if (!result.hasOwnProperty(id)) {
-      (<any>result)[id] = (<any>second)[id];
+
+  for (const prop in secondary) {
+    if (!Object.prototype.hasOwnProperty.call(merged, prop)) {
+      merged[prop] = secondary[prop] as any;
     }
   }
-  return result;
+  return merged;
 }
 
-class Person {
-  constructor(public name: string) {
-  }
+class Human {
+  constructor(public username: string) {}
 }
 
-interface Loggable {
-  log(): void;
+interface LoggingCapability {
+  writeLog(): void;
 }
 
-class ConsoleLogger implements Loggable {
-  log(): void {
+class TerminalLogger implements LoggingCapability {
+  writeLog(): void {
     console.log('Jim');
   }
 }
 
-const jim = extend(new Person('Jim'), new ConsoleLogger());
-const n = jim.name;
+const user = mergeObjects(new Human('Jim'), new TerminalLogger());
+const currentUser = user.username;
 
-assert(n === 'Jim', 'success');
+assert(currentUser === 'Jim', 'success');
diff --git a/arkguard/test/grammar/advanced_type/predefined_types.ts b/arkguard/test/grammar/advanced_type/predefined_types.ts
index 22d55829e5b3fcf1eebc0e353a4738e0211096de..d12d9d5acaa3d2b389b057e604da24706aea1b5a 100644
--- a/arkguard/test/grammar/advanced_type/predefined_types.ts
+++ b/arkguard/test/grammar/advanced_type/predefined_types.ts
@@ -13,8 +13,6 @@
  * limitations under the License.
  */
 
-import assert = require('assert');
-
 type T00 = Exclude<'a' | 'b' | 'c' | 'd', 'a' | 'c' | 'f'>; // 'b' | 'd'
 type T01 = Extract<'a' | 'b' | 'c' | 'd', 'a' | 'c' | 'f'>; // 'a' | 'c'
 
@@ -33,13 +31,13 @@ class C {
   y = 0;
 }
 
-type T10 = ReturnType<() => string>; // string
-type T11 = ReturnType<(s: string) => void>; // void
-type T12 = ReturnType<(<T>() => T)>; // {}
-type T13 = ReturnType<(<T extends U, U extends number[]>() => T)>; // number[]
-type T14 = ReturnType<typeof f1>; // { a: number, b: string }
-type T15 = ReturnType<any>; // any
-type T16 = ReturnType<never>; // any
+type ResultString = ReturnType<() => string>; // string
+type ResultVoid = ReturnType<(s: string) => void>; // void
+type ResultGeneric = ReturnType<(<T>() => T)>; // {}
+type ResultConstrained = ReturnType<(<T extends U, U extends number[]>() => T)>; // number[]
+type ResultInstance = ReturnType<typeof f1>; // { a: number, b: string }
+type ResultAny = ReturnType<any>; // any
+type ResultNever = ReturnType<never>; // any
 
 type T20 = InstanceType<typeof C>; // C
 type T21 = InstanceType<any>; // any
diff --git a/arkguard/test/grammar/advanced_type/predefined_types_expected.txt b/arkguard/test/grammar/advanced_type/predefined_types_expected.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3f44b40c8850cff84d874fc116cbc9191db4de58
--- /dev/null
+++ b/arkguard/test/grammar/advanced_type/predefined_types_expected.txt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+type e1 = Exclude<'a' | 'b' | 'c' | 'd', 'a' | 'c' | 'f'>; // 'b' | 'd'
+type f1 = Extract<'a' | 'b' | 'c' | 'd', 'a' | 'c' | 'f'>; // 'a' | 'c'
+type g1 = Exclude<string | number | (() => void), Function>; // string | number
+type h1 = Extract<string | number | (() => void), Function>; // () => void
+type i1 = NonNullable<string | number | undefined>; // string | number
+type j1 = NonNullable<(() => string) | string[] | null | undefined>; // (() => string) | string[]
+function d1(a2: string): any {
+    return { a: 1, b: a2 };
+}
+class l1 {
+    x = 0;
+    y = 0;
+}
+type m1 = ReturnType<() => string>; // string
+type n1 = ReturnType<(s: string) => void>; // void
+type o1 = ReturnType<(<T>() => T)>; // {}
+type q1 = ReturnType<(<T extends U, U extends number[]>() => T)>; // number[]
+type s1 = ReturnType<typeof d1>; // { a: number, b: string }
+type t1 = ReturnType<any>; // any
+type u1 = ReturnType<never>; // any
+type v1 = InstanceType<typeof l1>; // C
+type w1 = InstanceType<any>; // any
+type z1 = InstanceType<never>; // any
diff --git a/arkguard/test/grammar/compact/numericLiteralsWithTrailingDecimalPoints.ts b/arkguard/test/grammar/compact/numericLiteralsWithTrailingDecimalPoints.ts
index ea394fd2d42a9b6e7ac812138b74e5b2cafab41e..309484925df9f5bf4db1906a795ed82c330b71e6 100644
--- a/arkguard/test/grammar/compact/numericLiteralsWithTrailingDecimalPoints.ts
+++ b/arkguard/test/grammar/compact/numericLiteralsWithTrailingDecimalPoints.ts
@@ -18,33 +18,33 @@
 1. + 2.0 + 3.;
 
 var i: number = 1;
-var test1 = i.toString();
-var test3 = 3 .toString();
-var test4 = 3    .toString();
-var test5 = 3	.toString();
-var test6 = 3.['toString']();
-var test7 = 3
+var compactTest1 = i.toString();
+var compactTest3 = 3 .toString();
+var compactTest4 = 3    .toString();
+var compactTest5 = 3	.toString();
+var compactTest6 = 3.['toString']();
+var compactTest7 = 3
   .toString();
-var test8 = new Number(4).toString();
-var test9 = 3. + 3.;
-var test10 = 0 /* comment */.toString();
-var test11 = 3. /* comment */.toString();
-var test12 = 3
+var compactTest8 = new Number(4).toString();
+var compactTest9 = 3. + 3.;
+var compactTest10 = 0 /* comment */.toString();
+var compactTest11 = 3. /* comment */.toString();
+var compactTest12 = 3
   /* comment */ .toString();
 var test122 = 3
 /* comment */.toString();
 var test1222 = 3
 
   .toString();
-var test13 = 3.
+var compactTest13 = 3.
   /* comment */.toString();
-var test14 = 3
+var compactTest14 = 3
   // comment
   .toString();
-var test15 = 3.
+var compactTest15 = 3.
   // comment
   .toString();
-var test16 = 3  // comment time
+var compactTest16 = 3  // comment time
   .toString();
-var test17 = 3. // comment time again
+var compactTest17 = 3. // comment time again
   .toString();
\ No newline at end of file
diff --git a/arkguard/test/grammar/compact/numericLiteralsWithTrailingDecimalPoints_expected.txt b/arkguard/test/grammar/compact/numericLiteralsWithTrailingDecimalPoints_expected.txt
index 7b2df77a71ec2480e655ef4293eda93751be473f..624bb940a74400eca4802677ae1cc6957818f30e 100644
--- a/arkguard/test/grammar/compact/numericLiteralsWithTrailingDecimalPoints_expected.txt
+++ b/arkguard/test/grammar/compact/numericLiteralsWithTrailingDecimalPoints_expected.txt
@@ -1 +1 @@
-                           1..toString(); 1.0.toString(); 1. + 2.0 + 3.; var i: number = 1; var test1 = i.toString(); var test3 = 3..toString(); var test4 = 3..toString(); var test5 = 3..toString(); var test6 = 3.['toString'](); var test7 = 3 .toString(); var test8 = new Number(4).toString(); var test9 = 3. + 3.; var test10 = 0 .toString(); var test11 = 3. .toString(); var test12 = 3   .toString(); var test122 = 3   .toString(); var test1222 = 3 .toString(); var test13 = 3.   .toString(); var test14 = 3   .toString(); var test15 = 3.   .toString(); var test16 = 3   .toString(); var test17 = 3.   .toString(); 
\ No newline at end of file
+                           1..toString(); 1.0.toString(); 1. + 2.0 + 3.; var i: number = 1; var compactTest1 = i.toString(); var compactTest3 = 3..toString(); var compactTest4 = 3..toString(); var compactTest5 = 3..toString(); var compactTest6 = 3.['toString'](); var compactTest7 = 3 .toString(); var compactTest8 = new Number(4).toString(); var compactTest9 = 3. + 3.; var compactTest10 = 0 .toString(); var compactTest11 = 3. .toString(); var compactTest12 = 3   .toString(); var test122 = 3   .toString(); var test1222 = 3 .toString(); var compactTest13 = 3.   .toString(); var compactTest14 = 3   .toString(); var compactTest15 = 3.   .toString(); var compactTest16 = 3   .toString(); var compactTest17 = 3.   .toString(); 
\ No newline at end of file
diff --git a/arkguard/test/grammar/interface_validation/interface_class_method.ts b/arkguard/test/grammar/interface_validation/interface_class_method.ts
index f9bea5f4f47237c416fce7cf45a0f63ec8774c0a..1636c31168cf4c4b56f53fccf3a1be72d2ed5e25 100644
--- a/arkguard/test/grammar/interface_validation/interface_class_method.ts
+++ b/arkguard/test/grammar/interface_validation/interface_class_method.ts
@@ -15,27 +15,27 @@
 
 import assert = require('assert');
 
-interface ClockInterface {
-  currentTime: Date;
+interface TimepieceInterface {
+  currentDateTime: Date;
 
-  setTime(d: Date);
+  updateTime(newTime: Date);
 }
 
-class Clock implements ClockInterface {
-  currentTime: Date;
+class WallClock implements TimepieceInterface {
+  currentDateTime: Date;
 
-  setTime(d: Date) {
-    this.currentTime = d;
+  updateTime(newTime: Date) {
+    this.currentDateTime = newTime;
   }
 
-  constructor(h: number, m: number) {
+  constructor(hour: number, minute: number) {
   }
 }
 
-let nowClock = new Clock(3, 20);
+let nowClock = new WallClock(3, 20);
 
 let now = Date.prototype;
 
-nowClock.setTime(now);
+nowClock.updateTime(now);
 
-assert(nowClock.currentTime === now, 'success');
\ No newline at end of file
+assert(nowClock.currentDateTime === now, 'success');
\ No newline at end of file
diff --git a/arkguard/test/grammar/module_validation/name_space.ts b/arkguard/test/grammar/module_validation/name_space.ts
index bc9379802add64166105995aa8e122fb2f3cb846..582fb7951301576551b9a4c761a0bbc94e52ce6a 100644
--- a/arkguard/test/grammar/module_validation/name_space.ts
+++ b/arkguard/test/grammar/module_validation/name_space.ts
@@ -15,33 +15,33 @@
 
 import assert = require('assert');
 
-interface StringValidator {
-  isAcceptable(s: string): boolean;
+interface TextValidationRule {
+  isValid(text: string): boolean;
 }
 
-let lettersRegexp = /^[A-Za-z]+$/;
-let numberRegexp = /^[0-9]+$/;
+const alphabeticPattern = /^[A-Za-z]+$/;
+const numericPattern = /^[0-9]+$/;
 
-class LettersOnlyValidator implements StringValidator {
-  isAcceptable(s: string) {
-    return lettersRegexp.test(s);
+class AlphabeticalValidator implements TextValidationRule {
+  isValid(text: string) {
+    return alphabeticPattern.test(text);
   }
 }
 
-class ZipCodeValidator implements StringValidator {
-  isAcceptable(s: string) {
-    return s.length === 5 && numberRegexp.test(s);
+class PostalCodeValidator implements TextValidationRule {
+  isValid(text: string) {
+    return text.length === 5 && numericPattern.test(text);
   }
 }
 
-// Some samples to try
-let strings = ["Hello", "98052", "101"];
+// Test cases
+const testInputs = ["Hello", "98052", "101"];
 
-// Validators to use
-let validators: { [s: string]: StringValidator; } = {};
-validators["ZIP code"] = new ZipCodeValidator();
-validators["Letters only"] = new LettersOnlyValidator();
+// Validation registry
+const validationRules: { [ruleName: string]: TextValidationRule } = {};
+validationRules["Postal Code"] = new PostalCodeValidator();
+validationRules["Alphabetical"] = new AlphabeticalValidator();
 
 
-assert(validators["Letters only"].isAcceptable(strings[0]), 'success');
-assert(validators["ZIP code"].isAcceptable(strings[1]), 'success');
+assert(validationRules["Alphabetical"].isValid(testInputs[0]), 'success');
+assert(validationRules["Postal Code"].isValid(testInputs[1]), 'success');