diff --git a/src/test/java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstUnaryExpr.java b/src/test/java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstUnaryExpr.java
index 06f1e77..045532e 100644
--- a/src/test/java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstUnaryExpr.java
+++ b/src/test/java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstUnaryExpr.java
@@ -18,65 +18,14 @@
 
 import com.caoccao.javet.buddy.ts2java.BaseTestTs2Java;
 import com.caoccao.javet.buddy.ts2java.TsClass;
-import com.caoccao.javet.buddy.ts2java.TsMethodArgument;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestTs2JavaAstUnaryExpr extends BaseTestTs2Java {
-    @Test
-    public void testBang() throws Exception {
-        tsClass = new TsClass("return !true;", boolean.class);
-        assertFalse((boolean) tsClass.invoke());
-        tsClass = new TsClass("return !false;", boolean.class);
-        assertTrue((boolean) tsClass.invoke());
-        tsClass = new TsClass("return !(!true);", boolean.class);
-        assertTrue((boolean) tsClass.invoke());
-        tsClass = new TsClass("return !(!false);", boolean.class);
-        assertFalse((boolean) tsClass.invoke());
-        tsClass = new TsClass("return !a;", boolean.class, TsMethodArgument.of("a", boolean.class));
-        assertTrue((boolean) tsClass.invoke(true));
-        assertFalse((boolean) tsClass.invoke(false));
-        tsClass = new TsClass("return !!a;", boolean.class, TsMethodArgument.of("a", boolean.class));
-        assertTrue((boolean) tsClass.invoke(true));
-        assertFalse((boolean) tsClass.invoke(false));
-    }
-
-    @Test
-    public void testMinus() throws Exception {
-        tsClass = new TsClass("return -1;", int.class);
-        assertEquals(-1, tsClass.invoke());
-        tsClass = new TsClass("return -(1);", int.class);
-        assertEquals(-1, tsClass.invoke());
-        tsClass = new TsClass("return -(-1);", int.class);
-        assertEquals(1, tsClass.invoke());
-        tsClass = new TsClass(
-                "return -a;",
-                long.class,
-                TsMethodArgument.of("a", long.class));
-        assertEquals(-2L, tsClass.invoke(2L));
-        tsClass = new TsClass(
-                "return -(a + b);",
-                int.class,
-                TsMethodArgument.of("a", int.class),
-                TsMethodArgument.of("b", int.class));
-        assertEquals(-5, tsClass.invoke(3, 2));
-        tsClass = new TsClass(
-                "return -(a + (-1));",
-                int.class,
-                TsMethodArgument.of("a", int.class));
-        assertEquals(-2, tsClass.invoke(3));
-        tsClass = new TsClass(
-                "return -(-(a + b));",
-                int.class,
-                TsMethodArgument.of("a", int.class),
-                TsMethodArgument.of("b", int.class));
-        assertEquals(5, tsClass.invoke(3, 2));
-    }
-
     @Test
     public void testPlus() throws Exception {
-        tsClass = new TsClass("return +1;", int.class);
+        tsClass = new TsClass("return +1;");
         assertEquals(1, tsClass.invoke());
         tsClass = new TsClass("return +(+1);", int.class);
         assertEquals(1, tsClass.invoke());
diff --git a/src/test/java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstUnaryExprBang.java b/src/test/java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstUnaryExprBang.java
new file mode 100644
index 0000000..b078da5
--- /dev/null
+++ b/src/test/java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstUnaryExprBang.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024. caoccao.com Sam Cao
+ *
+ * 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.
+ */
+
+package com.caoccao.javet.buddy.ts2java.ast.expr;
+
+import com.caoccao.javet.buddy.ts2java.BaseTestTs2Java;
+import com.caoccao.javet.buddy.ts2java.TsClass;
+import com.caoccao.javet.buddy.ts2java.TsMethodArgument;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestTs2JavaAstUnaryExprBang extends BaseTestTs2Java {
+    @Test
+    public void testBang() throws Exception {
+        tsClass = new TsClass("return !true;");
+        assertFalse((boolean) tsClass.invoke());
+        tsClass = new TsClass("return !false;");
+        assertTrue((boolean) tsClass.invoke());
+        tsClass = new TsClass("return !(!true);", boolean.class);
+        assertTrue((boolean) tsClass.invoke());
+        tsClass = new TsClass("return !(!false);", boolean.class);
+        assertFalse((boolean) tsClass.invoke());
+        tsClass = new TsClass("return !a;", boolean.class, TsMethodArgument.of("a", boolean.class));
+        assertTrue((boolean) tsClass.invoke(true));
+        assertFalse((boolean) tsClass.invoke(false));
+        tsClass = new TsClass("return !!a;", boolean.class, TsMethodArgument.of("a", boolean.class));
+        assertTrue((boolean) tsClass.invoke(true));
+        assertFalse((boolean) tsClass.invoke(false));
+    }
+}
diff --git a/src/test/java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstUnaryExprMinus.java b/src/test/java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstUnaryExprMinus.java
new file mode 100644
index 0000000..1df7b1b
--- /dev/null
+++ b/src/test/java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstUnaryExprMinus.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024. caoccao.com Sam Cao
+ *
+ * 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.
+ */
+
+package com.caoccao.javet.buddy.ts2java.ast.expr;
+
+import com.caoccao.javet.buddy.ts2java.BaseTestTs2Java;
+import com.caoccao.javet.buddy.ts2java.TsClass;
+import com.caoccao.javet.buddy.ts2java.TsMethodArgument;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class TestTs2JavaAstUnaryExprMinus extends BaseTestTs2Java {
+    @Test
+    public void testMinus() throws Exception {
+        tsClass = new TsClass("return -1;");
+        assertEquals(-1, tsClass.invoke());
+        tsClass = new TsClass("return -(1);");
+        assertEquals(-1, tsClass.invoke());
+        tsClass = new TsClass("return -(-1);", int.class);
+        assertEquals(1, tsClass.invoke());
+        tsClass = new TsClass(
+                "return -a;",
+                long.class,
+                TsMethodArgument.of("a", long.class));
+        assertEquals(-2L, tsClass.invoke(2L));
+        tsClass = new TsClass(
+                "return -(a + b);",
+                int.class,
+                TsMethodArgument.of("a", int.class),
+                TsMethodArgument.of("b", int.class));
+        assertEquals(-5, tsClass.invoke(3, 2));
+        tsClass = new TsClass(
+                "return -(a + (-1));",
+                int.class,
+                TsMethodArgument.of("a", int.class));
+        assertEquals(-2, tsClass.invoke(3));
+        tsClass = new TsClass(
+                "return -(-(a + b));",
+                int.class,
+                TsMethodArgument.of("a", int.class),
+                TsMethodArgument.of("b", int.class));
+        assertEquals(5, tsClass.invoke(3, 2));
+    }
+}