diff --git a/Test/SqlDom/Only170SyntaxTests.cs b/Test/SqlDom/Only170SyntaxTests.cs
index 88d968d..4b352d5 100644
--- a/Test/SqlDom/Only170SyntaxTests.cs
+++ b/Test/SqlDom/Only170SyntaxTests.cs
@@ -9,7 +9,7 @@ public partial class SqlDomTests
         // Note: These filenames are case sensitive, make sure they match the checked-in file exactly
         private static readonly ParserTest[] Only170TestInfos =
         {
-            new ParserTest170("RegexpTVFTests170.sql", nErrors80: 0, nErrors90: 0, nErrors100: 0, nErrors110: 0, nErrors120: 0, nErrors130: 0, nErrors140: 0, nErrors150: 0, nErrors160: 0)
+            new ParserTest170("RegexpTVFTests170.sql", nErrors80: 1, nErrors90: 1, nErrors100: 0, nErrors110: 0, nErrors120: 0, nErrors130: 0, nErrors140: 0, nErrors150: 0, nErrors160: 0)
         };
 
         private static readonly ParserTest[] SqlAzure170_TestInfos =
@@ -19,6 +19,43 @@ public partial class SqlDomTests
             //
         };
 
+        /// <summary>
+        /// This test runs only the graph syntax tests.
+        /// </summary>
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void GraphTSql170SyntaxParserTest()
+        {
+            TSql170Parser parser = new TSql170Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql170);
+            foreach (ParserTest ti in GraphTestsOnly)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result170);
+            }
+
+            // Parsing both for Azure and standalone flavors - explicitly set
+            // enum value to 'All'
+            //
+            parser = new TSql170Parser(true, SqlEngineType.All);
+            scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql170);
+            scriptGen.Options.SqlEngineType = SqlEngineType.All;
+            foreach (ParserTest ti in GraphTestsOnly)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result170);
+            }
+
+            // Explicitly ask for 'standalone' and parse
+            //
+            parser = new TSql170Parser(true, SqlEngineType.Standalone);
+            scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql170);
+            scriptGen.Options.SqlEngineType = SqlEngineType.Standalone;
+            foreach (ParserTest ti in GraphTestsOnly)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result170);
+            }
+        }
+
         [TestMethod]
         [Priority(0)]
         [SqlStudioTestCategory(Category.UnitTest)]
@@ -55,5 +92,271 @@ public void TSql170SyntaxIn170ParserTest()
             }
         }
 
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql170Azure_SyntaxIn170ParserTest()
+        {
+            // This test checks that Azure-specific syntax constructs are successfully parsed
+            // with Sql170 parser pointed to Sql Azure.
+            //
+            TSql170Parser parser = new TSql170Parser(true, SqlEngineType.SqlAzure);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql170);
+            scriptGen.Options.SqlEngineType = SqlEngineType.SqlAzure;
+            foreach (ParserTest ti in SqlAzure170_TestInfos)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result170);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql170SyntaxIn160ParserTest()
+        {
+            TSql150Parser parser = new TSql150Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql160);
+            System.Collections.Generic.List<ParserTest> all170ParserTests = new System.Collections.Generic.List<ParserTest>();
+            all170ParserTests.AddRange(Only170TestInfos);
+            all170ParserTests.AddRange(SqlAzure170_TestInfos);
+
+            foreach (ParserTest ti in all170ParserTests)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result160);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql170SyntaxIn150ParserTest()
+        {
+            TSql150Parser parser = new TSql150Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql150);
+            System.Collections.Generic.List<ParserTest> all170ParserTests = new System.Collections.Generic.List<ParserTest>();
+            all170ParserTests.AddRange(Only170TestInfos);
+            all170ParserTests.AddRange(SqlAzure170_TestInfos);
+
+            foreach (ParserTest ti in all170ParserTests)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result150);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql170SyntaxIn140ParserTest()
+        {
+            TSql140Parser parser = new TSql140Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql140);
+            System.Collections.Generic.List<ParserTest> all170ParserTests = new System.Collections.Generic.List<ParserTest>();
+            all170ParserTests.AddRange(Only170TestInfos);
+            all170ParserTests.AddRange(SqlAzure170_TestInfos);
+
+            foreach (ParserTest ti in all170ParserTests)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result140);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql170SyntaxIn130ParserTest()
+        {
+            TSql130Parser parser = new TSql130Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql130);
+            System.Collections.Generic.List<ParserTest> all170ParserTests = new System.Collections.Generic.List<ParserTest>();
+            all170ParserTests.AddRange(Only170TestInfos);
+            all170ParserTests.AddRange(SqlAzure170_TestInfos);
+
+            foreach (ParserTest ti in all170ParserTests)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result130);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql170SyntaxIn120ParserTest()
+        {
+            TSql120Parser parser = new TSql120Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql120);
+            System.Collections.Generic.List<ParserTest> all170ParserTests = new System.Collections.Generic.List<ParserTest>();
+            all170ParserTests.AddRange(Only170TestInfos);
+            all170ParserTests.AddRange(SqlAzure170_TestInfos);
+
+            foreach (ParserTest ti in all170ParserTests)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result120);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql170SyntaxIn110ParserTest()
+        {
+            TSql110Parser parser = new TSql110Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql110);
+            System.Collections.Generic.List<ParserTest> all170ParserTests = new System.Collections.Generic.List<ParserTest>();
+            all170ParserTests.AddRange(Only170TestInfos);
+            all170ParserTests.AddRange(SqlAzure170_TestInfos);
+
+            foreach (ParserTest ti in all170ParserTests)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result110);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql170SyntaxIn100ParserTest()
+        {
+            TSql100Parser parser = new TSql100Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql100);
+            System.Collections.Generic.List<ParserTest> all170ParserTests = new System.Collections.Generic.List<ParserTest>();
+            all170ParserTests.AddRange(Only170TestInfos);
+            all170ParserTests.AddRange(SqlAzure170_TestInfos);
+
+            foreach (ParserTest ti in all170ParserTests)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result100);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql170SyntaxIn90ParserTest()
+        {
+            TSql90Parser parser = new TSql90Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql90);
+            System.Collections.Generic.List<ParserTest> all170ParserTests = new System.Collections.Generic.List<ParserTest>();
+            all170ParserTests.AddRange(Only170TestInfos);
+            all170ParserTests.AddRange(SqlAzure170_TestInfos);
+
+            foreach (ParserTest ti in all170ParserTests)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result90);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql170SyntaxIn80ParserTest()
+        {
+            TSql80Parser parser = new TSql80Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql80);
+            System.Collections.Generic.List<ParserTest> all170ParserTests = new System.Collections.Generic.List<ParserTest>();
+            all170ParserTests.AddRange(Only170TestInfos);
+            all170ParserTests.AddRange(SqlAzure170_TestInfos);
+
+            foreach (ParserTest ti in all170ParserTests)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result80);
+            }
+        }
+
+        /// <summary>
+        /// Let's make sure the older syntax tests still pass in the new parser
+        /// </summary>
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql160SyntaxIn170ParserTest()
+        {
+            TSql170Parser parser = new TSql170Parser(true, SqlEngineType.Standalone);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql160);
+            foreach (ParserTest ti in Only140TestInfos)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result160);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql150SyntaxIn170ParserTest()
+        {
+            TSql170Parser parser = new TSql170Parser(true, SqlEngineType.Standalone);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql150);
+            foreach (ParserTest ti in Only140TestInfos)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result150);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql140SyntaxIn170ParserTest()
+        {
+            TSql170Parser parser = new TSql170Parser(true, SqlEngineType.Standalone);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql140);
+            foreach (ParserTest ti in Only140TestInfos)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result140);
+            }
+        }
+
+        /// <summary>
+        /// Let's make sure the older syntax tests still pass in the new parser
+        /// </summary>
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql130SyntaxIn170ParserTest()
+        {
+            TSql170Parser parser = new TSql170Parser(true, SqlEngineType.Standalone);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql130);
+            foreach (ParserTest ti in Only130TestInfos)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result130);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql120SyntaxIn170ParserTest()
+        {
+            TSql170Parser parser = new TSql170Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql120);
+            foreach (ParserTest ti in Only120TestInfos)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result120);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql110SyntaxIn170ParserTest()
+        {
+            TSql170Parser parser = new TSql170Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql110);
+            foreach (ParserTest ti in Only110TestInfos)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result110);
+            }
+        }
+
+        [TestMethod]
+        [Priority(0)]
+        [SqlStudioTestCategory(Category.UnitTest)]
+        public void TSql100SyntaxIn170ParserTest()
+        {
+            TSql170Parser parser = new TSql170Parser(true);
+            SqlScriptGenerator scriptGen = ParserTestUtils.CreateScriptGen(SqlVersion.Sql100);
+            foreach (ParserTest ti in Only100TestInfos)
+            {
+                ParserTest.ParseAndVerify(parser, scriptGen, ti._scriptFilename, ti._result100);
+            }
+        }
     }
 }
\ No newline at end of file