diff --git a/LanguageServer/src/test/java/org/nittalab/dtram/languageserver/utils/TokenizerTest.java b/LanguageServer/src/test/java/org/nittalab/dtram/languageserver/utils/TokenizerTest.java
index 23d3f3b..f6eaffe 100644
--- a/LanguageServer/src/test/java/org/nittalab/dtram/languageserver/utils/TokenizerTest.java
+++ b/LanguageServer/src/test/java/org/nittalab/dtram/languageserver/utils/TokenizerTest.java
@@ -11,7 +11,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
@@ -50,9 +49,9 @@
         Token token10 = new Token("name", token9.getEndPos().move(0, 1), false);
         Token token11 = new Token(" ", token10.getEndPos().move(0, 1), true);
         Token token12 = new Token(" ", token11.getEndPos().move(0, 1), true);
-        ArrayList<Token> expected = new ArrayList<>(List.of(token0, token1, token2, token3, token4, token5, token6, token7, token8, token9, token10, token11, token12));
+        List<Token> expected = List.of(token0, token1, token2, token3, token4, token5, token6, token7, token8, token9, token10, token11, token12);
 
-        ArrayList<Token> actual = new ArrayList<>(List.of(new Token(testCode, startsAt, false)));
+        List<Token> actual = List.of(new Token(testCode, startsAt, false));
         actual = Tokenizer.splitBySpace(actual);
 
         Assertions.assertIterableEquals(expected, actual);
@@ -71,11 +70,11 @@
         Token token5 = new Token(")", token4.getEndPos().move(0, 1), true);
         Token token6 = new Token(")", token5.getEndPos().move(0, 1), true);
         Token token7 = new Token(" = name", token6.getEndPos().move(0, 1), false);
-        ArrayList<Token> expected = new ArrayList<>(List.of(token0, token1, token2, token3, token4, token5, token6, token7));
+        List<Token> expected = List.of(token0, token1, token2, token3, token4, token5, token6, token7);
 
-        ArrayList<Token> actual = new ArrayList<>(List.of(new Token(testCode, startsAt, false)));
-        actual = Tokenizer.splitBySymbol(actual, Tokens.LEFT_BRACKET, Tokens.LEFT_BRACKET_REGX);
-        actual = Tokenizer.splitBySymbol(actual, Tokens.RIGHT_BRACKET, Tokens.RIGHT_BRACKET_REGX);
+        List<Token> actual = List.of(new Token(testCode, startsAt, false));
+        actual = Tokenizer.splitBySymbol(actual, Tokens.LEFT_BRACKET);
+        actual = Tokenizer.splitBySymbol(actual, Tokens.RIGHT_BRACKET);
 
         Assertions.assertIterableEquals(expected, actual);
     }
@@ -94,11 +93,11 @@
         Token token6 = new Token("\"title\": title, \"content\": content, \"likes\": likes", token5.getEndPos().move(0, 1), false);
         Token token7 = new Token("}", token6.getEndPos().move(0, 1), true);
         Token token8 = new Token(")", token7.getEndPos().move(0, 1), false);
-        ArrayList<Token> expected = new ArrayList<>(List.of(token0, token1, token2, token3, token4, token5, token6, token7, token8));
+        List<Token> expected = List.of(token0, token1, token2, token3, token4, token5, token6, token7, token8);
 
-        ArrayList<Token> actual = new ArrayList<>(List.of(new Token(testCode, startsAt, false)));
-        actual = Tokenizer.splitBySymbol(actual, Tokens.LEFT_CURLY_BRACKET, Tokens.LEFT_CURLY_BRACKET_REGX);
-        actual = Tokenizer.splitBySymbol(actual, Tokens.RIGHT_CURLY_BRACKET, Tokens.RIGHT_CURLY_BRACKET_REGX);
+        List<Token> actual = List.of(new Token(testCode, startsAt, false));
+        actual = Tokenizer.splitBySymbol(actual, Tokens.LEFT_CURLY_BRACKET);
+        actual = Tokenizer.splitBySymbol(actual, Tokens.RIGHT_CURLY_BRACKET);
 
         Assertions.assertIterableEquals(expected, actual);
     }
@@ -113,10 +112,10 @@
         Token token2 = new Token("{accountId}", token1.getEndPos().move(0, 1), false);
         Token token3 = new Token(".", token2.getEndPos().move(0, 1), true);
         Token token4 = new Token("name", token3.getEndPos().move(0, 1), false);
-        ArrayList<Token> expected = new ArrayList<>(List.of(token0, token1, token2, token3, token4));
+        List<Token> expected = List.of(token0, token1, token2, token3, token4);
 
-        ArrayList<Token> actual = new ArrayList<>(List.of(new Token(testCode, startsAt, false)));
-        actual = Tokenizer.splitBySymbol(actual, Tokens.DOT, Tokens.DOT_REGX);
+        List<Token> actual = List.of(new Token(testCode, startsAt, false));
+        actual = Tokenizer.splitBySymbol(actual, Tokens.DOT);
 
         Assertions.assertIterableEquals(expected, actual);
     }
@@ -133,10 +132,10 @@
         Token token4 = new Token(" content: Str", token3.getEndPos().move(0, 1), false);
         Token token5 = new Token(",", token4.getEndPos().move(0, 1), true);
         Token token6 = new Token(" likes: Int))", token5.getEndPos().move(0, 1), false);
-        ArrayList<Token> expected = new ArrayList<>(List.of(token0, token1, token2, token3, token4, token5, token6));
+        List<Token> expected = List.of(token0, token1, token2, token3, token4, token5, token6);
 
-        ArrayList<Token> actual = new ArrayList<>(List.of(new Token(testCode, startsAt, false)));
-        actual = Tokenizer.splitBySymbol(actual, Tokens.COMMA, Tokens.COMMA);
+        List<Token> actual = List.of(new Token(testCode, startsAt, false));
+        actual = Tokenizer.splitBySymbol(actual, Tokens.COMMA);
 
         Assertions.assertIterableEquals(expected, actual);
     }