diff --git a/tests/SnapshotTests/BugFixes/snapshots/snap-v4.8/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt b/tests/SnapshotTests/BugFixes/snapshots/snap-v4.8/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt
index 085747de3a..d1f01587f3 100644
--- a/tests/SnapshotTests/BugFixes/snapshots/snap-v4.8/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt
+++ b/tests/SnapshotTests/BugFixes/snapshots/snap-v4.8/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt
@@ -135,11 +135,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
-        System.Guid value,
+        System.Guid value, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.MaybeNullWhen(false)]
 #endif
- out Vo vo)
+        out Vo vo)
 #pragma warning restore CS8767 // Nullability of reference types in type of parameter doesn't match implicitly implemented member because of nullability attributes.
 
         {
@@ -223,11 +223,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(string input,
+        public static global::System.Boolean TryParse(string input, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out Vo result)
+        out Vo result)
         {
             if (System.Guid.TryParse(input, out var __v))
             {
diff --git a/tests/SnapshotTests/BugFixes/snapshots/snap-v8.0/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt b/tests/SnapshotTests/BugFixes/snapshots/snap-v8.0/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt
index 09d69f46d0..568108093e 100644
--- a/tests/SnapshotTests/BugFixes/snapshots/snap-v8.0/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt
+++ b/tests/SnapshotTests/BugFixes/snapshots/snap-v8.0/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt
@@ -135,11 +135,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
-        System.Guid value,
+        System.Guid value, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.MaybeNullWhen(false)]
 #endif
- out Vo vo)
+        out Vo vo)
 #pragma warning restore CS8767 // Nullability of reference types in type of parameter doesn't match implicitly implemented member because of nullability attributes.
 
         {
@@ -223,11 +223,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> input,
+        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> input, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out Vo result)
+        out Vo result)
         {
             if (System.Guid.TryParse(input, out var __v))
             {
@@ -245,11 +245,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> s, global::System.IFormatProvider provider,
+        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> s, global::System.IFormatProvider provider, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out Vo result)
+        out Vo result)
         {
             if (System.Guid.TryParse(s, provider, out var __v))
             {
@@ -267,11 +267,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(string input,
+        public static global::System.Boolean TryParse(string input, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out Vo result)
+        out Vo result)
         {
             if (System.Guid.TryParse(input, out var __v))
             {
@@ -289,11 +289,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(string s, global::System.IFormatProvider provider,
+        public static global::System.Boolean TryParse(string s, global::System.IFormatProvider provider, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out Vo result)
+        out Vo result)
         {
             if (System.Guid.TryParse(s, provider, out var __v))
             {
diff --git a/tests/SnapshotTests/BugFixes/snapshots/snap-v9.0/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt b/tests/SnapshotTests/BugFixes/snapshots/snap-v9.0/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt
index 09d69f46d0..568108093e 100644
--- a/tests/SnapshotTests/BugFixes/snapshots/snap-v9.0/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt
+++ b/tests/SnapshotTests/BugFixes/snapshots/snap-v9.0/Bug717_Stj_does_not_escape_dashed_namespace.Test.verified.txt
@@ -135,11 +135,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
-        System.Guid value,
+        System.Guid value, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.MaybeNullWhen(false)]
 #endif
- out Vo vo)
+        out Vo vo)
 #pragma warning restore CS8767 // Nullability of reference types in type of parameter doesn't match implicitly implemented member because of nullability attributes.
 
         {
@@ -223,11 +223,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> input,
+        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> input, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out Vo result)
+        out Vo result)
         {
             if (System.Guid.TryParse(input, out var __v))
             {
@@ -245,11 +245,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> s, global::System.IFormatProvider provider,
+        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> s, global::System.IFormatProvider provider, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out Vo result)
+        out Vo result)
         {
             if (System.Guid.TryParse(s, provider, out var __v))
             {
@@ -267,11 +267,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(string input,
+        public static global::System.Boolean TryParse(string input, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out Vo result)
+        out Vo result)
         {
             if (System.Guid.TryParse(input, out var __v))
             {
@@ -289,11 +289,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(string s, global::System.IFormatProvider provider,
+        public static global::System.Boolean TryParse(string s, global::System.IFormatProvider provider, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out Vo result)
+        out Vo result)
         {
             if (System.Guid.TryParse(s, provider, out var __v))
             {
diff --git a/tests/SnapshotTests/BugFixes/snapshots/snap-vAspNetCore8.0/Bug720_Inconsistent_casting_mixed_with_IVogen_generation.Works_when_the_static_abstracts_and_implementation_have_same_casting.verified.txt b/tests/SnapshotTests/BugFixes/snapshots/snap-vAspNetCore8.0/Bug720_Inconsistent_casting_mixed_with_IVogen_generation.Works_when_the_static_abstracts_and_implementation_have_same_casting.verified.txt
index e5ac797404..7c58a6b77a 100644
--- a/tests/SnapshotTests/BugFixes/snapshots/snap-vAspNetCore8.0/Bug720_Inconsistent_casting_mixed_with_IVogen_generation.Works_when_the_static_abstracts_and_implementation_have_same_casting.verified.txt
+++ b/tests/SnapshotTests/BugFixes/snapshots/snap-vAspNetCore8.0/Bug720_Inconsistent_casting_mixed_with_IVogen_generation.Works_when_the_static_abstracts_and_implementation_have_same_casting.verified.txt
@@ -278,11 +278,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
-        System.Int32 value,
+        System.Int32 value, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.MaybeNullWhen(false)]
 #endif
- out ToDoItemId vo)
+        out ToDoItemId vo)
 #pragma warning restore CS8767 // Nullability of reference types in type of parameter doesn't match implicitly implemented member because of nullability attributes.
 
         {
@@ -359,11 +359,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<byte> utf8Text, global::System.Globalization.NumberStyles style, global::System.IFormatProvider provider,
+        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<byte> utf8Text, global::System.Globalization.NumberStyles style, global::System.IFormatProvider provider, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out ToDoItemId result)
+        out ToDoItemId result)
         {
             if (System.Int32.TryParse(utf8Text, style, provider, out var __v))
             {
@@ -381,11 +381,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<byte> utf8Text, global::System.IFormatProvider provider,
+        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<byte> utf8Text, global::System.IFormatProvider provider, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out ToDoItemId result)
+        out ToDoItemId result)
         {
             if (System.Int32.TryParse(utf8Text, provider, out var __v))
             {
@@ -403,11 +403,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<byte> utf8Text,
+        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<byte> utf8Text, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out ToDoItemId result)
+        out ToDoItemId result)
         {
             if (System.Int32.TryParse(utf8Text, out var __v))
             {
@@ -425,11 +425,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> s, global::System.Globalization.NumberStyles style, global::System.IFormatProvider provider,
+        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> s, global::System.Globalization.NumberStyles style, global::System.IFormatProvider provider, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out ToDoItemId result)
+        out ToDoItemId result)
         {
             if (System.Int32.TryParse(s, style, provider, out var __v))
             {
@@ -447,11 +447,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> s, global::System.IFormatProvider provider,
+        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> s, global::System.IFormatProvider provider, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out ToDoItemId result)
+        out ToDoItemId result)
         {
             if (System.Int32.TryParse(s, provider, out var __v))
             {
@@ -469,11 +469,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> s,
+        public static global::System.Boolean TryParse(global::System.ReadOnlySpan<char> s, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out ToDoItemId result)
+        out ToDoItemId result)
         {
             if (System.Int32.TryParse(s, out var __v))
             {
@@ -491,11 +491,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(string s, global::System.Globalization.NumberStyles style, global::System.IFormatProvider provider,
+        public static global::System.Boolean TryParse(string s, global::System.Globalization.NumberStyles style, global::System.IFormatProvider provider, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out ToDoItemId result)
+        out ToDoItemId result)
         {
             if (System.Int32.TryParse(s, style, provider, out var __v))
             {
@@ -513,11 +513,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(string s, global::System.IFormatProvider provider,
+        public static global::System.Boolean TryParse(string s, global::System.IFormatProvider provider, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out ToDoItemId result)
+        out ToDoItemId result)
         {
             if (System.Int32.TryParse(s, provider, out var __v))
             {
@@ -535,11 +535,11 @@ private readonly global::System.Diagnostics.StackTrace _stackTrace = null!;
         /// <returns>
         /// True if the value could a) be parsed by the underlying type, and b) passes any validation (after running any optional normalization).
         /// </returns>
-        public static global::System.Boolean TryParse(string s,
+        public static global::System.Boolean TryParse(string s, 
 #if NETCOREAPP3_0_OR_GREATER
 [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)]
 #endif
- out ToDoItemId result)
+        out ToDoItemId result)
         {
             if (System.Int32.TryParse(s, out var __v))
             {
diff --git a/tests/SnapshotTests/ModuleInitializer.cs b/tests/SnapshotTests/ModuleInitializer.cs
index 6a6adbaac8..774c2f3da8 100644
--- a/tests/SnapshotTests/ModuleInitializer.cs
+++ b/tests/SnapshotTests/ModuleInitializer.cs
@@ -15,7 +15,7 @@ public static void Init()
             s.Replace("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"Vogen\", \"0.0.0.0\")]",
                 "    [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"Vogen\", \"1.0.0.0\")]");
             
-            s.Replace("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"Vogen\", \"5.0.0.0\")]",
+            s.Replace("[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"Vogen\", \"6.0.0.0\")]",
                 "    [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"Vogen\", \"1.0.0.0\")]");
         });
     }