diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs
index e3a680ac..1417ee76 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/BatchParser/BatchParserTests.cs
@@ -138,7 +138,6 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.BatchParser
         {
             CopyToOutput(FilesLocation, "TS-err-cycle1.txt");
             CopyToOutput(FilesLocation, "cycle2.txt");
-
             Start("err-blockComment");
             Start("err-blockComment2");
             Start("err-varDefinition");
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment.txt
index 0096e7d9..91fa12df 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment.txt
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment.txt
@@ -1,8 +1,8 @@
-Lexer tokenized input:
-======================
-
-Tokens:
-=======
-[ERROR: code CommentNotTerminated at 1:1 [0] - 1:32 [31] in TS-err-blockComment.txt, message: Missing end comment mark '*/'.]
-
-[PARSER ERROR: code CommentNotTerminated at 1:1 [0] - 1:32 [31] in TS-err-blockComment.txt, token text: /* unterminated block comment *, message: Missing end comment mark '*/'.]
+Lexer tokenized input:
+======================
+
+Tokens:
+=======
+[ERROR: code CommentNotTerminated at 1:1 [0] - 1:32 [31] in TS-err-blockComment.txt, message: Missing end comment mark '*/'.]
+
+[PARSER ERROR: code CommentNotTerminated at 1:1 [0] - 1:32 [31] in TS-err-blockComment.txt, token text: /* unterminated block comment *, message: Missing end comment mark '*/'.]
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment2.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment2.txt
index 29f584c4..1b1aa686 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment2.txt
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-blockComment2.txt
@@ -1,8 +1,8 @@
-Lexer tokenized input:
-======================
-
-Tokens:
-=======
-[ERROR: code CommentNotTerminated at 1:1 [0] - 1:31 [30] in TS-err-blockComment2.txt, message: Missing end comment mark '*/'.]
-
-[PARSER ERROR: code CommentNotTerminated at 1:1 [0] - 1:31 [30] in TS-err-blockComment2.txt, token text: /* unterminated block comment , message: Missing end comment mark '*/'.]
+Lexer tokenized input:
+======================
+
+Tokens:
+=======
+[ERROR: code CommentNotTerminated at 1:1 [0] - 1:31 [30] in TS-err-blockComment2.txt, message: Missing end comment mark '*/'.]
+
+[PARSER ERROR: code CommentNotTerminated at 1:1 [0] - 1:31 [30] in TS-err-blockComment2.txt, token text: /* unterminated block comment , message: Missing end comment mark '*/'.]
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition.txt
index b2d8d847..40a4753f 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition.txt
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition.txt
@@ -1,10 +1,10 @@
-Lexer tokenized input:
-======================
-[Setvar::setvar][WS: ]
-Tokens:
-=======
-[Token Setvar at TS-err-varDefinition.txt(1:1 [0] - 1:8 [7]): ':setvar']
-[Token Whitespace at TS-err-varDefinition.txt(1:8 [7] - 1:9 [8]): ' ']
-[ERROR: code UnrecognizedToken at 1:9 [8] - 1:13 [12] in TS-err-varDefinition.txt, message: Incorrect syntax was encountered while parsing '0var'.]
-
-[PARSER ERROR: code UnrecognizedToken at 1:9 [8] - 1:13 [12] in TS-err-varDefinition.txt, token text: 0var, message: Incorrect syntax was encountered while parsing '0var'.]
+Lexer tokenized input:
+======================
+[Setvar::setvar][WS: ]
+Tokens:
+=======
+[Token Setvar at TS-err-varDefinition.txt(1:1 [0] - 1:8 [7]): ':setvar']
+[Token Whitespace at TS-err-varDefinition.txt(1:8 [7] - 1:9 [8]): ' ']
+[ERROR: code UnrecognizedToken at 1:9 [8] - 1:13 [12] in TS-err-varDefinition.txt, message: Incorrect syntax was encountered while parsing '0var'.]
+
+[PARSER ERROR: code UnrecognizedToken at 1:9 [8] - 1:13 [12] in TS-err-varDefinition.txt, token text: 0var, message: Incorrect syntax was encountered while parsing '0var'.]
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition5.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition5.txt
index b8b4484a..0a56bf39 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition5.txt
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-varDefinition5.txt
@@ -1,12 +1,12 @@
-Lexer tokenized input:
-======================
-[Setvar::setvar][WS: ][T:a][WS: ]
-Tokens:
-=======
-[Token Setvar at TS-err-varDefinition5.txt(1:1 [0] - 1:8 [7]): ':setvar']
-[Token Whitespace at TS-err-varDefinition5.txt(1:8 [7] - 1:9 [8]): ' ']
-[Token Text at TS-err-varDefinition5.txt(1:9 [8] - 1:10 [9]): 'a']
-[Token Whitespace at TS-err-varDefinition5.txt(1:10 [9] - 1:11 [10]): ' ']
-[ERROR: code StringNotTerminated at 1:11 [10] - 1:31 [30] in TS-err-varDefinition5.txt, message: Unclosed quotation mark after the character string.]
-
-[PARSER ERROR: code StringNotTerminated at 1:11 [10] - 1:31 [30] in TS-err-varDefinition5.txt, token text: "unterminated string, message: Unclosed quotation mark after the character string.]
+Lexer tokenized input:
+======================
+[Setvar::setvar][WS: ][T:a][WS: ]
+Tokens:
+=======
+[Token Setvar at TS-err-varDefinition5.txt(1:1 [0] - 1:8 [7]): ':setvar']
+[Token Whitespace at TS-err-varDefinition5.txt(1:8 [7] - 1:9 [8]): ' ']
+[Token Text at TS-err-varDefinition5.txt(1:9 [8] - 1:10 [9]): 'a']
+[Token Whitespace at TS-err-varDefinition5.txt(1:10 [9] - 1:11 [10]): ' ']
+[ERROR: code StringNotTerminated at 1:11 [10] - 1:31 [30] in TS-err-varDefinition5.txt, message: Unclosed quotation mark after the character string.]
+
+[PARSER ERROR: code StringNotTerminated at 1:11 [10] - 1:31 [30] in TS-err-varDefinition5.txt, token text: "unterminated string, message: Unclosed quotation mark after the character string.]
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef4.txt b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef4.txt
index 8f4b116e..9aa1999e 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef4.txt
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestData/BatchParser/Baselines/BL-err-variableRef4.txt
@@ -1,9 +1,9 @@
-Lexer tokenized input:
-======================
-[T:Unterminated variable reference (at EOF): $(var][Eof:]
-Tokens:
-=======
-[Token Text at TS-err-variableRef4.txt(1:1 [0] - 1:48 [47]): 'Unterminated variable reference (at EOF): $(var']
-[Token Eof at TS-err-variableRef4.txt(1:48 [47] - 1:48 [47]): '']
-
-[PARSER ERROR: code InvalidVariableName at 1:43 [42] - 1:48 [47] in TS-err-variableRef4.txt, token text: $(var, message: Incorrect syntax was encountered while parsing '$(var'.]
+Lexer tokenized input:
+======================
+[T:Unterminated variable reference (at EOF): $(var][Eof:]
+Tokens:
+=======
+[Token Text at TS-err-variableRef4.txt(1:1 [0] - 1:48 [47]): 'Unterminated variable reference (at EOF): $(var']
+[Token Eof at TS-err-variableRef4.txt(1:48 [47] - 1:48 [47]): '']
+
+[PARSER ERROR: code InvalidVariableName at 1:43 [42] - 1:48 [47] in TS-err-variableRef4.txt, token text: $(var, message: Incorrect syntax was encountered while parsing '$(var'.]