#1428.Generated Subtyping tests refactored (#1471)

* #1428. Subtype tests generator rewritten. Generic function types fixed. Format improved

* #1428. Format improved

* #1428. Records tests fixed
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t01.dart
index cea2f87..167fb3f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -29,8 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -102,7 +99,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -118,5 +114,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t02.dart
index 487baff..253a13f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -29,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -111,7 +107,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -122,5 +117,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t03.dart
index 93ed393..f402c4f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A01_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -29,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -84,12 +80,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t01.dart
index 216a2f0..6ff5948 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -105,7 +102,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +117,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t02.dart
index 4abb90f..608059b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t02.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -114,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t03.dart
index da55cac..eed15b0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A02_t03.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -87,12 +83,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t01.dart
index e62565e..973beb3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -106,7 +102,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -122,5 +117,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t02.dart
index a3120f1..485feb9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t02.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,10 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -115,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -126,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t03.dart
index c577792..03539b4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A03_t03.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,10 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -88,12 +83,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t01.dart
index 6ad8dbf..e0db767 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,8 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -104,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -120,5 +116,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t02.dart
index a2109ec..04a93ae 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -113,7 +109,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -124,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t03.dart
index 97fee0d..3dab797 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A04_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t01.dart
index 5c54779..b15232b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,8 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -104,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -120,5 +116,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t02.dart
index 82a47b5..79f6a09 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -113,7 +109,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -124,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t03.dart
index 7e85030..ca0e8d1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A05_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t01.dart
index deb9c0b..f24203b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,8 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -104,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -120,5 +116,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t02.dart
index fab4d1c..0111795 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t02.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -113,7 +109,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -124,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t03.dart
index 1d49ca9..6d733c7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A06_t03.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t01.dart
index ccae24f..385e27b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,8 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -104,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -120,5 +116,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t02.dart
index c72f94c..a37c138 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t02.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -113,7 +109,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -124,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t03.dart
index 1b92b93..f4d40b1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A07_t03.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t01.dart
index ea53973..708c0b0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,8 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -104,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -120,5 +116,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t02.dart
index ff22426..217c0ca 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t02.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -113,7 +109,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -124,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t03.dart
index 7ba3a17..bda9a64 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A08_t03.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t01.dart
index ae1e853..042d247 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,8 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -104,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -120,5 +116,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t02.dart
index acf0142..de99e90 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t02.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -113,7 +109,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -124,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t03.dart
index 12b220f..bcbde6b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A09_t03.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t01.dart
index a56002e..652f358 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -105,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +118,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t02.dart
index 8859737..8b4e101 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t02.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -114,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t03.dart
index 611edaf..e29f34f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A10_t03.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -87,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t01.dart
index 5c81c64..eefbda9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,8 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -106,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -122,5 +118,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t02.dart
index 96ff86e..66cedb1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -115,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t03.dart
index 33fabff..d7b111f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A11_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -88,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t01.dart
index 9284e82..3950f89 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,8 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -106,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -122,5 +118,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t02.dart
index 2ab5ea1..be154d9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -115,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t03.dart
index 5cfbe19..1a2435f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A12_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -88,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t01.dart
index 614573d..3c47643 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -105,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +118,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t02.dart
index cafff39..b1812d5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t02.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -114,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t03.dart
index 75e9c85..f844fe2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A13_t03.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -87,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t01.dart
index 640a2ee..2fe3d57 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -105,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +118,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t02.dart
index 7bfd6be..57392c5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t02.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -114,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t03.dart
index 76fdf87..76d09f5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A14_t03.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -87,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t01.dart
index fb8c402..289b202 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -105,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +118,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t02.dart
index a41dd6a..ed92283 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t02.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -114,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t03.dart
index 43bc062..111e1a7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A15_t03.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -87,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t01.dart
index c50c7e5..fd5fe51 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t01.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,8 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -106,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -122,5 +118,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t02.dart
index 8cf40c2..672d915 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t02.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -115,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t03.dart
index e8a8810..9094b0e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A16_t03.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -88,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t01.dart
index 7b99b83..b1a1e8d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -105,7 +102,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +117,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t02.dart
index 9c9e0fc..831510d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t02.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -114,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t03.dart
index f365a75..81e9eb7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A17_t03.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -87,12 +83,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t01.dart
index 4c12432..060d0fa 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -105,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +118,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t02.dart
index daeba12..67bb420 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t02.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m;
 
@@ -114,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t03.dart
index 77818a0..4a08485 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_arguments_binding_A18_t03.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
@@ -87,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t01.dart
index 3b2f68c..ccb54d0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -29,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -115,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -123,5 +118,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t02.dart
index 5a426bb..393cf81 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -29,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -98,12 +94,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t03.dart
index 2ac4fe3..4ec4eb0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A01_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -29,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -66,10 +62,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t01.dart
index 4a2bc61..99d5c8d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -118,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t02.dart
index e3f3805..89eb87c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t02.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -101,12 +97,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t03.dart
index 622cc3a..6f24309 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A02_t03.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -69,10 +65,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t01.dart
index ba15806..dcf5c67 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,10 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -119,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -127,5 +121,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t02.dart
index b409860..e58134d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t02.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,10 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -102,12 +97,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t03.dart
index d456221..ac321ba 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A03_t03.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,10 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -70,10 +65,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t01.dart
index aa23ad7..350a251 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -117,7 +113,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t02.dart
index cb5e8dc..bfbd727 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -100,12 +96,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t03.dart
index 5cffc58..c52a262 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A04_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -68,10 +64,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t01.dart
index 8e1fe85..249ef2c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -117,7 +113,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t02.dart
index 3cb11d6..9ade6fa 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -100,12 +96,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t03.dart
index 483e85c..0f39acf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A05_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -68,10 +64,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t01.dart
index 0fdd0e3..86c4ac2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -117,7 +113,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t02.dart
index 6b7cadd..3d8c497 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t02.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -100,12 +96,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t03.dart
index 0330730..77ce937 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A06_t03.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -68,10 +64,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t01.dart
index 911a2d9..4d04f97 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -117,7 +113,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t02.dart
index ba8de36..3bf6465 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t02.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -100,12 +96,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t03.dart
index 8295e6b..ba0a663 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A07_t03.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -68,10 +64,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t01.dart
index 8004aa3..e9fe2e6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -117,7 +113,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t02.dart
index 29c7ed5..a24c210 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t02.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -100,12 +96,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t03.dart
index aebffb2..9e0976b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A08_t03.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -68,10 +64,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t01.dart
index 4750b86..e80c3bf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -117,7 +113,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t02.dart
index 117c5fb..83ea30d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t02.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -100,12 +96,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t03.dart
index dcf4e6c..b668515 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A09_t03.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -68,10 +64,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t01.dart
index af485a2..dadf002 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -118,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +122,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t02.dart
index 6ef0b48..70e2cb2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t02.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -101,12 +98,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t03.dart
index 799e50a..e3cb5c3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A10_t03.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -69,10 +66,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t01.dart
index 5584f4e..881ac37 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -119,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -127,5 +122,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t02.dart
index 626c428..c5d6128 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -102,12 +98,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t03.dart
index 4147f6d..ac0d64a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A11_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -70,10 +66,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t01.dart
index c90d7eb..27c3a15 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -119,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -127,5 +122,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t02.dart
index 06ecf7f..035c2b3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -102,12 +98,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t03.dart
index 15183f8..f8861a6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A12_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -70,10 +66,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t01.dart
index 52897c4..e074118 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -118,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +122,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t02.dart
index ec5fb1c..c657704 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t02.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -101,12 +98,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t03.dart
index 2b9c1a7..00063cb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A13_t03.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -69,10 +66,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t01.dart
index 6b74fce..d9fc4fa 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -118,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +122,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t02.dart
index 08daf0d..586dca6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t02.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -101,12 +98,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t03.dart
index 0aebfea..0161118 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A14_t03.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -69,10 +66,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t01.dart
index 33cfc03..9ba53c4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -118,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +122,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t02.dart
index 3afcfd6..2e2576c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t02.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -101,12 +98,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t03.dart
index e53aa58..f30575a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A15_t03.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -69,10 +66,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t01.dart
index 022c88e..dc5db57 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t01.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -119,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -127,5 +122,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t02.dart
index 9acbc0c..e4aeb6b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t02.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -102,12 +98,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t03.dart
index 7e487ed..567b7d0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A16_t03.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -70,10 +66,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t01.dart
index 22c7c12..166670f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -118,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t02.dart
index 100f556..e6c48d3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t02.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -101,12 +97,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t03.dart
index b7446c9..5e0910b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A17_t03.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -69,10 +65,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t01.dart
index 69a574e..1b5b101 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = forgetType(t0Instance);
   Function m = forgetType(t0Instance);
@@ -118,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Function> c2 = new ClassMember2_t01<Function>();
   c2 = new ClassMember2_t01<Function>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +122,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t02.dart
index 0db0819..24e66dd 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t02.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m;
 
@@ -101,12 +98,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Function> c2 = new ClassMember2_t02<Function>();
   c2 = new ClassMember2_t02<Function>.short();
   c2 = new ClassMember2_t02<Function>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t03.dart
index 02d914a..25a44bc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_class_member_A18_t03.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
@@ -69,10 +66,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Function> c2 = new ClassMember2_t03<Function>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A01_t01.dart
index 122ee64..5703f13 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -29,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A02_t01.dart
index bdca287..bcca999 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A02_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A03_t01.dart
index 9a11651..b8fc3b4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A03_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,10 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A04_t01.dart
index fbd139c..0162c8b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A05_t01.dart
index 43fac0e..98ad510 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A05_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A06_t01.dart
index 3bd1807..8327d41 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A06_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A07_t01.dart
index 1e7c015..67cde4b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A07_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A08_t01.dart
index 0abf328..41c548e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A08_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A09_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A09_t01.dart
index a3f904e..8b6bc94 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A09_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A09_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A10_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A10_t01.dart
index 68bedbd..145b63d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A10_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A10_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A11_t01.dart
index 5cbb11b..c1574bb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A11_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A12_t01.dart
index d7e700a..f403542 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A12_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A13_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A13_t01.dart
index ed6a413..6e02a97 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A13_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A14_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A14_t01.dart
index e5fd43c..4259c54 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A14_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A15_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A15_t01.dart
index 743126f..f5a2344 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A15_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A15_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A16_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A16_t01.dart
index 5912f77..3050b39 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A16_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A16_t01.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A17_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A17_t01.dart
index 0e99df9..f5eaf8b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A17_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A17_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A18_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A18_t01.dart
index c17b074..7c8a0b2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A18_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_global_variable_A18_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A01_t01.dart
index 4563978..5cf318f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -29,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A02_t01.dart
index bd5874b..9155c40 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A02_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A03_t01.dart
index 9f16899..360d978 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A03_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,10 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A04_t01.dart
index c823d2e..999ab98 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A05_t01.dart
index 37fd3b7..eb4d471 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A05_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A06_t01.dart
index a16cdec..0123a4a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A06_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A07_t01.dart
index c2f6d65..e1ec7e4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A07_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A08_t01.dart
index e488491..2292299 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A08_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A09_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A09_t01.dart
index 1ddbf3c..811d8ae 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A09_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A09_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A10_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A10_t01.dart
index 2b82e0c..85f3ab0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A10_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A10_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A11_t01.dart
index 552b9ca..8828c3c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A11_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A12_t01.dart
index 1b3682a..7b875e1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A12_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A13_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A13_t01.dart
index 1931f4f..16c261e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A13_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A14_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A14_t01.dart
index 4e56acc..bb4da0e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A14_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A15_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A15_t01.dart
index b6177f2..5c9750f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A15_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A15_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A16_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A16_t01.dart
index ac32a0c..52fba25 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A16_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A16_t01.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A17_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A17_t01.dart
index 1bd9f00..d530e07 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A17_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A17_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A18_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A18_t01.dart
index 6916051..45c4ecf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A18_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_local_variable_A18_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A01_t01.dart
index 7afc8bd..d4955ca 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -29,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -47,7 +43,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -61,8 +56,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A02_t01.dart
index 7dc214c..c2be297 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A02_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +46,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +59,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A03_t01.dart
index 8c1fa3a..8256f30 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A03_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,10 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -51,7 +46,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -65,8 +59,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A04_t01.dart
index 64df638..e5107df 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -49,7 +45,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -63,8 +58,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A05_t01.dart
index 46358a8..15b6841 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A05_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -49,7 +45,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -63,8 +58,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A06_t01.dart
index 4af0117..c5303d5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A06_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -49,7 +45,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -63,8 +58,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A07_t01.dart
index 746779c..df8513e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A07_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -49,7 +45,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -63,8 +58,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A08_t01.dart
index b66e0be..9c17511 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A08_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -49,7 +45,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -63,8 +58,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A09_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A09_t01.dart
index e4d5d26..7e26738 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A09_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A09_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -49,7 +45,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -63,8 +58,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A10_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A10_t01.dart
index 79f75ac..2985ccf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A10_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A10_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +47,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A11_t01.dart
index 1ed399b..8d1d38a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A11_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -51,7 +47,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -65,8 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A12_t01.dart
index 7012394..afe2576 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A12_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -51,7 +47,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -65,8 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A13_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A13_t01.dart
index 7e3e11f..eb9ad12 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A13_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +47,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A14_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A14_t01.dart
index 6de1527..09a04c6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A14_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +47,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A15_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A15_t01.dart
index 9400180..8d2eee5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A15_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A15_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +47,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A16_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A16_t01.dart
index 64cc42a..f751e72 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A16_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A16_t01.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,11 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -51,7 +47,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -65,8 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A17_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A17_t01.dart
index 3b9102e..03a6c1d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A17_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A17_t01.dart
@@ -5,19 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +46,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +59,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A18_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A18_t01.dart
index 20eedd8..eb2b012 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A18_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/function_type_function_return_value_A18_t01.dart
@@ -5,19 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +32,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +47,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Function returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Function>().testMethod();
   new ReturnValueGen<Function>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t01.dart
index 6432d50..19dd607 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,8 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 namedArgumentsFunc1(C0<U0, U1, U2> t1, {C0<U0, U1, U2> t2 = t1Default}) {}
 positionalArgumentsFunc1(C0<U0, U1, U2> t1, [C0<U0, U1, U2> t2 = t1Default]) {}
 
@@ -113,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<C0<U0, U1, U2>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -129,5 +125,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t02.dart
index 8c07a79..d160e9e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t02.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   C0<U0, U1, U2> m;
 
@@ -122,7 +118,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<C0<U0, U1, U2>> c2 =
     new ArgumentsBinding2_t02<C0<U0, U1, U2>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<C0<U0, U1, U2>>.c2(t1Instance, forgetType(t0Instance));
@@ -133,5 +128,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t03.dart
index 52a2fb2..ef48875 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A01_t03.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   C0<U0, U1, U2> m = t1Default;
 
@@ -95,12 +91,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<C0<U0, U1, U2>> c2 = new ArgumentsBinding2_t03<C0<U0, U1, U2>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t01.dart
index 3e0fc7d..986bf7b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,8 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 namedArgumentsFunc1(C0<U0, U1, U2> t1, {C0<U0, U1, U2> t2 = t1Default}) {}
 positionalArgumentsFunc1(C0<U0, U1, U2> t1, [C0<U0, U1, U2> t2 = t1Default]) {}
 
@@ -113,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<C0<U0, U1, U2>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -129,5 +125,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t02.dart
index c29d368..16756bc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t02.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   C0<U0, U1, U2> m;
 
@@ -122,7 +118,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<C0<U0, U1, U2>> c2 =
     new ArgumentsBinding2_t02<C0<U0, U1, U2>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<C0<U0, U1, U2>>.c2(t1Instance, forgetType(t0Instance));
@@ -133,5 +128,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t03.dart
index 8396567..0cf0c6a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_arguments_binding_A02_t03.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   C0<U0, U1, U2> m = t1Default;
 
@@ -95,12 +91,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<C0<U0, U1, U2>> c2 = new ArgumentsBinding2_t03<C0<U0, U1, U2>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t01.dart
index c06dd6d..b37663f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMember1_t01 {
   static C0<U0, U1, U2> s = forgetType(t0Instance);
   C0<U0, U1, U2> m = forgetType(t0Instance);
@@ -126,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<C0<U0, U1, U2>> c2 = new ClassMember2_t01<C0<U0, U1, U2>>();
   c2 = new ClassMember2_t01<C0<U0, U1, U2>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -134,5 +129,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t02.dart
index a7b0ebb..771f633 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t02.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberSuper1_t02 {
   C0<U0, U1, U2> m;
 
@@ -109,12 +105,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<C0<U0, U1, U2>> c2 = new ClassMember2_t02<C0<U0, U1, U2>>();
   c2 = new ClassMember2_t02<C0<U0, U1, U2>>.short();
   c2 = new ClassMember2_t02<C0<U0, U1, U2>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t03.dart
index c536570..4751ad8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A01_t03.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberMixin1_t03 {
   C0<U0, U1, U2> m = t1Default;
 
@@ -77,10 +73,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<C0<U0, U1, U2>> c2 = new ClassMember2_t03<C0<U0, U1, U2>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t01.dart
index d5cc3d8..c26f9a6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMember1_t01 {
   static C0<U0, U1, U2> s = forgetType(t0Instance);
   C0<U0, U1, U2> m = forgetType(t0Instance);
@@ -126,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<C0<U0, U1, U2>> c2 = new ClassMember2_t01<C0<U0, U1, U2>>();
   c2 = new ClassMember2_t01<C0<U0, U1, U2>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -134,5 +129,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t02.dart
index 544791a..60f0782 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t02.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberSuper1_t02 {
   C0<U0, U1, U2> m;
 
@@ -109,12 +105,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<C0<U0, U1, U2>> c2 = new ClassMember2_t02<C0<U0, U1, U2>>();
   c2 = new ClassMember2_t02<C0<U0, U1, U2>>.short();
   c2 = new ClassMember2_t02<C0<U0, U1, U2>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t03.dart
index 1e9d4a6..64edd88 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_class_member_A02_t03.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberMixin1_t03 {
   C0<U0, U1, U2> m = t1Default;
 
@@ -77,10 +73,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<C0<U0, U1, U2>> c2 = new ClassMember2_t03<C0<U0, U1, U2>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t01.dart
index f997c4d..b88cd3f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t01.dart
@@ -15,11 +15,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -42,8 +41,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 namedArgumentsFunc1(C0<U0, U1, U2> t1, {C0<U0, U1, U2> t2 = t1Default}) {}
 positionalArgumentsFunc1(C0<U0, U1, U2> t1, [C0<U0, U1, U2> t2 = t1Default]) {}
 
@@ -186,7 +183,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<C0<U0, U1, U2>>(t1Instance, t2: forgetType(t0Instance));
@@ -205,7 +201,6 @@
     new ArgumentsBindingClassGen<C0<U0, U1, U2>>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<C0<U0, U1, U2>>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -215,7 +210,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<C0<U0, U1, U2>>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t02.dart
index 09747ab..a146523 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t02.dart
@@ -15,11 +15,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -42,8 +41,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   C0<U0, U1, U2> m;
 
@@ -278,7 +275,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<C0<U0, U1, U2>>(forgetType(t0Instance));
@@ -310,5 +306,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<C0<U0, U1, U2>>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t03.dart
index 14aac90..ac44260 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_arguments_binding_fail_A01_t03.dart
@@ -15,11 +15,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -42,8 +41,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(C0<U0, U1, U2> val) {}
   void superTestPositioned(C0<U0, U1, U2> val, [C0<U0, U1, U2> val2 = t1Default]) {}
@@ -247,7 +244,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<C0<U0, U1, U2>>().superTest(forgetType(t0Instance));
@@ -274,5 +270,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<C0<U0, U1, U2>>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t01.dart
index 20f71e1..3617376 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t01.dart
@@ -15,11 +15,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -42,8 +41,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 class ClassMemberTestStatic {
   static C0<U0, U1, U2> s = t1Default;
 
@@ -195,7 +192,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -215,7 +211,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<C0<U0, U1, U2>>(t1Instance).getter;
@@ -260,5 +255,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<C0<U0, U1, U2>>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t02.dart
index 4780aa5..d361262 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t02.dart
@@ -15,11 +15,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -42,8 +41,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 class ClassMemberSuper1_t02 {
   C0<U0, U1, U2> m = t1Default;
 
@@ -135,7 +132,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<C0<U0, U1, U2>>();
   }, (e) => e is TypeError);
@@ -157,5 +153,4 @@
   Expect.throws(() {
     new ClassMember2_t02<C0<U0, U1, U2>>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t03.dart
index 0394f2a..3a4c0d0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_class_member_fail_A01_t03.dart
@@ -15,11 +15,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -42,8 +41,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 class ClassMemberSuper1_t03 {
   C0<U0, U1, U2> m = t1Default;
 
@@ -98,7 +95,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<C0<U0, U1, U2>>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -111,5 +107,4 @@
   Expect.throws(() {
     new ClassMember2_t03<C0<U0, U1, U2>>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_global_variable_fail_A01_t01.dart
index 7225719..b0327fb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_global_variable_fail_A01_t01.dart
@@ -15,11 +15,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -42,8 +41,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_local_variable_fail_A01_t01.dart
index 633a5d4..9ed7018 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_local_variable_fail_A01_t01.dart
@@ -15,11 +15,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -42,8 +41,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_return_value_fail_A01_t01.dart
index 26ef2b6..13bc092 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_fail_return_value_fail_A01_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -42,8 +41,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
 C0<U0, U1, U2> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -81,12 +78,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<C0<U0, U1, U2>>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<C0<U0, U1, U2>>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_global_variable_A01_t01.dart
index 7bccb49..cc96599 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_global_variable_A01_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_global_variable_A02_t01.dart
index 51095f9..7f9355c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_global_variable_A02_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_local_variable_A01_t01.dart
index da957f4..a1c29a5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_local_variable_A01_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_local_variable_A02_t01.dart
index bbca8d5..e6c46f1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_local_variable_A02_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_return_value_A01_t01.dart
index 4754ca5..439ee02 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_return_value_A01_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 C0<U0, U1, U2> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -58,7 +54,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   C0<U0, U1, U2> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -72,8 +67,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<C0<U0, U1, U2>>().testMethod();
   new ReturnValueGen<C0<U0, U1, U2>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_return_value_A02_t01.dart
index 968e28f..ce2cae1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/interface_compositionality_return_value_A02_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 C0<U0, U1, U2> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -58,7 +54,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   C0<U0, U1, U2> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -72,8 +67,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<C0<U0, U1, U2>>().testMethod();
   new ReturnValueGen<C0<U0, U1, U2>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t01.dart
index f2e5891..ef68ca8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,8 +35,6 @@
 
 const t1Default = const C();
 
-
-
 namedArgumentsFunc1(FutureOr<C> t1, {FutureOr<C> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<C> t1, [FutureOr<C> t2 = t1Default]) {}
 
@@ -109,7 +106,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<C>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -125,5 +121,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t02.dart
index cce7d0b..5fda8f1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t02.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<C> m;
 
@@ -118,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<C>> c2 =
     new ArgumentsBinding2_t02<FutureOr<C>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<FutureOr<C>>.c2(t1Instance, forgetType(t0Instance));
@@ -129,5 +124,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t03.dart
index 409f860..18d56cf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A01_t03.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   FutureOr<C> m = t1Default;
 
@@ -91,12 +87,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<C>> c2 = new ArgumentsBinding2_t03<FutureOr<C>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t01.dart
index 390f7dd..881baf8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,8 +35,6 @@
 
 const t1Default = const C();
 
-
-
 namedArgumentsFunc1(FutureOr<C> t1, {FutureOr<C> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<C> t1, [FutureOr<C> t2 = t1Default]) {}
 
@@ -109,7 +106,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<C>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -125,5 +121,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t02.dart
index f13946b..d84752f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t02.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<C> m;
 
@@ -118,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<C>> c2 =
     new ArgumentsBinding2_t02<FutureOr<C>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<FutureOr<C>>.c2(t1Instance, forgetType(t0Instance));
@@ -129,5 +124,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t03.dart
index 062a5ce..1b2ad86 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A02_t03.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   FutureOr<C> m = t1Default;
 
@@ -91,12 +87,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<C>> c2 = new ArgumentsBinding2_t03<FutureOr<C>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t01.dart
index 1f54b0c..709582d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,8 +37,6 @@
 
 const t1Default = const C<A>();
 
-
-
 namedArgumentsFunc1(FutureOr<C<A>> t1, {FutureOr<C<A>> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<C<A>> t1, [FutureOr<C<A>> t2 = t1Default]) {}
 
@@ -111,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<C<A>>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -127,5 +123,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t02.dart
index 6935b74..8f9ff40 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t02.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<C<A>> m;
 
@@ -120,7 +116,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<C<A>>> c2 =
     new ArgumentsBinding2_t02<FutureOr<C<A>>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<FutureOr<C<A>>>.c2(t1Instance, forgetType(t0Instance));
@@ -131,5 +126,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t03.dart
index 38f1555..384f361 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A03_t03.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   FutureOr<C<A>> m = t1Default;
 
@@ -93,12 +89,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<C<A>>> c2 = new ArgumentsBinding2_t03<FutureOr<C<A>>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t01.dart
index 4800e00..53a4533 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,8 +38,6 @@
 
 const t1Default = const C<A>();
 
-
-
 namedArgumentsFunc1(FutureOr<C<A>> t1, {FutureOr<C<A>> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<C<A>> t1, [FutureOr<C<A>> t2 = t1Default]) {}
 
@@ -112,7 +109,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<C<A>>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -128,5 +124,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t02.dart
index 5f4c6bf..2bba013 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t02.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<C<A>> m;
 
@@ -121,7 +117,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<C<A>>> c2 =
     new ArgumentsBinding2_t02<FutureOr<C<A>>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<FutureOr<C<A>>>.c2(t1Instance, forgetType(t0Instance));
@@ -132,5 +127,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t03.dart
index ddab94a..788f126 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_arguments_binding_A04_t03.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   FutureOr<C<A>> m = t1Default;
 
@@ -94,12 +90,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<C<A>>> c2 = new ArgumentsBinding2_t03<FutureOr<C<A>>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t01.dart
index e9ab525..cb12cf9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<C> s = forgetType(t0Instance);
   FutureOr<C> m = forgetType(t0Instance);
@@ -122,7 +118,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<FutureOr<C>> c2 = new ClassMember2_t01<FutureOr<C>>();
   c2 = new ClassMember2_t01<FutureOr<C>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -130,5 +125,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t02.dart
index bc40d4a..7263c3e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t02.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<C> m;
 
@@ -105,12 +101,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<FutureOr<C>> c2 = new ClassMember2_t02<FutureOr<C>>();
   c2 = new ClassMember2_t02<FutureOr<C>>.short();
   c2 = new ClassMember2_t02<FutureOr<C>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t03.dart
index 1892d33..9d29b6f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A01_t03.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<C> m = t1Default;
 
@@ -73,10 +69,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<FutureOr<C>> c2 = new ClassMember2_t03<FutureOr<C>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t01.dart
index b5c73f2..5a2c87a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<C> s = forgetType(t0Instance);
   FutureOr<C> m = forgetType(t0Instance);
@@ -122,7 +118,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<FutureOr<C>> c2 = new ClassMember2_t01<FutureOr<C>>();
   c2 = new ClassMember2_t01<FutureOr<C>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -130,5 +125,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t02.dart
index 46597e9..b40855f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t02.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<C> m;
 
@@ -105,12 +101,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<FutureOr<C>> c2 = new ClassMember2_t02<FutureOr<C>>();
   c2 = new ClassMember2_t02<FutureOr<C>>.short();
   c2 = new ClassMember2_t02<FutureOr<C>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t03.dart
index e7ef426..a077b52 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A02_t03.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<C> m = t1Default;
 
@@ -73,10 +69,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<FutureOr<C>> c2 = new ClassMember2_t03<FutureOr<C>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t01.dart
index e430b69..1889239 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<C<A>> s = forgetType(t0Instance);
   FutureOr<C<A>> m = forgetType(t0Instance);
@@ -124,7 +120,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<FutureOr<C<A>>> c2 = new ClassMember2_t01<FutureOr<C<A>>>();
   c2 = new ClassMember2_t01<FutureOr<C<A>>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -132,5 +127,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t02.dart
index 6f9b901..af0917b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t02.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<C<A>> m;
 
@@ -107,12 +103,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<FutureOr<C<A>>> c2 = new ClassMember2_t02<FutureOr<C<A>>>();
   c2 = new ClassMember2_t02<FutureOr<C<A>>>.short();
   c2 = new ClassMember2_t02<FutureOr<C<A>>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t03.dart
index 4c71b70..1439571 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A03_t03.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<C<A>> m = t1Default;
 
@@ -75,10 +71,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<FutureOr<C<A>>> c2 = new ClassMember2_t03<FutureOr<C<A>>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t01.dart
index 08609dc..dcd22b6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<C<A>> s = forgetType(t0Instance);
   FutureOr<C<A>> m = forgetType(t0Instance);
@@ -125,7 +121,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<FutureOr<C<A>>> c2 = new ClassMember2_t01<FutureOr<C<A>>>();
   c2 = new ClassMember2_t01<FutureOr<C<A>>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -133,5 +128,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t02.dart
index b3a2eaf..6d3c93c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t02.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<C<A>> m;
 
@@ -108,12 +104,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<FutureOr<C<A>>> c2 = new ClassMember2_t02<FutureOr<C<A>>>();
   c2 = new ClassMember2_t02<FutureOr<C<A>>>.short();
   c2 = new ClassMember2_t02<FutureOr<C<A>>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t03.dart
index 98808b1..4533640 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_class_member_A04_t03.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<C<A>> m = t1Default;
 
@@ -76,10 +72,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<FutureOr<C<A>>> c2 = new ClassMember2_t03<FutureOr<C<A>>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t01.dart
index 89dffbd..80bdc24 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t01.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = null;
 
-
-
 namedArgumentsFunc1(Future? t1, {Future? t2 = t1Default}) {}
 positionalArgumentsFunc1(Future? t1, [Future? t2 = t1Default]) {}
 
@@ -176,7 +173,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<Future?>(t1Instance, t2: forgetType(t0Instance));
@@ -195,7 +191,6 @@
     new ArgumentsBindingClassGen<Future?>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<Future?>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -205,7 +200,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<Future?>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t02.dart
index 2bc0ae7..739b4e8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t02.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = null;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   Future? m;
 
@@ -268,7 +265,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<Future?>(forgetType(t0Instance));
@@ -300,5 +296,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<Future?>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t03.dart
index 2ef7ace..b37ba21 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A01_t03.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = null;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(Future? val) {}
   void superTestPositioned(Future? val, [Future? val2 = t1Default]) {}
@@ -237,7 +234,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<Future?>().superTest(forgetType(t0Instance));
@@ -264,5 +260,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<Future?>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t01.dart
index e2b77be..89d81b6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t01.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -181,7 +178,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -200,7 +196,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -210,7 +205,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t02.dart
index 30e8962..ead24d0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t02.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -273,7 +270,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -305,5 +301,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t03.dart
index 6e628e7..ae69f4a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_arguments_binding_fail_A02_t03.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -242,7 +239,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -269,5 +265,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t01.dart
index 2e347cb..f9f0b8b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t01.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = null;
 
-
-
 class ClassMemberTestStatic {
   static Future? s = t1Default;
 
@@ -185,7 +182,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -205,7 +201,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<Future?>(t1Instance).getter;
@@ -250,5 +245,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<Future?>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t02.dart
index cfab00f..c6e351b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t02.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = null;
 
-
-
 class ClassMemberSuper1_t02 {
   Future? m = t1Default;
 
@@ -125,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<Future?>();
   }, (e) => e is TypeError);
@@ -147,5 +143,4 @@
   Expect.throws(() {
     new ClassMember2_t02<Future?>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t03.dart
index 9fa8638..36ea364 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A01_t03.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = null;
 
-
-
 class ClassMemberSuper1_t03 {
   Future? m = t1Default;
 
@@ -88,7 +85,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<Future?>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -101,5 +97,4 @@
   Expect.throws(() {
     new ClassMember2_t03<Future?>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t01.dart
index 532631f..ab58c11 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t01.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -190,7 +187,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -210,7 +206,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -255,5 +250,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t02.dart
index 7a096db..7e5030b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t02.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -130,7 +127,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -152,5 +148,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t03.dart
index 213de27..1b32d6c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_class_member_fail_A02_t03.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -93,7 +90,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -106,5 +102,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_global_variable_fail_A01_t01.dart
index 89c970a..de4ea13 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_global_variable_fail_A01_t01.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = null;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_global_variable_fail_A02_t01.dart
index a2f8602..e9fa24d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_global_variable_fail_A02_t01.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_local_variable_fail_A01_t01.dart
index 43cb0ec..057bf1c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_local_variable_fail_A01_t01.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = null;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_local_variable_fail_A02_t01.dart
index 9d48eb6..4d2bf11 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_local_variable_fail_A02_t01.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_return_value_fail_A01_t01.dart
index 62dd9c8..a50a46f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_return_value_fail_A01_t01.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = null;
 
-
-
 Future? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,12 +68,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<Future?>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<Future?>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_return_value_fail_A02_t01.dart
index e04f6d8..4a796b5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_fail_return_value_fail_A02_t01.dart
@@ -8,19 +8,18 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -76,12 +73,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A01_t01.dart
index ac5e804..d9c4227 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A01_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A02_t01.dart
index ab2d976..ab69cc4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A02_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A03_t01.dart
index a545e5d..18c5c66 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A03_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A04_t01.dart
index d419b6a..f28e52b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_global_variable_A04_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A01_t01.dart
index 0534d92..7be4d1d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A01_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A02_t01.dart
index e1a9ca6..f6d2407 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A02_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A03_t01.dart
index 5a15838..17d8b94 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A03_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A04_t01.dart
index 4e15a8c..039a159 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_local_variable_A04_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A01_t01.dart
index 8f98fab..6354ba3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A01_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 FutureOr<C> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -54,7 +50,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   FutureOr<C> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -68,8 +63,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<FutureOr<C>>().testMethod();
   new ReturnValueGen<FutureOr<C>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A02_t01.dart
index 73fab88..97a83c3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A02_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -36,9 +35,6 @@
 
 const t1Default = const C();
 
-
-
-
 FutureOr<C> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -54,7 +50,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   FutureOr<C> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -68,8 +63,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<FutureOr<C>>().testMethod();
   new ReturnValueGen<FutureOr<C>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A03_t01.dart
index 8d40aaf..00761f6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A03_t01.dart
@@ -16,11 +16,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 FutureOr<C<A>> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -56,7 +52,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   FutureOr<C<A>> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -70,8 +65,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<FutureOr<C<A>>>().testMethod();
   new ReturnValueGen<FutureOr<C<A>>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A04_t01.dart
index 8c9fbd1..b1b0da9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_FutureOr_return_value_A04_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 FutureOr<C<A>> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -57,7 +53,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   FutureOr<C<A>> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -71,8 +66,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<FutureOr<C<A>>>().testMethod();
   new ReturnValueGen<FutureOr<C<A>>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t01.dart
index 46eb7a4..f99a4dd 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,8 +30,6 @@
 
 const t1Default = const Object();
 
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -104,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -120,5 +116,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t02.dart
index fe0292a..759b65d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m;
 
@@ -113,7 +109,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object> c2 =
     new ArgumentsBinding2_t02<Object>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, forgetType(t0Instance));
@@ -124,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t03.dart
index 620a0a4..0ab6c0a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t01.dart
index 0b6266a..8ea819a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -35,8 +34,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -108,7 +105,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -124,5 +120,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t02.dart
index ff2956f..9f31041 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -35,9 +34,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -117,7 +113,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
@@ -128,5 +123,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t03.dart
index 3174daa..37afc9b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_arguments_binding_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -35,9 +34,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -90,12 +86,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t01.dart
index 221a908..24f06ad 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static Object s = forgetType(t0Instance);
   Object m = forgetType(t0Instance);
@@ -117,7 +113,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Object> c2 = new ClassMember2_t01<Object>();
   c2 = new ClassMember2_t01<Object>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t02.dart
index 1794ba1..2540a09 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m;
 
@@ -100,12 +96,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Object> c2 = new ClassMember2_t02<Object>();
   c2 = new ClassMember2_t02<Object>.short();
   c2 = new ClassMember2_t02<Object>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t03.dart
index bc5606a..3ec1860 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
@@ -68,10 +64,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Object> c2 = new ClassMember2_t03<Object>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t01.dart
index 6134d17..e2ffc83 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -35,9 +34,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -121,7 +117,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
   c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -129,5 +124,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t02.dart
index 59c004d..9e4a2b5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -35,9 +34,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -104,12 +100,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
   c2 = new ClassMember2_t02<T1>.short();
   c2 = new ClassMember2_t02<T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t03.dart
index cd74c67..a8ffb13 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_class_member_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -35,9 +34,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -72,10 +68,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t01.dart
index ad2d073..f46c8e2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,19 +6,18 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = "Lily was here";
 
-
-
 namedArgumentsFunc1(String t1, {String t2 = t1Default}) {}
 positionalArgumentsFunc1(String t1, [String t2 = t1Default]) {}
 
@@ -175,7 +172,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<String>(t1Instance, t2: forgetType(t0Instance));
@@ -194,7 +190,6 @@
     new ArgumentsBindingClassGen<String>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<String>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -204,7 +199,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<String>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t02.dart
index 9fbd212..e098897 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,19 +6,18 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = "Lily was here";
 
-
-
 class ArgumentsBindingSuper1_t02 {
   String m;
 
@@ -267,7 +264,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<String>(forgetType(t0Instance));
@@ -299,5 +295,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<String>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t03.dart
index f0f45cb..b737011 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,19 +6,18 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = "Lily was here";
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(String val) {}
   void superTestPositioned(String val, [String val2 = t1Default]) {}
@@ -236,7 +233,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<String>().superTest(forgetType(t0Instance));
@@ -263,5 +259,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<String>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t01.dart
index b01c2f8..830bd28 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const A();
 
-
-
 namedArgumentsFunc1(A t1, {A t2 = t1Default}) {}
 positionalArgumentsFunc1(A t1, [A t2 = t1Default]) {}
 
@@ -179,7 +176,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<A>(t1Instance, t2: forgetType(t0Instance));
@@ -198,7 +194,6 @@
     new ArgumentsBindingClassGen<A>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<A>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -208,7 +203,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<A>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t02.dart
index 201f52c..0d6ee8c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const A();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   A m;
 
@@ -271,7 +268,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<A>(forgetType(t0Instance));
@@ -303,5 +299,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<A>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t03.dart
index 0fa3c07..655dd9f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const A();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(A val) {}
   void superTestPositioned(A val, [A val2 = t1Default]) {}
@@ -240,7 +237,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<A>().superTest(forgetType(t0Instance));
@@ -267,5 +263,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<A>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t01.dart
index 7eed461..9fda36a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = null;
 
-
-
 namedArgumentsFunc1(Null t1, {Null t2 = t1Default}) {}
 positionalArgumentsFunc1(Null t1, [Null t2 = t1Default]) {}
 
@@ -175,7 +172,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<Null>(t1Instance, t2: forgetType(t0Instance));
@@ -194,7 +190,6 @@
     new ArgumentsBindingClassGen<Null>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<Null>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -204,7 +199,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<Null>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t02.dart
index 409dde3..176f321 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = null;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   Null m;
 
@@ -267,7 +264,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<Null>(forgetType(t0Instance));
@@ -299,5 +295,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<Null>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t03.dart
index a3bffc5..07fef92 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_arguments_binding_fail_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = null;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(Null val) {}
   void superTestPositioned(Null val, [Null val2 = t1Default]) {}
@@ -236,7 +233,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<Null>().superTest(forgetType(t0Instance));
@@ -263,5 +259,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<Null>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t01.dart
index 17568a3..a635244 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,19 +6,18 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = "Lily was here";
 
-
-
 class ClassMemberTestStatic {
   static String s = t1Default;
 
@@ -184,7 +181,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -204,7 +200,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<String>(t1Instance).getter;
@@ -249,5 +244,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<String>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t02.dart
index 47d8cc8..30856a9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,19 +6,18 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = "Lily was here";
 
-
-
 class ClassMemberSuper1_t02 {
   String m = t1Default;
 
@@ -124,7 +121,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<String>();
   }, (e) => e is TypeError);
@@ -146,5 +142,4 @@
   Expect.throws(() {
     new ClassMember2_t02<String>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t03.dart
index 69a149d..1a3a689 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,19 +6,18 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = "Lily was here";
 
-
-
 class ClassMemberSuper1_t03 {
   String m = t1Default;
 
@@ -87,7 +84,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<String>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -100,5 +96,4 @@
   Expect.throws(() {
     new ClassMember2_t03<String>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t01.dart
index 10a0448..02ffc9f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const A();
 
-
-
 class ClassMemberTestStatic {
   static A s = t1Default;
 
@@ -188,7 +185,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -208,7 +204,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<A>(t1Instance).getter;
@@ -253,5 +248,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<A>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t02.dart
index 7d89c0a..ce93b74 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const A();
 
-
-
 class ClassMemberSuper1_t02 {
   A m = t1Default;
 
@@ -128,7 +125,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<A>();
   }, (e) => e is TypeError);
@@ -150,5 +146,4 @@
   Expect.throws(() {
     new ClassMember2_t02<A>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t03.dart
index 8088dd0..7ac3208 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const A();
 
-
-
 class ClassMemberSuper1_t03 {
   A m = t1Default;
 
@@ -91,7 +88,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<A>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -104,5 +100,4 @@
   Expect.throws(() {
     new ClassMember2_t03<A>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t01.dart
index 2efed6d..6ecb373 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = null;
 
-
-
 class ClassMemberTestStatic {
   static Null s = t1Default;
 
@@ -184,7 +181,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -204,7 +200,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<Null>(t1Instance).getter;
@@ -249,5 +244,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<Null>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t02.dart
index 51af1e8..055b611 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = null;
 
-
-
 class ClassMemberSuper1_t02 {
   Null m = t1Default;
 
@@ -124,7 +121,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<Null>();
   }, (e) => e is TypeError);
@@ -146,5 +142,4 @@
   Expect.throws(() {
     new ClassMember2_t02<Null>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t03.dart
index 33b3e86..6c19c5d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_class_member_fail_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = null;
 
-
-
 class ClassMemberSuper1_t03 {
   Null m = t1Default;
 
@@ -87,7 +84,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<Null>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -100,5 +96,4 @@
   Expect.throws(() {
     new ClassMember2_t03<Null>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A01_t01.dart
index 3737198..131963b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,19 +6,18 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = "Lily was here";
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A02_t01.dart
index e965a26..d6675cb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const A();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A03_t01.dart
index 5ecd324..6bf97a2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_global_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = null;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A01_t01.dart
index 8f8be3c..db92029 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,19 +6,18 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = "Lily was here";
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A02_t01.dart
index 8ede167..a756128 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const A();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A03_t01.dart
index 2d4ed4b..95afdeb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_local_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = null;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A01_t01.dart
index 5161f3b..febe978 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,19 +6,18 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = "Lily was here";
 
-
-
 String returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -70,12 +67,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<String>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<String>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A02_t01.dart
index 59c1388..768bffe 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const A();
 
-
-
 A returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -74,12 +71,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<A>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<A>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A03_t01.dart
index 7ac158a..3374b88 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_fail_return_value_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -31,8 +30,6 @@
 
 const t1Default = null;
 
-
-
 Null returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -70,12 +67,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<Null>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<Null>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_global_variable_A01_t01.dart
index e585f64..ceffeef 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_global_variable_A02_t01.dart
index f569676..c161052 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_global_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -35,9 +34,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_local_variable_A01_t01.dart
index c3d0d02..407af82 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_local_variable_A02_t01.dart
index 4430983..b0c8239 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_local_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -35,9 +34,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_return_value_A01_t01.dart
index 7316262..f03f8e4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -31,9 +30,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -49,7 +45,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Object returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -63,8 +58,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Object>().testMethod();
   new ReturnValueGen<Object>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_return_value_A02_t01.dart
index c636dfb..56b1cad 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_legacy_return_value_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -35,9 +34,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -53,7 +49,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -67,8 +62,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1>().testMethod();
   new ReturnValueGen<T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t01.dart
index c609acf..1f616bf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +31,6 @@
 
 const t1Default = null;
 
-
-
 namedArgumentsFunc1(FutureOr<Null> t1, {FutureOr<Null> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<Null> t1, [FutureOr<Null> t2 = t1Default]) {}
 
@@ -105,7 +102,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<Null>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +117,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t02.dart
index a6397a4..47a3d9c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<Null> m;
 
@@ -114,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<Null>> c2 =
     new ArgumentsBinding2_t02<FutureOr<Null>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<FutureOr<Null>>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t03.dart
index 96c1b54..c1d2e63 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   FutureOr<Null> m = t1Default;
 
@@ -87,12 +83,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<Null>> c2 = new ArgumentsBinding2_t03<FutureOr<Null>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t01.dart
index 775a6bc..98667f0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +31,6 @@
 
 const t1Default = const Object();
 
-
-
 namedArgumentsFunc1(FutureOr<Object?> t1, {FutureOr<Object?> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<Object?> t1, [FutureOr<Object?> t2 = t1Default]) {}
 
@@ -105,7 +102,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<Object?>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +117,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t02.dart
index 67e8dbb..24ad3f0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<Object?> m;
 
@@ -114,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<Object?>> c2 =
     new ArgumentsBinding2_t02<FutureOr<Object?>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<FutureOr<Object?>>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t03.dart
index efb697a..833bf9f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   FutureOr<Object?> m = t1Default;
 
@@ -87,12 +83,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<Object?>> c2 = new ArgumentsBinding2_t03<FutureOr<Object?>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t01.dart
index 509047d..299a39d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,18 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
 namedArgumentsFunc1(Null? t1, {Null? t2 = t1Default}) {}
 positionalArgumentsFunc1(Null? t1, [Null? t2 = t1Default]) {}
 
@@ -104,7 +100,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Null?>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -120,5 +115,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t02.dart
index 71bec05..42b0e14 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,18 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Null? m;
 
@@ -113,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Null?> c2 =
     new ArgumentsBinding2_t02<Null?>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Null?>.c2(t1Instance, forgetType(t0Instance));
@@ -124,5 +118,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t03.dart
index 5685041..6fbbae7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A04_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,18 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Null? m = t1Default;
 
@@ -86,12 +81,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Null?> c2 = new ArgumentsBinding2_t03<Null?>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t01.dart
index d145a22..ba3ac42 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,15 +17,13 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S {
   const S();
 }
@@ -35,8 +33,6 @@
 
 const t1Default = const S();
 
-
-
 namedArgumentsFunc1(S? t1, {S? t2 = t1Default}) {}
 positionalArgumentsFunc1(S? t1, [S? t2 = t1Default]) {}
 
@@ -108,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<S?>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -124,5 +119,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t02.dart
index 2eabca1..885f5d5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,15 +17,13 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S {
   const S();
 }
@@ -35,9 +33,6 @@
 
 const t1Default = const S();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   S? m;
 
@@ -117,7 +112,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<S?> c2 =
     new ArgumentsBinding2_t02<S?>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<S?>.c2(t1Instance, forgetType(t0Instance));
@@ -128,5 +122,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t03.dart
index 0f257c9..9ac71ff 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A05_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,15 +17,13 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S {
   const S();
 }
@@ -35,9 +33,6 @@
 
 const t1Default = const S();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   S? m = t1Default;
 
@@ -90,12 +85,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<S?> c2 = new ArgumentsBinding2_t03<S?>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t01.dart
index dea1623..8c2b62f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,8 +32,6 @@
 
 const t1Default = const X();
 
-
-
 namedArgumentsFunc1(X? t1, {X? t2 = t1Default}) {}
 positionalArgumentsFunc1(X? t1, [X? t2 = t1Default]) {}
 
@@ -106,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<X?>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -122,5 +118,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t02.dart
index a7b527a..eeb54b9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   X? m;
 
@@ -115,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<X?> c2 =
     new ArgumentsBinding2_t02<X?>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<X?>.c2(t1Instance, forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t03.dart
index 7f4e426..452b8df 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_arguments_binding_A06_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   X? m = t1Default;
 
@@ -88,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<X?> c2 = new ArgumentsBinding2_t03<X?>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t01.dart
index c58240c..093e843 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<Null> s = forgetType(t0Instance);
   FutureOr<Null> m = forgetType(t0Instance);
@@ -118,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<FutureOr<Null>> c2 = new ClassMember2_t01<FutureOr<Null>>();
   c2 = new ClassMember2_t01<FutureOr<Null>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t02.dart
index c1552cf..02ff173 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<Null> m;
 
@@ -101,12 +97,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<FutureOr<Null>> c2 = new ClassMember2_t02<FutureOr<Null>>();
   c2 = new ClassMember2_t02<FutureOr<Null>>.short();
   c2 = new ClassMember2_t02<FutureOr<Null>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t03.dart
index 6dea9dd..531fc36 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<Null> m = t1Default;
 
@@ -69,10 +65,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<FutureOr<Null>> c2 = new ClassMember2_t03<FutureOr<Null>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t01.dart
index c19e1c3..b0fbf71 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<Object?> s = forgetType(t0Instance);
   FutureOr<Object?> m = forgetType(t0Instance);
@@ -118,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<FutureOr<Object?>> c2 = new ClassMember2_t01<FutureOr<Object?>>();
   c2 = new ClassMember2_t01<FutureOr<Object?>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t02.dart
index 5e3ccc6..27116eb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<Object?> m;
 
@@ -101,12 +97,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<FutureOr<Object?>> c2 = new ClassMember2_t02<FutureOr<Object?>>();
   c2 = new ClassMember2_t02<FutureOr<Object?>>.short();
   c2 = new ClassMember2_t02<FutureOr<Object?>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t03.dart
index 3dfc2bd..93dffac 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<Object?> m = t1Default;
 
@@ -69,10 +65,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<FutureOr<Object?>> c2 = new ClassMember2_t03<FutureOr<Object?>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t01.dart
index 3baa491..afd73af 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,18 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static Null? s = forgetType(t0Instance);
   Null? m = forgetType(t0Instance);
@@ -117,7 +112,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Null?> c2 = new ClassMember2_t01<Null?>();
   c2 = new ClassMember2_t01<Null?>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -125,5 +119,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t02.dart
index f0183a8..231948f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,18 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Null? m;
 
@@ -100,12 +95,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Null?> c2 = new ClassMember2_t02<Null?>();
   c2 = new ClassMember2_t02<Null?>.short();
   c2 = new ClassMember2_t02<Null?>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t03.dart
index 8be38a4..633df4a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A04_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,18 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Null? m = t1Default;
 
@@ -68,10 +63,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Null?> c2 = new ClassMember2_t03<Null?>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t01.dart
index 981db89..978b657 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,15 +17,13 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S {
   const S();
 }
@@ -35,9 +33,6 @@
 
 const t1Default = const S();
 
-
-
-
 class ClassMember1_t01 {
   static S? s = forgetType(t0Instance);
   S? m = forgetType(t0Instance);
@@ -121,7 +116,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<S?> c2 = new ClassMember2_t01<S?>();
   c2 = new ClassMember2_t01<S?>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -129,5 +123,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t02.dart
index 7f40af7..921af1d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,15 +17,13 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S {
   const S();
 }
@@ -35,9 +33,6 @@
 
 const t1Default = const S();
 
-
-
-
 class ClassMemberSuper1_t02 {
   S? m;
 
@@ -104,12 +99,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<S?> c2 = new ClassMember2_t02<S?>();
   c2 = new ClassMember2_t02<S?>.short();
   c2 = new ClassMember2_t02<S?>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t03.dart
index a749e09..f3bb215 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A05_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,15 +17,13 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S {
   const S();
 }
@@ -35,9 +33,6 @@
 
 const t1Default = const S();
 
-
-
-
 class ClassMemberMixin1_t03 {
   S? m = t1Default;
 
@@ -72,10 +67,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<S?> c2 = new ClassMember2_t03<S?>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t01.dart
index f781e11..029ac3c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ClassMember1_t01 {
   static X? s = forgetType(t0Instance);
   X? m = forgetType(t0Instance);
@@ -119,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<X?> c2 = new ClassMember2_t01<X?>();
   c2 = new ClassMember2_t01<X?>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -127,5 +122,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t02.dart
index 3972584..75a9bac 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ClassMemberSuper1_t02 {
   X? m;
 
@@ -102,12 +98,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<X?> c2 = new ClassMember2_t02<X?>();
   c2 = new ClassMember2_t02<X?>.short();
   c2 = new ClassMember2_t02<X?>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t03.dart
index 7b4e758..0cada69 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_class_member_A06_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ClassMemberMixin1_t03 {
   X? m = t1Default;
 
@@ -70,10 +66,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<X?> c2 = new ClassMember2_t03<X?>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A02_t01.dart
index 7cd5e61..d34b93a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A03_t01.dart
index 56a1fe1..c5272ed 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A04_t01.dart
index e3549d5..ab87a67 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,18 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A05_t01.dart
index e67fea7..ffb1f74 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,15 +17,13 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S {
   const S();
 }
@@ -35,9 +33,6 @@
 
 const t1Default = const S();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A06_t01.dart
index a1e2906..18ed09d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_global_variable_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const X();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A02_t01.dart
index f8b786f..4b2df0c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A03_t01.dart
index efdb6c0..7fe2eab 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A04_t01.dart
index aa4f3aa..69074ca 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,18 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A05_t01.dart
index ecfbf35..bc91e97 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,15 +17,13 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S {
   const S();
 }
@@ -35,9 +33,6 @@
 
 const t1Default = const S();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A06_t01.dart
index 1536de4..e21115b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_local_variable_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const X();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A02_t01.dart
index 947f2ae..0e23056 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = null;
 
-
-
-
 FutureOr<Null> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +46,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   FutureOr<Null> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +59,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<FutureOr<Null>>().testMethod();
   new ReturnValueGen<FutureOr<Null>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A03_t01.dart
index 026377c..20999d2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 FutureOr<Object?> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +46,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   FutureOr<Object?> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +59,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<FutureOr<Object?>>().testMethod();
   new ReturnValueGen<FutureOr<Object?>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A04_t01.dart
index 1f9d144..7d214d2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,18 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 Null? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -49,7 +44,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Null? returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -63,8 +57,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Null?>().testMethod();
   new ReturnValueGen<Null?>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A05_t01.dart
index 29add7d..6462282 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,15 +17,13 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S {
   const S();
 }
@@ -35,9 +33,6 @@
 
 const t1Default = const S();
 
-
-
-
 S? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -53,7 +48,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   S? returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -67,8 +61,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<S?>().testMethod();
   new ReturnValueGen<S?>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A06_t01.dart
index d2774b0..1d1cb73 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_null_return_value_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const X();
 
-
-
-
 X? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -51,7 +47,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   X? returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -65,8 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<X?>().testMethod();
   new ReturnValueGen<X?>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t01.dart
index 82e3400..e352c18 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,8 +33,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1? t1, {T1? t2 = t1Default}) {}
 positionalArgumentsFunc1(T1? t1, [T1? t2 = t1Default]) {}
 
@@ -107,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1?>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -123,5 +119,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t02.dart
index 0c270ea..0e40dd6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1? m;
 
@@ -116,7 +112,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1?> c2 =
     new ArgumentsBinding2_t02<T1?>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1?>.c2(t1Instance, forgetType(t0Instance));
@@ -127,5 +122,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t03.dart
index 51a3d9a..adfdce9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1? m = t1Default;
 
@@ -89,12 +85,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1?> c2 = new ArgumentsBinding2_t03<T1?>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t01.dart
index 5d8ccc0..ca31999 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1? s = forgetType(t0Instance);
   T1? m = forgetType(t0Instance);
@@ -120,7 +116,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1?> c2 = new ClassMember2_t01<T1?>();
   c2 = new ClassMember2_t01<T1?>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -128,5 +123,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t02.dart
index 76983b6..9ea69d9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1? m;
 
@@ -103,12 +99,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1?> c2 = new ClassMember2_t02<T1?>();
   c2 = new ClassMember2_t02<T1?>.short();
   c2 = new ClassMember2_t02<T1?>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t03.dart
index 37efaed..9cc6b9f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1? m = t1Default;
 
@@ -71,10 +67,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1?> c2 = new ClassMember2_t03<T1?>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t01.dart
index 432ce75..d8f0f09 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -181,7 +178,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -200,7 +196,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -210,7 +205,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t02.dart
index 3f653ba..1539d41 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -273,7 +270,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -305,5 +301,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t03.dart
index 189bdde..ee2f824 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -242,7 +239,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -269,5 +265,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t01.dart
index 8763a11..3557e35 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1? t1, {T1? t2 = t1Default}) {}
 positionalArgumentsFunc1(T1? t1, [T1? t2 = t1Default]) {}
 
@@ -179,7 +176,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1?>(t1Instance, t2: forgetType(t0Instance));
@@ -198,7 +194,6 @@
     new ArgumentsBindingClassGen<T1?>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1?>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -208,7 +203,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1?>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t02.dart
index 2019dd8..9d1f447 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const T1();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1? m;
 
@@ -271,7 +268,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1?>(forgetType(t0Instance));
@@ -303,5 +299,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1?>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t03.dart
index c4a565f..fb2c308 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_arguments_binding_fail_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const T1();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1? val) {}
   void superTestPositioned(T1? val, [T1? val2 = t1Default]) {}
@@ -240,7 +237,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1?>().superTest(forgetType(t0Instance));
@@ -267,5 +263,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1?>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t01.dart
index 797c9b7..627dbc4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -190,7 +187,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -210,7 +206,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -255,5 +250,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t02.dart
index 1c19ce4..830da1b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -130,7 +127,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -152,5 +148,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t03.dart
index e8eecdb..924b914 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -93,7 +90,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -106,5 +102,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t01.dart
index 776af23..63076e0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberTestStatic {
   static T1? s = t1Default;
 
@@ -188,7 +185,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -208,7 +204,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1?>(t1Instance).getter;
@@ -253,5 +248,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1?>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t02.dart
index dcdece0..13e2d38 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberSuper1_t02 {
   T1? m = t1Default;
 
@@ -128,7 +125,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1?>();
   }, (e) => e is TypeError);
@@ -150,5 +146,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1?>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t03.dart
index da107c1..e58ada0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_class_member_fail_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberSuper1_t03 {
   T1? m = t1Default;
 
@@ -91,7 +88,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1?>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -104,5 +100,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1?>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_global_variable_fail_A01_t01.dart
index db9abeb..966e9b4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_global_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_global_variable_fail_A02_t01.dart
index 469744e..38fbf59 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_global_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const T1();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_local_variable_fail_A01_t01.dart
index 73d7777..adf01a6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_local_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_local_variable_fail_A02_t01.dart
index d13afb8..af9a3cc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_local_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const T1();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_return_value_fail_A01_t01.dart
index bacbd2b..642c53e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_return_value_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -37,8 +36,6 @@
 
 const t1Default = const T1();
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -76,12 +73,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_return_value_fail_A02_t01.dart
index 82cd1c4..059a2ba 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_fail_return_value_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -35,8 +34,6 @@
 
 const t1Default = const T1();
 
-
-
 T1? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -74,12 +71,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1?>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1?>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_global_variable_A01_t01.dart
index 9981c30..6b32991 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_local_variable_A01_t01.dart
index a6974c8..7f663ea 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_return_value_A01_t01.dart
index 99a2e50..9079602 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_nullable_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,11 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -52,7 +48,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1? returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -66,8 +61,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1?>().testMethod();
   new ReturnValueGen<T1?>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t01.dart
index 367f218..bb1d4a9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t01.dart
@@ -13,22 +13,18 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
 namedArgumentsFunc1(Object? t1, {Object? t2 = t1Default}) {}
 positionalArgumentsFunc1(Object? t1, [Object? t2 = t1Default]) {}
 
@@ -100,7 +96,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object?>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -116,5 +111,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t02.dart
index badfb58..2c0a3ba 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t02.dart
@@ -13,23 +13,18 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object? m;
 
@@ -109,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object?> c2 =
     new ArgumentsBinding2_t02<Object?>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Object?>.c2(t1Instance, forgetType(t0Instance));
@@ -120,5 +114,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t03.dart
index 431dfbc..0fca449 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_top_arguments_binding_A01_t03.dart
@@ -13,23 +13,18 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Object? m = t1Default;
 
@@ -82,12 +77,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object?> c2 = new ArgumentsBinding2_t03<Object?>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t01.dart
index c18213e..f1a9a0a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t01.dart
@@ -13,23 +13,18 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static Object? s = forgetType(t0Instance);
   Object? m = forgetType(t0Instance);
@@ -113,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Object?> c2 = new ClassMember2_t01<Object?>();
   c2 = new ClassMember2_t01<Object?>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -121,5 +115,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t02.dart
index be16e43..58114f4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t02.dart
@@ -13,23 +13,18 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object? m;
 
@@ -96,12 +91,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Object?> c2 = new ClassMember2_t02<Object?>();
   c2 = new ClassMember2_t02<Object?>.short();
   c2 = new ClassMember2_t02<Object?>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t03.dart
index 76eae49..c180dab 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_top_class_member_A01_t03.dart
@@ -13,23 +13,18 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object? m = t1Default;
 
@@ -64,10 +59,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Object?> c2 = new ClassMember2_t03<Object?>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_top_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_top_global_variable_A01_t01.dart
index bba499b..1701d0b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_top_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_top_global_variable_A01_t01.dart
@@ -13,23 +13,18 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_top_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_top_local_variable_A01_t01.dart
index 9966ca1..dc50b22 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_top_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_top_local_variable_A01_t01.dart
@@ -13,23 +13,18 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_top_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_top_return_value_A01_t01.dart
index 3aeb1c8..26b2479 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_top_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_top_return_value_A01_t01.dart
@@ -13,23 +13,18 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 Object? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -45,7 +40,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Object? returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -59,8 +53,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Object?>().testMethod();
   new ReturnValueGen<Object?>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t01.dart
index c5f1835..4e901cb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,8 +32,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -106,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -122,5 +118,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t02.dart
index b6508bc..c54ce46 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t02.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -115,7 +111,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t03.dart
index fc579cc..3e691c4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_arguments_binding_A01_t03.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -88,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t01.dart
index 4e65c30..68ba5fa 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -119,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
   c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -127,5 +122,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t02.dart
index 605b44b..01c4496 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t02.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -102,12 +98,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
   c2 = new ClassMember2_t02<T1>.short();
   c2 = new ClassMember2_t02<T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t03.dart
index 52793c5..6e851d1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_class_member_A01_t03.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -70,10 +66,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t01.dart
index 3e47f44..5a8b38d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t01.dart
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -34,8 +33,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -178,7 +175,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -197,7 +193,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -207,7 +202,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t02.dart
index 0bf7aa8..08df60e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t02.dart
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -34,8 +33,6 @@
 
 const t1Default = const T1();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -270,7 +267,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -302,5 +298,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t03.dart
index f2986b6..4e60e5c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t03.dart
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -34,8 +33,6 @@
 
 const t1Default = const T1();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -239,7 +236,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -266,5 +262,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t01.dart
index 54d2d2c..90a6592 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t01.dart
@@ -14,11 +14,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -34,8 +33,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -187,7 +184,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -207,7 +203,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -252,5 +247,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t02.dart
index 71af3af..fd5e489 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t02.dart
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -34,8 +33,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -127,7 +124,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -149,5 +145,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t03.dart
index 52e2501..be546f0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_class_member_fail_A01_t03.dart
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -34,8 +33,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -90,7 +87,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -103,5 +99,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_global_variable_fail_A01_t01.dart
index 14b4076..a7d4751 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_global_variable_fail_A01_t01.dart
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -34,8 +33,6 @@
 
 const t1Default = const T1();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_local_variable_fail_A01_t01.dart
index 7de86d8..dcc7985 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_local_variable_fail_A01_t01.dart
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -34,8 +33,6 @@
 
 const t1Default = const T1();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_return_value_fail_A01_t01.dart
index 6dc9adb..c8494fe 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_fail_return_value_fail_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -34,8 +33,6 @@
 
 const t1Default = const T1();
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -73,12 +70,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_global_variable_A01_t01.dart
index 974bcbe..1d79a86 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_global_variable_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_local_variable_A01_t01.dart
index ceb0c37..707fab1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_local_variable_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_return_value_A01_t01.dart
index 67a19da..5d7b107 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/left_type_variable_bound_return_value_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -33,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -51,7 +47,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -65,8 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1>().testMethod();
   new ReturnValueGen<T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t01.dart
index 63729d8..3791e65 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t01.dart
@@ -22,15 +22,13 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class U0 extends U1 {}
 class U1 {}
 class V0 {}
@@ -54,8 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -127,7 +123,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -143,5 +138,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t02.dart
index 76f32fb..060d068 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t02.dart
@@ -22,15 +22,13 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class U0 extends U1 {}
 class U1 {}
 class V0 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -136,7 +131,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
@@ -147,5 +141,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t03.dart
index 902335e..dadecdd 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A01_t03.dart
@@ -22,15 +22,13 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class U0 extends U1 {}
 class U1 {}
 class V0 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -109,12 +104,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t01.dart
index c4532c1..b560144 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -89,8 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -162,5 +159,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t02.dart
index 21664ec..e9654aa 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -89,9 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -171,5 +167,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t03.dart
index afe2f6c..72a6cf3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A02_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -89,9 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -144,6 +140,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t01.dart
index 06d70b1..17e75a5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,15 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -89,8 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -162,5 +163,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t02.dart
index 173b8f1..4d95776 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,15 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -171,5 +171,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t03.dart
index 8ccfbd4..a2d6c19 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A03_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,15 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -144,6 +144,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t01.dart
index 7d71bba..9f3262b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,14 +69,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -89,8 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -162,5 +163,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t02.dart
index b27fd5b..99e31f9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,14 +69,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -171,5 +171,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t03.dart
index 98bdb16..c32683e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A04_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,14 +69,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -144,6 +144,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t01.dart
index bbf05be..b23c9bf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -71,8 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -144,5 +141,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t02.dart
index e1f8577..93fd12d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -71,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -153,5 +149,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t03.dart
index b390597..6e370b4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_arguments_binding_A05_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -71,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -126,6 +122,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t01.dart
index 0fdb43eb..0e0d8b3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t01.dart
@@ -22,15 +22,13 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class U0 extends U1 {}
 class U1 {}
 class V0 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -140,7 +135,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
   c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -148,5 +142,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t02.dart
index 1e17de0..567f8b4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t02.dart
@@ -22,15 +22,13 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class U0 extends U1 {}
 class U1 {}
 class V0 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -123,12 +118,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
   c2 = new ClassMember2_t02<T1>.short();
   c2 = new ClassMember2_t02<T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t03.dart
index cdac976..3503cde 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A01_t03.dart
@@ -22,15 +22,13 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class U0 extends U1 {}
 class U1 {}
 class V0 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -91,10 +86,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t01.dart
index 6778cce..f554481 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -89,9 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -175,5 +171,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t02.dart
index eacb707..a1648dc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -89,9 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -158,5 +154,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t03.dart
index 335000c..6b56771 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A02_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -89,9 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -126,5 +122,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t01.dart
index 9c977c5..e735a19 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,15 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -175,5 +175,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t02.dart
index 1fd8b79..0b71141 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,15 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -158,5 +158,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t03.dart
index 114dcda..4bdc3f3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A03_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,15 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -126,5 +126,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t01.dart
index 63d9bd6..ce4bd9e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,14 +69,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -175,5 +175,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t02.dart
index e56072c..ffd79d3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,14 +69,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -158,5 +158,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t03.dart
index f13fa8b..58db5bb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A04_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,14 +69,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -126,5 +126,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t01.dart
index c4ac1fd..39d06d7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -71,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -157,5 +153,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t02.dart
index 1c0cd28..d707bd1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -71,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -140,5 +136,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t03.dart
index d2e0dfa..d889dc6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_class_member_A05_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -71,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -108,5 +104,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t01.dart
index ed6e6f6..60830d8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t01.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -198,7 +195,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -217,7 +213,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -227,7 +222,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t02.dart
index 32c760b..07b9bfb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t02.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -290,7 +287,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -322,5 +318,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t03.dart
index 3f522ce..57b4fa2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A11_t03.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -259,7 +256,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -286,5 +282,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t01.dart
index 862eca7..f8058ec 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t01.dart
@@ -22,49 +22,66 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -207,10 +224,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t02.dart
index 123ba5a..43c3200 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t02.dart
@@ -22,49 +22,66 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -299,5 +316,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t03.dart
index 0bc0e0d..69aa95b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A12_t03.dart
@@ -22,49 +22,66 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -268,5 +285,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t01.dart
index 69df4de..8a9e8d0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,8 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -199,10 +196,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t02.dart
index 15bc20b..81d3ca1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,8 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -291,5 +288,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t03.dart
index 3713c9c..1f3e1a8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A21_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,8 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -260,5 +257,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t01.dart
index 1b1ccd8..d5227d4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -91,8 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -235,10 +232,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t02.dart
index dab8f19..cb30c90 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -91,8 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -327,5 +324,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t03.dart
index b38da85..61fb20d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A22_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -91,8 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -296,5 +293,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t01.dart
index 9349104..7535d2e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -73,8 +72,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -217,10 +214,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t02.dart
index 866ff03..141fa50 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -73,8 +72,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -309,5 +306,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t03.dart
index b0474d8..25ca349 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A23_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -73,8 +72,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -278,5 +275,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t01.dart
index ff8262e..eefdf84 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,9 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -200,7 +196,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -219,7 +214,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -229,7 +223,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t02.dart
index 1210fa9..0ac9d09 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,9 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -292,7 +288,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -324,5 +319,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t03.dart
index 3a804ee..bee8537 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A31_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,9 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -261,7 +257,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -288,5 +283,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t01.dart
index 2d9fdc1..f187e1e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,14 +71,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,8 +95,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -235,10 +237,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t02.dart
index 82b8ff0..a468edf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,14 +71,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,8 +95,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -327,5 +329,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t03.dart
index d3ab08f..25e2527 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A32_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,14 +71,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,8 +95,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -296,5 +298,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t01.dart
index c6d4295..4bfa405 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,14 +53,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,8 +77,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -217,10 +219,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t02.dart
index 52e3443..680a72f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,14 +53,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,8 +77,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -309,5 +311,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t03.dart
index 8a5ef78..4e02224 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A33_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,14 +53,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,8 +77,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -278,5 +280,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t01.dart
index 10d2d0c..b6fa35c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t01.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -198,7 +195,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -217,7 +213,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -227,7 +222,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t02.dart
index 608fef7..aab520a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t02.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -290,7 +287,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -322,5 +318,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t03.dart
index 032087a..a740927 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A41_t03.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -259,7 +256,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -286,5 +282,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t01.dart
index af90e3f..99fb102 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t01.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -232,10 +229,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t02.dart
index d157909..22e86a9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t02.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -324,5 +321,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t03.dart
index 49e3128..ee2f152 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A42_t03.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -293,5 +290,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t01.dart
index 746ea70..83e47dd 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t01.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -216,10 +213,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t02.dart
index 2a28f47..0f93c6a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t02.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -308,5 +305,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t03.dart
index 98a0133..c2a0e98 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A43_t03.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -277,5 +274,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t01.dart
index 270ced7..1e3dae9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t01.dart
@@ -22,47 +22,61 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -205,10 +219,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t02.dart
index 2993bee..dfa6d68 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t02.dart
@@ -22,47 +22,61 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -297,5 +311,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t03.dart
index 9f85125..10e6aaa 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A51_t03.dart
@@ -22,47 +22,61 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -266,5 +280,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t01.dart
index 83e3a1c..f7f48c5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t01.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -232,10 +229,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t02.dart
index d2db5ea..7aa2e0b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t02.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -324,5 +321,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t03.dart
index d6dd3ba..282ed6e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A52_t03.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -293,5 +290,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t01.dart
index 4910f3d..1c88c42 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t01.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -216,10 +213,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t02.dart
index 2070aef..558e2a3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t02.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -308,5 +305,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t03.dart
index c47e6ed..e7b22f4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_arguments_binding_fail_A53_t03.dart
@@ -22,11 +22,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -277,5 +274,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t01.dart
index 16161ad..25f8336 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t01.dart
@@ -22,11 +22,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -207,7 +204,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -227,7 +223,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -272,5 +267,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t02.dart
index 96938be..280cabf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t02.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -147,7 +144,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -169,5 +165,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t03.dart
index e95ded3..2712505 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A11_t03.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -110,7 +107,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -123,5 +119,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t01.dart
index b396cb7..8cddcdd 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t01.dart
@@ -22,49 +22,66 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -216,7 +233,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -236,5 +252,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t02.dart
index fb55864..76fb61c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t02.dart
@@ -22,49 +22,66 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -156,5 +173,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t03.dart
index 1d2f85d..718e64f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A12_t03.dart
@@ -22,49 +22,66 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -119,5 +136,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t01.dart
index 908066b..c148f2f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,8 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -208,7 +205,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -228,5 +224,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t02.dart
index 2ed4050..cc92ea1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,8 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -148,5 +145,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t03.dart
index 986134d..12907e3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A21_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,8 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -111,5 +108,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t01.dart
index d0a4a87..7edc783 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -91,8 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -244,7 +241,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -264,5 +260,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t02.dart
index ba25f63..8557b0c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -91,8 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -184,5 +181,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t03.dart
index 9196aef..8ddf277 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A22_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -91,8 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -147,5 +144,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t01.dart
index c793682..b61e5d8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -73,8 +72,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -226,7 +223,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -246,5 +242,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t02.dart
index 436e74d..fac28ff 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -73,8 +72,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -166,5 +163,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t03.dart
index ad2b6a2..9c78256 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A23_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -73,8 +72,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -129,5 +126,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t01.dart
index f26d282..e183eb4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,9 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -209,7 +205,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -229,7 +224,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -274,5 +268,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t02.dart
index 197c91e..0a44f35 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,9 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -149,7 +145,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -171,5 +166,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t03.dart
index 29442db..afa817f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A31_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,9 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -112,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -125,5 +120,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t01.dart
index 33ae839..955207e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,14 +71,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,8 +95,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -244,7 +246,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -264,5 +265,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t02.dart
index 59b1d85..7afbbcb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,14 +71,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,8 +95,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -184,5 +186,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t03.dart
index 7fd0319..213d433 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A32_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,14 +71,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,8 +95,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -147,5 +149,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t01.dart
index 79e9bec..4bd4838 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,14 +53,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,8 +77,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -226,7 +228,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -246,5 +247,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t02.dart
index b16f049..469448c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t02.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,14 +53,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,8 +77,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -166,5 +168,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t03.dart
index e2d4115..fb3acb6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A33_t03.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,14 +53,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,8 +77,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -129,5 +131,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t01.dart
index cc690ca..3f458bd 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t01.dart
@@ -22,11 +22,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -207,7 +204,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -227,7 +223,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -272,5 +267,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t02.dart
index f332525..3b76efa 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t02.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -147,7 +144,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -169,5 +165,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t03.dart
index 4d9d17e..82455a7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A41_t03.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -110,7 +107,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -123,5 +119,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t01.dart
index f5c6edc..c9f9ff0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t01.dart
@@ -22,11 +22,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -241,7 +238,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -261,5 +257,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t02.dart
index 7d0d966..0b3c85a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t02.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -181,5 +178,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t03.dart
index 07dcff8..ac8ed79 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A42_t03.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -144,5 +141,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t01.dart
index 25fe866..3a0bbda 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t01.dart
@@ -22,11 +22,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -225,7 +222,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -245,5 +241,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t02.dart
index 1d423cc..cb40845 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t02.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -165,5 +162,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t03.dart
index 1737a99..7dc96ff 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A43_t03.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -128,5 +125,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t01.dart
index d3ac36f..d08c22d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t01.dart
@@ -22,47 +22,61 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -214,7 +228,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -234,5 +247,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t02.dart
index a3eee61..5e3e2be 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t02.dart
@@ -22,47 +22,61 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -154,5 +168,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t03.dart
index 34e6c19..1a70c61 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A51_t03.dart
@@ -22,47 +22,61 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -117,5 +131,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t01.dart
index 4a67646..1915b5e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t01.dart
@@ -22,11 +22,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -241,7 +238,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -261,5 +257,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t02.dart
index d669884..1251227 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t02.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -181,5 +178,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t03.dart
index 95bbcde..6c3a5d1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A52_t03.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -144,5 +141,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t01.dart
index 5bd0528..3bdc9ac 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t01.dart
@@ -22,11 +22,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -225,7 +222,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -245,5 +241,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t02.dart
index c77785e..21b7b3d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t02.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -165,5 +162,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t03.dart
index 8087e51..df20bc0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_class_member_fail_A53_t03.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -128,5 +125,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A11_t01.dart
index d642f95..51ee58d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A11_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A12_t01.dart
index d63d29b..dae785d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A12_t01.dart
@@ -22,49 +22,66 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -106,4 +123,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A21_t01.dart
index e66286b..a53758e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A21_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,8 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -98,4 +95,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A22_t01.dart
index 4139f34..61599f7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A22_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -91,8 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -134,4 +131,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A23_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A23_t01.dart
index 2891631..46db807 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A23_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -73,8 +72,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -116,4 +113,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A31_t01.dart
index 23062fe..8efb17e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A31_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,9 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A32_t01.dart
index 5ddcf6e..80881f8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A32_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,14 +71,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,8 +95,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -134,4 +136,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A33_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A33_t01.dart
index 7cdc9ba..d4d2c29 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A33_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,14 +53,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,8 +77,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -116,4 +118,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A41_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A41_t01.dart
index f218e22..cf99e48 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A41_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A42_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A42_t01.dart
index bc42b0a..0b74270 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A42_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -131,4 +128,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A43_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A43_t01.dart
index cf2184f..14c9ac0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A43_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -115,4 +112,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A51_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A51_t01.dart
index ca729ca..923015f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A51_t01.dart
@@ -22,47 +22,61 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -104,4 +118,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A52_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A52_t01.dart
index 1c92a3c..b9df4ba 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A52_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -131,4 +128,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A53_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A53_t01.dart
index bd6e510..eee50ec 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_global_variable_fail_A53_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -115,4 +112,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A11_t01.dart
index dc0ce0b..c65c13c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A11_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A12_t01.dart
index b5a0171..ba7535b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A12_t01.dart
@@ -22,49 +22,66 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -107,4 +124,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A21_t01.dart
index b284af2..c38bdae 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A21_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,8 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -99,4 +96,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A22_t01.dart
index b051528..e39bd47 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A22_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -91,8 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -135,4 +132,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A23_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A23_t01.dart
index 67c1f6b..66ad4f2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A23_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -73,8 +72,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -117,4 +114,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A31_t01.dart
index ba74f71..44646ce 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A31_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,9 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A32_t01.dart
index e9d081b..453bd67 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A32_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,14 +71,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,8 +95,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -135,4 +137,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A33_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A33_t01.dart
index 2725162..39f23cc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A33_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,14 +53,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,8 +77,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -117,4 +119,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A41_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A41_t01.dart
index 04f6cb4..947bb99 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A41_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A42_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A42_t01.dart
index d632019..4930ea4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A42_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -132,4 +129,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A43_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A43_t01.dart
index aac8ce4..e612fa9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A43_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -116,4 +113,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A51_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A51_t01.dart
index cca0463..c13a87c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A51_t01.dart
@@ -22,47 +22,61 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -105,4 +119,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A52_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A52_t01.dart
index 938ef9b..2208e1b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A52_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -132,4 +129,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A53_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A53_t01.dart
index de853a7..6ef5549 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_local_variable_fail_A53_t01.dart
@@ -22,11 +22,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -116,4 +113,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A11_t01.dart
index c06ad01..e78be55 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A11_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -93,12 +90,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A12_t01.dart
index 4b29324..36454a1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A12_t01.dart
@@ -22,49 +22,66 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -102,5 +119,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A21_t01.dart
index 2088b99..026e531 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A21_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,8 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -94,5 +91,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A22_t01.dart
index 33cbe98..eb00726 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A22_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -91,8 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -130,5 +127,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A23_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A23_t01.dart
index e374b9b..8b66590 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A23_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -73,8 +72,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -112,5 +109,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A31_t01.dart
index 36390aa..2bf4330 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A31_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -55,9 +54,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -95,12 +91,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A32_t01.dart
index 221317c..d30e0c5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A32_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,14 +71,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,8 +95,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -130,5 +132,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A33_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A33_t01.dart
index 53ac29e..f038300 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A33_t01.dart
@@ -15,19 +15,18 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,14 +53,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,8 +77,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -112,5 +114,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A41_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A41_t01.dart
index fa4bbdd..10d1aa1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A41_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -93,12 +90,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A42_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A42_t01.dart
index 8891bcf..5aa11ef 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A42_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -127,5 +124,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A43_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A43_t01.dart
index 043c461..b378167 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A43_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -111,5 +108,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A51_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A51_t01.dart
index d78d726..d74d09c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A51_t01.dart
@@ -22,47 +22,61 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -100,5 +114,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A52_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A52_t01.dart
index 24efe31..411d5e9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A52_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -88,8 +87,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -127,5 +124,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A53_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A53_t01.dart
index afd93c2..d183dcc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_fail_return_value_fail_A53_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -72,8 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -111,5 +108,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A01_t01.dart
index 21143ed..ca9ab63 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A01_t01.dart
@@ -22,15 +22,13 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class U0 extends U1 {}
 class U1 {}
 class V0 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A02_t01.dart
index b08ac5f..348c3c1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A02_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -89,9 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -117,4 +113,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A03_t01.dart
index 8a29f03..ea73b0a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A03_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,15 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -117,4 +117,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A04_t01.dart
index 7d94477..caf2226 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A04_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,14 +69,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -117,4 +117,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A05_t01.dart
index 2fb7c9c..eda09fc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_global_variable_A05_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -71,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -99,4 +95,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A01_t01.dart
index 8f7539c..d786d9a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A01_t01.dart
@@ -22,15 +22,13 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class U0 extends U1 {}
 class U1 {}
 class V0 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A02_t01.dart
index 1b73c7e..bc21196 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A02_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -89,9 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -123,4 +119,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A03_t01.dart
index da920b6..bcfebc1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A03_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,15 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -123,4 +123,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A04_t01.dart
index 44d025c..a5f374a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A04_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,14 +69,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -123,4 +123,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A05_t01.dart
index befbd0a..c176606 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_local_variable_A05_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -71,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -105,4 +101,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A01_t01.dart
index 1aa89a6..e4fc93e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A01_t01.dart
@@ -22,15 +22,13 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class U0 extends U1 {}
 class U1 {}
 class V0 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -72,7 +67,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -86,8 +80,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1>().testMethod();
   new ReturnValueGen<T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A02_t01.dart
index 8f72368..497b084 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A02_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -89,9 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -107,7 +103,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -121,5 +116,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A03_t01.dart
index 6fb115c..1043c95 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A03_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,15 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -107,7 +107,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -121,5 +120,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A04_t01.dart
index db71471..149804e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A04_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,14 +69,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -89,9 +92,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -107,7 +107,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -121,5 +120,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A05_t01.dart
index cf46555..f8d5ecf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/named_function_types_return_value_A05_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -71,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -89,7 +85,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -103,5 +98,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t01.dart
index 3c33a41..96e85fc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -52,8 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -125,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -141,5 +137,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t02.dart
index df152bc..7759dc4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -52,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -134,7 +130,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
@@ -145,5 +140,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t03.dart
index 9094a2e..f6afe02 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A01_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -52,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -107,12 +103,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t01.dart
index de10c47..1b2bfb9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,8 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -126,7 +123,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -142,5 +138,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t02.dart
index e42609e..7e05156 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -135,7 +131,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
@@ -146,5 +141,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t03.dart
index d9b2a4c..adf7f98 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A02_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -108,12 +104,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t01.dart
index 57a7831..5284b80 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,8 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -126,7 +123,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -142,5 +138,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t02.dart
index 06766cc..97bbc8d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -135,7 +131,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
@@ -146,5 +141,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t03.dart
index ff157be..f54b2a6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A03_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -108,12 +104,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t01.dart
index 611188e..db0354c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -54,8 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -127,7 +124,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -143,5 +139,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t02.dart
index 496ad9c..63a88c4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -54,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -136,7 +132,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
@@ -147,5 +142,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t03.dart
index 39903dd..19ee993 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A04_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -54,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -109,12 +105,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t01.dart
index 38e8052..253bac3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -86,7 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -158,5 +156,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t02.dart
index 45dadec..09aee92 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -86,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -167,5 +164,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t03.dart
index f3c3164..89d5d3a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A11_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -86,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -140,6 +137,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t01.dart
index 8e91f34..3abad67 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,7 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -160,5 +158,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t02.dart
index 575a2c0..8e95830 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -169,5 +166,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t03.dart
index 908c321..0240c97 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A12_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -142,6 +139,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t01.dart
index c679039..5ee36e1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,7 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -160,5 +158,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t02.dart
index 5ef004b..b3b65b7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -169,5 +166,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t03.dart
index 9adac7e..c89132c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A13_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -142,6 +139,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t01.dart
index ddce574..3237e9f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,7 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -160,5 +158,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t02.dart
index 3696691..301ecd8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -169,5 +166,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t03.dart
index 549fd61..3cf83ca 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A14_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -142,6 +139,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t01.dart
index 26543e7..ca360a0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -91,7 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -163,5 +161,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t02.dart
index 0bfc4e6..db89402 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t02.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -91,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -172,5 +169,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t03.dart
index 89a80e3..a0fae74 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A21_t03.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -91,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -145,6 +142,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t01.dart
index b01d39c..a5e8c90 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -94,7 +93,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -166,5 +164,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t02.dart
index b32ccfa..548a273 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t02.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -94,8 +93,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -175,5 +172,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t03.dart
index 77d66df..c044e4e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A22_t03.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -94,8 +93,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -148,6 +145,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t01.dart
index 040c557..9567e22 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -93,7 +92,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -165,5 +163,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t02.dart
index f178124..f754083 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t02.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -93,8 +92,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -174,5 +171,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t03.dart
index f036502..80aefc2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A23_t03.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -93,8 +92,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -147,6 +144,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t01.dart
index a2aebcb..1a4b546 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -92,7 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -164,5 +162,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t02.dart
index 9ff9a10..32c1938 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t02.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -92,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -173,5 +170,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t03.dart
index cb7c84d..aa26343 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A24_t03.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -92,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -146,6 +143,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t01.dart
index 2c86e19..5880cd5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,7 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -160,5 +158,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t02.dart
index 0e12ad6..052fb0c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -169,5 +166,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t03.dart
index f7a4837..ddedd15 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A31_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -142,6 +139,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t01.dart
index a870ccc..e6830f0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,25 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -160,5 +162,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t02.dart
index ad2fa4a..ff0fda1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -169,5 +170,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t03.dart
index c3b6a15..8f65160 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A32_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -142,6 +143,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t01.dart
index 802edb2..b5899b3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,25 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -160,5 +162,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t02.dart
index 3a9d56d..ddd7ba5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -169,5 +170,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t03.dart
index e6d7ff0..0feb2e8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A33_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -142,6 +143,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t01.dart
index 39bdd3f..bfdbd40 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,7 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -160,5 +158,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t02.dart
index 768f213..60eea2c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -169,5 +166,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t03.dart
index c7dcdb9..8c9d254 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A34_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -142,6 +139,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t01.dart
index 4abab0f..bfb2212 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,7 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -142,5 +140,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t02.dart
index 4cb293a..2158ea5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -151,5 +148,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t03.dart
index bb6a536..6b34b3e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A41_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,6 +121,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t01.dart
index 9ca6377..b5c0e7f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,7 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -142,5 +140,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t02.dart
index 40e1d19..9a8704b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -151,5 +148,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t03.dart
index 4cc61d0..77cf0d4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A42_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,6 +121,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t01.dart
index 54143c7..ef305d8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,7 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -142,5 +140,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t02.dart
index eb42574..2ad9867 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -151,5 +148,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t03.dart
index 11cc4fa..2cb3e5e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A43_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,6 +121,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t01.dart
index cfbe930..5205b50 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,7 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -142,5 +140,19 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 =
+      new ArgumentsBindingGen<T1>(forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2 = new ArgumentsBindingGen<T1>.named(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(forgetType(t0Instance),
+      t2: forgetType(t0Instance));
+  instance2.testSetter = forgetType(t0Instance);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t02.dart
index c54f71d..6b8a595 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -151,5 +148,14 @@
 
   // Test type parameters
 
-}
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  c2 = new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
 
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
+  c2.superGetter;
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t03.dart
index 7039648..0b61fb3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_arguments_binding_A44_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,6 +121,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(forgetType(t0Instance), t1Instance);
+  c2.superTest(forgetType(t0Instance));
+  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t01.dart
index 5fa41f4..010d22b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -52,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -138,7 +134,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
   c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -146,5 +141,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t02.dart
index f05db4e..0bdc956 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -52,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -121,12 +117,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
   c2 = new ClassMember2_t02<T1>.short();
   c2 = new ClassMember2_t02<T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t03.dart
index 9738a06..97002bb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A01_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -52,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -89,10 +85,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t01.dart
index def081b..dd18b0d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -139,7 +135,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
   c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -147,5 +142,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t02.dart
index 85cecf4..b966ee6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -122,12 +118,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
   c2 = new ClassMember2_t02<T1>.short();
   c2 = new ClassMember2_t02<T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t03.dart
index bbd31e5..90004dc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A02_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -90,10 +86,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t01.dart
index 6079aef..a57e424 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -139,7 +135,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
   c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -147,5 +142,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t02.dart
index 93f2a36..2d11e9d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -122,12 +118,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
   c2 = new ClassMember2_t02<T1>.short();
   c2 = new ClassMember2_t02<T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t03.dart
index 136bef3..a51b855 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A03_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -90,10 +86,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t01.dart
index f009e72..5c5c784 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -54,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -140,7 +136,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
   c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -148,5 +143,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t02.dart
index 7b8d93f..58404d8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -54,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -123,12 +119,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
   c2 = new ClassMember2_t02<T1>.short();
   c2 = new ClassMember2_t02<T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t03.dart
index 59bc8ee..77200d6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A04_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -54,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -91,10 +87,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t01.dart
index eb268c1..fd808de 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -86,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -171,5 +168,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t02.dart
index 7e73ae1..12e306d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -86,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -154,5 +151,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t03.dart
index aa1f640..e301f83 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A11_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -86,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -122,5 +119,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t01.dart
index ae326d0..5cbff21 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -173,5 +170,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t02.dart
index e89d664..d49f15b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -156,5 +153,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t03.dart
index bead152..781a176 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A12_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,5 +121,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t01.dart
index 6f04711..cab90e1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -173,5 +170,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t02.dart
index 2f814ad..d285ebc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -156,5 +153,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t03.dart
index d1c458e..e13943d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A13_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,5 +121,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t01.dart
index 30c8d13..a5f898e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -173,5 +170,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t02.dart
index d6ac85a..fe7a296 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -156,5 +153,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t03.dart
index 2624fa3..b90f1b1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A14_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,5 +121,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t01.dart
index 0b35838..b6f2f75 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -91,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -176,5 +173,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t02.dart
index 5b368f1..da8a5c1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t02.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -91,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -159,5 +156,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t03.dart
index 883706b..30ef06a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A21_t03.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -91,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -127,5 +124,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t01.dart
index e7fe25c..2961b0b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -94,8 +93,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -179,5 +176,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t02.dart
index 4352804..a460a42 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t02.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -94,8 +93,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -162,5 +159,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t03.dart
index 36cef03..b842865 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A22_t03.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -94,8 +93,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -130,5 +127,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t01.dart
index 927bda5..99f922e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -93,8 +92,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -178,5 +175,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t02.dart
index 4c91f5b..0f482a3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t02.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -93,8 +92,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -161,5 +158,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t03.dart
index 07cb22f..09f0052 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A23_t03.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -93,8 +92,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -129,5 +126,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t01.dart
index 10b8e91..626a8dd 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -92,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -177,5 +174,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t02.dart
index 8772437..e923fc8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t02.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -92,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -160,5 +157,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t03.dart
index b79467c..f9846e2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A24_t03.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -92,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -128,5 +125,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t01.dart
index 35d8433..7664f7e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -173,5 +170,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t02.dart
index 8f0661a..e1be996 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -156,5 +153,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t03.dart
index b117426..77640ef 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A31_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,5 +121,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t01.dart
index 9163e51..eb79d36 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -173,5 +174,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t02.dart
index dca3131..888b2ca 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -156,5 +157,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t03.dart
index d026da5..89900a5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A32_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,5 +125,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t01.dart
index 7427003..df7a822 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -173,5 +174,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t02.dart
index 47cf1b3..e8b28e1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -156,5 +157,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t03.dart
index edfa5f2..8448e23 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A33_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,5 +125,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t01.dart
index e4a1faf..7b31eae 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -173,5 +170,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t02.dart
index d02c959..6d68334 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -156,5 +153,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t03.dart
index 29d5fec..4409cec 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A34_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -124,5 +121,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t01.dart
index 656c1fd..a0f2603 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -155,5 +152,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t02.dart
index bff71d8..d67be2a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -138,5 +135,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t03.dart
index 4072456..9d88fbb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A41_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -106,5 +103,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t01.dart
index aae68f0..e85077d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -155,5 +152,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t02.dart
index 254a8a2..2c410c8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -138,5 +135,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t03.dart
index ebda541..5864edc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A42_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -106,5 +103,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t01.dart
index d75c78f..dad4c2a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -155,5 +152,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t02.dart
index 35f78d2..437e5b5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -138,5 +135,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t03.dart
index 66946da..c800acf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A43_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -106,5 +103,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t01.dart
index dbebde1..d3aba54 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -155,5 +152,11 @@
 
   // Test type parameters
 
+  ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
+  c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
+  forgetType(t0Instance));
+  c2 = new ClassMember2_t01<T1>.named(forgetType(t0Instance));
+  c2.m = forgetType(t0Instance);
+  c2.test(forgetType(t0Instance));
+  c2.getter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t02.dart
index 339d2ce..c0feab3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t02.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -138,5 +135,10 @@
 
   // Test type parameters
 
+  ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
+  c2 = new ClassMember2_t02<T1>.short();
+  c2 = new ClassMember2_t02<T1>.named();
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t03.dart
index f3d2323..7788591 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_class_member_A44_t03.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -106,5 +103,8 @@
 
   // Test type parameters
 
+  ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
+  c2.m = forgetType(t0Instance);
+  c2.test();
+  c2.superSetter = forgetType(t0Instance);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t01.dart
index aa3c0ec..6daaba9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t01.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -194,7 +192,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -213,7 +210,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -223,7 +219,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t02.dart
index 70edb23..fc9b290 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t02.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -286,7 +284,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -318,5 +315,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t03.dart
index 4133fa8..0e5cd46 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A01_t03.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -255,7 +253,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -282,5 +279,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t01.dart
index 5b27e09..11cbfc9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t01.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -52,7 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -195,7 +193,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -214,7 +211,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -224,7 +220,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t02.dart
index 8d65f23..3bf3984 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t02.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -52,7 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -287,7 +285,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -319,5 +316,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t03.dart
index e0e1a3c..45b3368 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A02_t03.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -52,7 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -256,7 +254,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -283,5 +280,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t01.dart
index b3ccf30..89de097 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t01.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -194,7 +192,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -213,7 +210,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -223,7 +219,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t02.dart
index 62948d7..f99c19a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t02.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -286,7 +284,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -318,5 +315,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t03.dart
index dd54930..0edce2c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A03_t03.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -255,7 +253,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -282,5 +279,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t01.dart
index 0492e7e..e33d642 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t01.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -194,7 +192,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -213,7 +210,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -223,7 +219,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t02.dart
index f4f8634..7b89aca 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t02.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -286,7 +284,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -318,5 +315,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t03.dart
index 889f477..52d7937 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A04_t03.dart
@@ -21,11 +21,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -255,7 +253,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -282,5 +279,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t01.dart
index 8d3f016..7d6b504 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t01.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -224,10 +222,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t02.dart
index cfd0c82..8a8505a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t02.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -316,5 +314,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t03.dart
index b2ee38d..8f64f66 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A05_t03.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -285,5 +283,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t01.dart
index 5912ebe..c35babf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t01.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -224,10 +222,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t02.dart
index 78e7f25..d6e5cc9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t02.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -316,5 +314,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t03.dart
index efe6348..f544cb7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A06_t03.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -285,5 +283,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t01.dart
index e3e8a31..8ad0f6e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t01.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -224,10 +222,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t02.dart
index 6675217..6162cf0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t02.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -316,5 +314,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t03.dart
index f477145..93a07fa 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A07_t03.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -285,5 +283,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t01.dart
index ace4ddb..f42597c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t01.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -79,7 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -222,10 +220,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t02.dart
index 596f281..d71019a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t02.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -79,7 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -314,5 +312,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t03.dart
index 55f811e..4b375bb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A08_t03.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -79,7 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -283,5 +281,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t01.dart
index 7af496a..faf680c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t01.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -197,7 +195,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -216,7 +213,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -226,7 +222,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t02.dart
index bbbc03d..1b2b7db 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t02.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -289,7 +287,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -321,5 +318,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t03.dart
index 31018e6..0e483e5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A11_t03.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -258,7 +256,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -285,5 +282,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t01.dart
index fc282e9..5227843 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t01.dart
@@ -25,11 +25,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -225,10 +223,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t02.dart
index 637204f..ad31fd4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t02.dart
@@ -25,11 +25,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -317,5 +315,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t03.dart
index f086d97..006eee3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A12_t03.dart
@@ -25,11 +25,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -286,5 +284,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t01.dart
index fe95405..2c08664 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t01.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -197,7 +195,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -216,7 +213,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -226,7 +222,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t02.dart
index a8b0e78..35c9faf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t02.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -289,7 +287,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -321,5 +318,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t03.dart
index 4a9ed13..8993fcb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A21_t03.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -258,7 +256,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -285,5 +282,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t01.dart
index 879ec40..672b6a9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t01.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -224,10 +222,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t02.dart
index 9426c47..2160cb0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t02.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -316,5 +314,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t03.dart
index 3431517..be943e7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A22_t03.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -285,5 +283,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t01.dart
index 4f86d8d..c93a78c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t01.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -66,13 +65,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -215,10 +214,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t02.dart
index c5580f3..c044375 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t02.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -66,13 +65,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -307,5 +306,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t03.dart
index e444671..c6e1ea1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A31_t03.dart
@@ -24,11 +24,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -66,13 +65,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -276,5 +275,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t01.dart
index 026cdd9..87bb964 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t01.dart
@@ -25,11 +25,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -225,10 +223,36 @@
 
   // Test type parameters
 
+  // Test generic functions
+  Expect.throws(() {
+    namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.named(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // Test instance methods and setters
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
+    t2: forgetType(t0Instance));
+    }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
 
   // Test superclass constructor call
   Expect.throws(() {
     new ArgumentsBindingDesc(t0Instance);
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t02.dart
index 6edc45a..91b13ed 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t02.dart
@@ -25,11 +25,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -317,5 +315,35 @@
 
   // Test type parameters
 
-}
+  // test generic class constructors
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>.c5(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t02<T1>(t1Instance).superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t02<T1>(t1Instance).test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t03.dart
index 19aa5a9..0d32fe9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_arguments_binding_fail_A32_t03.dart
@@ -25,11 +25,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -286,5 +284,30 @@
 
   // Test type parameters
 
-}
+  // test generic class members
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
 
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t0Instance), val2: forgetType(t1Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superTestNamed(forgetType(t1Instance), val2: forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ArgumentsBinding2_t03<T1>().superGetter;
+  }, (e) => e is TypeError);
+
+  new ArgumentsBinding2_t03<T1>().test();
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t01.dart
index e1d5470..93b0dd5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t01.dart
@@ -21,11 +21,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -203,7 +201,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -223,7 +220,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -268,5 +264,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t02.dart
index 447f5c9..a409e24 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t02.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -143,7 +141,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -165,5 +162,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t03.dart
index 43c9e83..d7a7548 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A01_t03.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -106,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -119,5 +116,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t01.dart
index 51d054f..11f15b8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t01.dart
@@ -21,11 +21,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -52,7 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -204,7 +202,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -224,7 +221,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -269,5 +265,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t02.dart
index 1c43ece..df44324 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t02.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -52,7 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -144,7 +142,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -166,5 +163,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t03.dart
index da2822d..a0ae838 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A02_t03.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -52,7 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -107,7 +105,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -120,5 +117,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t01.dart
index 83b1abf..d461e82 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t01.dart
@@ -21,11 +21,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -203,7 +201,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -223,7 +220,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -268,5 +264,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t02.dart
index 8b2b2f3..570d0cc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t02.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -143,7 +141,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -165,5 +162,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t03.dart
index a5e215a..b1ec044 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A03_t03.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -106,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -119,5 +116,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t01.dart
index 6d5c32f..8d0c988 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t01.dart
@@ -21,11 +21,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -203,7 +201,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -223,7 +220,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -268,5 +264,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t02.dart
index 5b63285..f4e4caa 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t02.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -143,7 +141,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -165,5 +162,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t03.dart
index 5148a97..4204141 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A04_t03.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -106,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -119,5 +116,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t01.dart
index 71b67c1..b05a9de 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t01.dart
@@ -24,11 +24,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -233,7 +231,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -253,5 +250,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t02.dart
index a9eaa2d..60f1801 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t02.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -173,5 +171,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t03.dart
index 2a17519..affb9cd 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A05_t03.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -136,5 +134,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t01.dart
index c6c4cbb..90aeaf9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t01.dart
@@ -24,11 +24,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -233,7 +231,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -253,5 +250,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t02.dart
index 21caf39..fa69fb7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t02.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -173,5 +171,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t03.dart
index e1fa78f..d24907b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A06_t03.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -136,5 +134,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t01.dart
index 043c651..9770ef3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t01.dart
@@ -24,11 +24,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -233,7 +231,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -253,5 +250,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t02.dart
index 5fc4961..4d4a4b7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t02.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -173,5 +171,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t03.dart
index f3edc84..60dd815 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A07_t03.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -136,5 +134,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t01.dart
index a4ee124..4b44705 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t01.dart
@@ -24,11 +24,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -79,7 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -231,7 +229,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -251,5 +248,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t02.dart
index ed636c0..47e26af 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t02.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -79,7 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -171,5 +169,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t03.dart
index 8ab514f..506e4c0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A08_t03.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -79,7 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -134,5 +132,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t01.dart
index 1b2c184..6bf6100 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t01.dart
@@ -24,11 +24,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -206,7 +204,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -226,7 +223,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -271,5 +267,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t02.dart
index 7353b61..9611bbb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t02.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -146,7 +144,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -168,5 +165,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t03.dart
index 142478b..9e2b8b7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A11_t03.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -109,7 +107,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -122,5 +119,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t01.dart
index 507e022..0b0c6e2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t01.dart
@@ -25,11 +25,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -234,7 +232,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -254,5 +251,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t02.dart
index 5c1c95f..7f9c4fe 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t02.dart
@@ -25,11 +25,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -174,5 +172,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t03.dart
index 9bd5d1a..4fe97cb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A12_t03.dart
@@ -25,11 +25,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -137,5 +135,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t01.dart
index e0b5e2b..1bbea26 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t01.dart
@@ -24,11 +24,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -206,7 +204,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -226,7 +223,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -271,5 +267,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t02.dart
index 54f7635..d8f7426 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t02.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -146,7 +144,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -168,5 +165,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t03.dart
index 2d3c8fc..4501309 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A21_t03.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -109,7 +107,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -122,5 +119,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t01.dart
index c9754dc..f556c1b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t01.dart
@@ -24,11 +24,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -233,7 +231,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -253,5 +250,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t02.dart
index aab7c2c..78a5ef8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t02.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -173,5 +171,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t03.dart
index 5e53513..01db1bc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A22_t03.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -136,5 +134,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t01.dart
index f0b69e7..f81b628 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t01.dart
@@ -24,11 +24,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -66,13 +65,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -224,7 +223,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -244,5 +242,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t02.dart
index 8d6913d..9d6c80d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t02.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -66,13 +65,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -164,5 +163,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t03.dart
index c48bcc6..fc5916f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A31_t03.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -66,13 +65,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -127,5 +126,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t01.dart
index efbe4b2..038d779 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t01.dart
@@ -25,11 +25,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -234,7 +232,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -254,5 +251,48 @@
 
   // Test type parameters
 
-}
+  // Test getters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
+  }, (e) => e is TypeError);
 
+  // Test methods
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).test(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test setters
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t1Instance).setter = t0Instance;
+  }, (e) => e is TypeError);
+
+  // Test class variables
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+
+  // Test constructors
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPublic<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>(t0Instance);
+  }, (e) => e is TypeError);
+
+  Expect.throws(() {
+    new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
+  }, (e) => e is TypeError);
+}
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t02.dart
index 320d956..07fe9a4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t02.dart
@@ -25,11 +25,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -174,5 +172,25 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t02<T1>();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.short();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>.named();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t02<T1>().test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t03.dart
index e82ab52..4561b9c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_class_member_fail_A32_t03.dart
@@ -25,11 +25,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -137,5 +135,16 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).superSetter = forgetType(t0Instance);
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test1();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ClassMember2_t03<T1>(t1Instance).test2();
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A01_t01.dart
index 0fbc80c..80eb6d9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A01_t01.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A02_t01.dart
index 80178a1..5b96038 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A02_t01.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -52,7 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A03_t01.dart
index b8e8c1d..105f08e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A03_t01.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A04_t01.dart
index 8fb5fbf..e3621e8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A04_t01.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A05_t01.dart
index cacfe8d..51f9741 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A05_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -123,4 +121,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A06_t01.dart
index cfd67c3..adff30b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A06_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -123,4 +121,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A07_t01.dart
index 9913835..13c781c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A07_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -123,4 +121,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A08_t01.dart
index 0a237b3..6219e7c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A08_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -79,7 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -121,4 +119,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A11_t01.dart
index ddc28fb..7e96298 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A11_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A12_t01.dart
index 78a9a79..8553bd9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A12_t01.dart
@@ -25,11 +25,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -124,4 +122,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A21_t01.dart
index 0cca66c..332a7c9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A21_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A22_t01.dart
index 567cb56..20eaf46 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A22_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -123,4 +121,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A31_t01.dart
index f85e297..96d2861 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A31_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -66,13 +65,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -114,4 +113,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A32_t01.dart
index ff33ea7..6c57d47 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_global_variable_fail_A32_t01.dart
@@ -25,11 +25,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -124,4 +122,3 @@
     GlobalVariableTest.test();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A01_t01.dart
index 2099723..b95a42d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A01_t01.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A02_t01.dart
index c5e1258..3eca8c1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A02_t01.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -52,7 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A03_t01.dart
index 3f247c6..59deaa1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A03_t01.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A04_t01.dart
index fb26871..9c4d687 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A04_t01.dart
@@ -21,11 +21,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A05_t01.dart
index 2db59f7..5cac97f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A05_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -124,4 +122,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A06_t01.dart
index f80bb9c..178cd0f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A06_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -124,4 +122,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A07_t01.dart
index 8a6e759..ca1080b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A07_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -124,4 +122,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A08_t01.dart
index 7221ed1..4471456 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A08_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -79,7 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -122,4 +120,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A11_t01.dart
index 13b49dc..a6d052d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A11_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A12_t01.dart
index 53743eb..1b810d0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A12_t01.dart
@@ -25,11 +25,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -125,4 +123,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A21_t01.dart
index 55ecc3b..91b9e32 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A21_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A22_t01.dart
index 9f118b1..6d1348d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A22_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -124,4 +122,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A31_t01.dart
index c2790a7..4bb77dc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A31_t01.dart
@@ -24,11 +24,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -66,13 +65,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -115,4 +114,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A32_t01.dart
index 34aa48c..1ecf3a0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_local_variable_fail_A32_t01.dart
@@ -25,11 +25,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -125,4 +123,3 @@
     LocalVariableTest.staticTest();
   }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A01_t01.dart
index f7dbde6..4cdb9b2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A01_t01.dart
@@ -21,11 +21,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -89,12 +87,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A02_t01.dart
index 1a287c5..b9ff421 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A02_t01.dart
@@ -21,11 +21,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -52,7 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -90,12 +88,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A03_t01.dart
index 225e591..275fbb4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A03_t01.dart
@@ -21,11 +21,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -89,12 +87,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A04_t01.dart
index 989cd59..b9fd2a0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A04_t01.dart
@@ -21,11 +21,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -51,7 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -89,12 +87,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A05_t01.dart
index a34f6ec..ebd96d8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A05_t01.dart
@@ -24,11 +24,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -119,5 +117,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A06_t01.dart
index 044269f..8d471ec 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A06_t01.dart
@@ -24,11 +24,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -119,5 +117,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A07_t01.dart
index d0186c1..f548e2a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A07_t01.dart
@@ -24,11 +24,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -119,5 +117,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A08_t01.dart
index 463ed13..8a9b1ac 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A08_t01.dart
@@ -24,11 +24,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -79,7 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -117,5 +115,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A11_t01.dart
index 3908ac8..027bad3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A11_t01.dart
@@ -24,11 +24,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -92,12 +90,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A12_t01.dart
index 99af20d..c4bfac5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A12_t01.dart
@@ -25,11 +25,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -120,5 +118,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A21_t01.dart
index 94c4fbc..ec2ca94 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A21_t01.dart
@@ -24,11 +24,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -54,7 +53,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -92,12 +90,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A22_t01.dart
index 3617bdc..d6fce48 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A22_t01.dart
@@ -24,11 +24,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -81,7 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -119,5 +117,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A31_t01.dart
index 27cab2d..e11eee9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A31_t01.dart
@@ -24,11 +24,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -66,13 +65,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -110,5 +109,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A32_t01.dart
index 1b5e3f9..cda5bf5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_fail_return_value_fail_A32_t01.dart
@@ -25,11 +25,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -82,7 +81,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -120,5 +118,10 @@
 
   // Test type parameters
 
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testMethod();
+  }, (e) => e is TypeError);
+  Expect.throws(() {
+    new ReturnValueGen<T1>().testGetter;
+  }, (e) => e is TypeError);
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A01_t01.dart
index 0d51b45..c72c962 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A01_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -52,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A02_t01.dart
index 11e312d..6e9d5d7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A02_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A03_t01.dart
index c3ebe22..cdb1e18 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A03_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A04_t01.dart
index fecf194..10551e7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A04_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -54,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A11_t01.dart
index 63cbccc..76e9198 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A11_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -86,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -113,4 +110,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A12_t01.dart
index cd4d8a2..cae5c1e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A12_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -115,4 +112,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A13_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A13_t01.dart
index 2097294..e7e02f5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A13_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -115,4 +112,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A14_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A14_t01.dart
index 485f052..ac4f19d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A14_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -115,4 +112,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A21_t01.dart
index ab902e0..c64fb5f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A21_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -91,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -118,4 +115,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A22_t01.dart
index f072b55..c6dfff7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A22_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -94,8 +93,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -121,4 +118,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A23_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A23_t01.dart
index e3066f3..7e5b99c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A23_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -93,8 +92,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -120,4 +117,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A24_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A24_t01.dart
index eed7fc5..13eaa37 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A24_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A24_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -92,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -119,4 +116,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A31_t01.dart
index 5289e2d..5fc3d48 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A31_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -115,4 +112,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A32_t01.dart
index e950d17..e9c200c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A32_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -115,4 +116,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A33_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A33_t01.dart
index 831eb89..b75f43a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A33_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -115,4 +116,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A34_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A34_t01.dart
index 5660795..d6e08ce 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A34_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A34_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -115,4 +112,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A41_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A41_t01.dart
index 2ceaa50..5d9355b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A41_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -97,4 +94,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A42_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A42_t01.dart
index 566d8e5..83c4a09 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A42_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -97,4 +94,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A43_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A43_t01.dart
index 45e8321..03373a6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A43_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -97,4 +94,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A44_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A44_t01.dart
index c481aeb..73e80bb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A44_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_global_variable_A44_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -97,4 +94,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A01_t01.dart
index f41ad8d..90fb02b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A01_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -52,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A02_t01.dart
index 468a753..d5364cf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A02_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A03_t01.dart
index 9ae5b2d..bab0a0c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A03_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A04_t01.dart
index acf1b65..8e8efd5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A04_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -54,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A11_t01.dart
index 5c9210e..be2103a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A11_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -86,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -119,4 +116,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A12_t01.dart
index b7fb45c..4d34111 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A12_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -121,4 +118,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A13_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A13_t01.dart
index c22983a..599a7b9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A13_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -121,4 +118,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A14_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A14_t01.dart
index 07c6169..c4638eb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A14_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -121,4 +118,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A21_t01.dart
index f738204..ea18db9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A21_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -91,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -124,4 +121,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A22_t01.dart
index 546db0d..c7cc35a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A22_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -94,8 +93,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -127,4 +124,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A23_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A23_t01.dart
index ea1a714..81fc167 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A23_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -93,8 +92,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -126,4 +123,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A24_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A24_t01.dart
index 39acfa4..a0d1480 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A24_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A24_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -92,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -125,4 +122,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A31_t01.dart
index f386519..7905544 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A31_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -121,4 +118,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A32_t01.dart
index 9e7f968..287645c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A32_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -121,4 +122,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A33_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A33_t01.dart
index 7c3a45f..16d8b02 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A33_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -121,4 +122,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A34_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A34_t01.dart
index 7e3d661..e3ea801 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A34_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A34_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -121,4 +118,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A41_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A41_t01.dart
index 33a3fd2..f59fab9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A41_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -103,4 +100,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A42_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A42_t01.dart
index e97fa1d..3da6851 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A42_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -103,4 +100,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A43_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A43_t01.dart
index df7cdcf..e50207b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A43_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -103,4 +100,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A44_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A44_t01.dart
index 305b11c..a66a57d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A44_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_local_variable_A44_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -103,4 +100,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A01_t01.dart
index 68f8a3d..e41ea16 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A01_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -52,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -70,7 +66,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -84,8 +79,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1>().testMethod();
   new ReturnValueGen<T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A02_t01.dart
index e4c8f7a..8b5be36 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A02_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,7 +67,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -85,8 +80,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1>().testMethod();
   new ReturnValueGen<T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A03_t01.dart
index 6b943b6..1df3ab7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A03_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -53,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,7 +67,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -85,8 +80,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1>().testMethod();
   new ReturnValueGen<T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A04_t01.dart
index 10dfdef..dd4885a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A04_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -54,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -72,7 +68,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -86,8 +81,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1>().testMethod();
   new ReturnValueGen<T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A11_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A11_t01.dart
index 088befa..bdb27ad 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A11_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -86,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -103,7 +100,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -117,5 +113,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A12_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A12_t01.dart
index 5a46d5f..e968783 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A12_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -105,7 +102,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -119,5 +115,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A13_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A13_t01.dart
index f908f5d..568f829 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A13_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -105,7 +102,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -119,5 +115,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A14_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A14_t01.dart
index 4b49a9a..10dbc5e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A14_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -105,7 +102,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -119,5 +115,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A21_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A21_t01.dart
index 0c01c80..bb3b689 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A21_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -91,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -108,7 +105,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -122,5 +118,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A22_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A22_t01.dart
index 382d706..82ab973 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A22_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -94,8 +93,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -111,7 +108,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -125,5 +121,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A23_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A23_t01.dart
index 7779155..fddc972 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A23_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -93,8 +92,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -110,7 +107,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -124,5 +120,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A24_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A24_t01.dart
index aa97ab7..b14cf83 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A24_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A24_t01.dart
@@ -23,11 +23,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -92,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -109,7 +106,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -123,5 +119,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A31_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A31_t01.dart
index 801152f..3bed97a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A31_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -105,7 +102,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -119,5 +115,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A32_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A32_t01.dart
index 1a3637f..d3400ad 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A32_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -105,7 +106,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -119,5 +119,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A33_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A33_t01.dart
index 21aecc6..0955eec 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A33_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,26 +69,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -105,7 +106,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -119,5 +119,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A34_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A34_t01.dart
index 9fe6054..9200520 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A34_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A34_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -88,8 +87,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -105,7 +102,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -119,5 +115,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A41_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A41_t01.dart
index 0868aa9..623ceac 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A41_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -87,7 +84,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -101,5 +97,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A42_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A42_t01.dart
index e53fdb8..9ee700d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A42_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -87,7 +84,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -101,5 +97,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A43_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A43_t01.dart
index f5653f9..b97d039 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A43_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -87,7 +84,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -101,5 +97,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A44_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A44_t01.dart
index ba39415..7d2c63d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A44_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/positional_function_types_return_value_A44_t01.dart
@@ -22,11 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -70,8 +69,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -87,7 +84,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -101,5 +97,6 @@
 
   // Test type parameters
 
+  new ReturnValueGen<T1>().testMethod();
+  new ReturnValueGen<T1>().testGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t01.dart
index d17c9d1..14283f8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +31,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
 namedArgumentsFunc1((num, num, String?) t1, {(num, num, String?) t2 = t1Default}) {}
 positionalArgumentsFunc1((num, num, String?) t1, [(num, num, String?) t2 = t1Default]) {}
 
@@ -105,7 +102,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<(num, num, String?)>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +117,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t02.dart
index 50152a5..ec82ef0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (num, num, String?) m;
 
@@ -114,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<(num, num, String?)> c2 =
     new ArgumentsBinding2_t02<(num, num, String?)>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<(num, num, String?)>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t03.dart
index e4d8ac8..556787c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   (num, num, String?) m = t1Default;
 
@@ -87,12 +83,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<(num, num, String?)> c2 = new ArgumentsBinding2_t03<(num, num, String?)>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t01.dart
index 88af188..dd5283a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,8 +33,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
 namedArgumentsFunc1((num, num, String?, {num n1, String? n2}) t1, {(num, num, String?, {num n1, String? n2}) t2 = t1Default}) {}
 positionalArgumentsFunc1((num, num, String?, {num n1, String? n2}) t1, [(num, num, String?, {num n1, String? n2}) t2 = t1Default]) {}
 
@@ -107,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<(num, num, String?, {num n1, String? n2})>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -123,5 +119,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t02.dart
index 399d00c..870e90d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (num, num, String?, {num n1, String? n2}) m;
 
@@ -116,7 +112,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<(num, num, String?, {num n1, String? n2})> c2 =
     new ArgumentsBinding2_t02<(num, num, String?, {num n1, String? n2})>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<(num, num, String?, {num n1, String? n2})>.c2(t1Instance, forgetType(t0Instance));
@@ -127,5 +122,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t03.dart
index 167570f..56e98ca 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   (num, num, String?, {num n1, String? n2}) m = t1Default;
 
@@ -89,12 +85,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<(num, num, String?, {num n1, String? n2})> c2 = new ArgumentsBinding2_t03<(num, num, String?, {num n1, String? n2})>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t01.dart
index 8917af3..823e1a2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,8 +31,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
 namedArgumentsFunc1(({String? z, num y, num x}) t1, {({String? z, num y, num x}) t2 = t1Default}) {}
 positionalArgumentsFunc1(({String? z, num y, num x}) t1, [({String? z, num y, num x}) t2 = t1Default]) {}
 
@@ -105,7 +102,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<({String? z, num y, num x})>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -121,5 +117,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t02.dart
index 156993f..e6e4023 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   ({String? z, num y, num x}) m;
 
@@ -114,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<({String? z, num y, num x})> c2 =
     new ArgumentsBinding2_t02<({String? z, num y, num x})>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<({String? z, num y, num x})>.c2(t1Instance, forgetType(t0Instance));
@@ -125,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t03.dart
index 170b175..311363a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_arguments_binding_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   ({String? z, num y, num x}) m = t1Default;
 
@@ -87,12 +83,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<({String? z, num y, num x})> c2 = new ArgumentsBinding2_t03<({String? z, num y, num x})>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t01.dart
index 098cbe9..36175f7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class ClassMember1_t01 {
   static (num, num, String?) s = forgetType(t0Instance);
   (num, num, String?) m = forgetType(t0Instance);
@@ -118,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<(num, num, String?)> c2 = new ClassMember2_t01<(num, num, String?)>();
   c2 = new ClassMember2_t01<(num, num, String?)>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t02.dart
index e41dc2c..6d55625 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class ClassMemberSuper1_t02 {
   (num, num, String?) m;
 
@@ -101,12 +97,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<(num, num, String?)> c2 = new ClassMember2_t02<(num, num, String?)>();
   c2 = new ClassMember2_t02<(num, num, String?)>.short();
   c2 = new ClassMember2_t02<(num, num, String?)>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t03.dart
index 41b3d5d..a5f0624 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class ClassMemberMixin1_t03 {
   (num, num, String?) m = t1Default;
 
@@ -69,10 +65,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<(num, num, String?)> c2 = new ClassMember2_t03<(num, num, String?)>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t01.dart
index 08057f4..57dfa8f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class ClassMember1_t01 {
   static (num, num, String?, {num n1, String? n2}) s = forgetType(t0Instance);
   (num, num, String?, {num n1, String? n2}) m = forgetType(t0Instance);
@@ -120,7 +116,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<(num, num, String?, {num n1, String? n2})> c2 = new ClassMember2_t01<(num, num, String?, {num n1, String? n2})>();
   c2 = new ClassMember2_t01<(num, num, String?, {num n1, String? n2})>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -128,5 +123,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t02.dart
index f145d25..0c87c34 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class ClassMemberSuper1_t02 {
   (num, num, String?, {num n1, String? n2}) m;
 
@@ -103,12 +99,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<(num, num, String?, {num n1, String? n2})> c2 = new ClassMember2_t02<(num, num, String?, {num n1, String? n2})>();
   c2 = new ClassMember2_t02<(num, num, String?, {num n1, String? n2})>.short();
   c2 = new ClassMember2_t02<(num, num, String?, {num n1, String? n2})>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t03.dart
index 08f4219..f59bf0a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class ClassMemberMixin1_t03 {
   (num, num, String?, {num n1, String? n2}) m = t1Default;
 
@@ -71,10 +67,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<(num, num, String?, {num n1, String? n2})> c2 = new ClassMember2_t03<(num, num, String?, {num n1, String? n2})>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t01.dart
index 0b0d811..71e04b5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class ClassMember1_t01 {
   static ({String? z, num y, num x}) s = forgetType(t0Instance);
   ({String? z, num y, num x}) m = forgetType(t0Instance);
@@ -118,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<({String? z, num y, num x})> c2 = new ClassMember2_t01<({String? z, num y, num x})>();
   c2 = new ClassMember2_t01<({String? z, num y, num x})>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -126,5 +121,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t02.dart
index 7440af0..094be4d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class ClassMemberSuper1_t02 {
   ({String? z, num y, num x}) m;
 
@@ -101,12 +97,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<({String? z, num y, num x})> c2 = new ClassMember2_t02<({String? z, num y, num x})>();
   c2 = new ClassMember2_t02<({String? z, num y, num x})>.short();
   c2 = new ClassMember2_t02<({String? z, num y, num x})>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t03.dart
index 7b9f221..9cb65ce 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_class_member_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class ClassMemberMixin1_t03 {
   ({String? z, num y, num x}) m = t1Default;
 
@@ -69,10 +65,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<({String? z, num y, num x})> c2 = new ClassMember2_t03<({String? z, num y, num x})>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t01.dart
index 11139f5..81ac2f0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 namedArgumentsFunc1((int, String) t1, {(int, String) t2 = t1Default}) {}
 positionalArgumentsFunc1((int, String) t1, [(int, String) t2 = t1Default]) {}
 
@@ -176,7 +173,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<(int, String)>(t1Instance, t2: forgetType(t0Instance));
@@ -195,7 +191,6 @@
     new ArgumentsBindingClassGen<(int, String)>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int, String)>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -205,7 +200,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int, String)>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t02.dart
index 44b7acf..079e4d7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class ArgumentsBindingSuper1_t02 {
   (int, String) m;
 
@@ -268,7 +265,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<(int, String)>(forgetType(t0Instance));
@@ -300,5 +296,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<(int, String)>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t03.dart
index 2855cdd..bc51ceb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest((int, String) val) {}
   void superTestPositioned((int, String) val, [(int, String) val2 = t1Default]) {}
@@ -237,7 +234,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<(int, String)>().superTest(forgetType(t0Instance));
@@ -264,5 +260,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<(int, String)>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t01.dart
index f9b9ae5..43d0b22 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
 namedArgumentsFunc1((int, String, bool) t1, {(int, String, bool) t2 = t1Default}) {}
 positionalArgumentsFunc1((int, String, bool) t1, [(int, String, bool) t2 = t1Default]) {}
 
@@ -176,7 +173,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<(int, String, bool)>(t1Instance, t2: forgetType(t0Instance));
@@ -195,7 +191,6 @@
     new ArgumentsBindingClassGen<(int, String, bool)>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int, String, bool)>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -205,7 +200,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int, String, bool)>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t02.dart
index 19e9e47..fcf7259 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
 class ArgumentsBindingSuper1_t02 {
   (int, String, bool) m;
 
@@ -268,7 +265,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<(int, String, bool)>(forgetType(t0Instance));
@@ -300,5 +296,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<(int, String, bool)>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t03.dart
index a96f644..5249c0d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest((int, String, bool) val) {}
   void superTestPositioned((int, String, bool) val, [(int, String, bool) val2 = t1Default]) {}
@@ -237,7 +234,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<(int, String, bool)>().superTest(forgetType(t0Instance));
@@ -264,5 +260,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<(int, String, bool)>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t01.dart
index 2003f74..6109785 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 namedArgumentsFunc1((int i, String s) t1, {(int i, String s) t2 = t1Default}) {}
 positionalArgumentsFunc1((int i, String s) t1, [(int i, String s) t2 = t1Default]) {}
 
@@ -176,7 +173,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<(int i, String s)>(t1Instance, t2: forgetType(t0Instance));
@@ -195,7 +191,6 @@
     new ArgumentsBindingClassGen<(int i, String s)>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int i, String s)>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -205,7 +200,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int i, String s)>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t02.dart
index 7d1f4b8..41902a1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class ArgumentsBindingSuper1_t02 {
   (int i, String s) m;
 
@@ -268,7 +265,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<(int i, String s)>(forgetType(t0Instance));
@@ -300,5 +296,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<(int i, String s)>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t03.dart
index adaaa5f..f9beb1f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest((int i, String s) val) {}
   void superTestPositioned((int i, String s) val, [(int i, String s) val2 = t1Default]) {}
@@ -237,7 +234,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<(int i, String s)>().superTest(forgetType(t0Instance));
@@ -264,5 +260,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<(int i, String s)>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t01.dart
index 871c9fd..6b2ec52 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 namedArgumentsFunc1((int i, String s, {bool b}) t1, {(int i, String s, {bool b}) t2 = t1Default}) {}
 positionalArgumentsFunc1((int i, String s, {bool b}) t1, [(int i, String s, {bool b}) t2 = t1Default]) {}
 
@@ -176,7 +173,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<(int i, String s, {bool b})>(t1Instance, t2: forgetType(t0Instance));
@@ -195,7 +191,6 @@
     new ArgumentsBindingClassGen<(int i, String s, {bool b})>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int i, String s, {bool b})>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -205,7 +200,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int i, String s, {bool b})>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t02.dart
index 6e9fd7e..a58ae4d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class ArgumentsBindingSuper1_t02 {
   (int i, String s, {bool b}) m;
 
@@ -268,7 +265,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<(int i, String s, {bool b})>(forgetType(t0Instance));
@@ -300,5 +296,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<(int i, String s, {bool b})>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t03.dart
index 46db6ec..87e09df 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A04_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest((int i, String s, {bool b}) val) {}
   void superTestPositioned((int i, String s, {bool b}) val, [(int i, String s, {bool b}) val2 = t1Default]) {}
@@ -237,7 +234,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<(int i, String s, {bool b})>().superTest(forgetType(t0Instance));
@@ -264,5 +260,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<(int i, String s, {bool b})>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t01.dart
index 72c55dd..591ba8e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
 namedArgumentsFunc1((int i, String s, {bool b1}) t1, {(int i, String s, {bool b1}) t2 = t1Default}) {}
 positionalArgumentsFunc1((int i, String s, {bool b1}) t1, [(int i, String s, {bool b1}) t2 = t1Default]) {}
 
@@ -176,7 +173,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<(int i, String s, {bool b1})>(t1Instance, t2: forgetType(t0Instance));
@@ -195,7 +191,6 @@
     new ArgumentsBindingClassGen<(int i, String s, {bool b1})>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int i, String s, {bool b1})>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -205,7 +200,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int i, String s, {bool b1})>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t02.dart
index 2942578..91e0ae0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
 class ArgumentsBindingSuper1_t02 {
   (int i, String s, {bool b1}) m;
 
@@ -268,7 +265,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<(int i, String s, {bool b1})>(forgetType(t0Instance));
@@ -300,5 +296,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<(int i, String s, {bool b1})>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t03.dart
index 2ff0021..e1c250e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A05_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest((int i, String s, {bool b1}) val) {}
   void superTestPositioned((int i, String s, {bool b1}) val, [(int i, String s, {bool b1}) val2 = t1Default]) {}
@@ -237,7 +234,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<(int i, String s, {bool b1})>().superTest(forgetType(t0Instance));
@@ -264,5 +260,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<(int i, String s, {bool b1})>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t01.dart
index 76de701..568cdc9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 namedArgumentsFunc1((int i, String, {bool b}) t1, {(int i, String, {bool b}) t2 = t1Default}) {}
 positionalArgumentsFunc1((int i, String, {bool b}) t1, [(int i, String, {bool b}) t2 = t1Default]) {}
 
@@ -176,7 +173,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<(int i, String, {bool b})>(t1Instance, t2: forgetType(t0Instance));
@@ -195,7 +191,6 @@
     new ArgumentsBindingClassGen<(int i, String, {bool b})>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int i, String, {bool b})>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -205,7 +200,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int i, String, {bool b})>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t02.dart
index a0e0989..e5a7a21 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class ArgumentsBindingSuper1_t02 {
   (int i, String, {bool b}) m;
 
@@ -268,7 +265,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<(int i, String, {bool b})>(forgetType(t0Instance));
@@ -300,5 +296,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<(int i, String, {bool b})>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t03.dart
index 251dbfe..4309b1a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A06_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest((int i, String, {bool b}) val) {}
   void superTestPositioned((int i, String, {bool b}) val, [(int i, String, {bool b}) val2 = t1Default]) {}
@@ -237,7 +234,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<(int i, String, {bool b})>().superTest(forgetType(t0Instance));
@@ -264,5 +260,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<(int i, String, {bool b})>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t01.dart
index 4ff24d4..5f8d163 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -28,12 +27,10 @@
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
 namedArgumentsFunc1((int i, String, {List<num> b}) t1, {(int i, String, {List<num> b}) t2 = t1Default}) {}
 positionalArgumentsFunc1((int i, String, {List<num> b}) t1, [(int i, String, {List<num> b}) t2 = t1Default]) {}
 
@@ -176,7 +173,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<(int i, String, {List<num> b})>(t1Instance, t2: forgetType(t0Instance));
@@ -195,7 +191,6 @@
     new ArgumentsBindingClassGen<(int i, String, {List<num> b})>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int i, String, {List<num> b})>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -205,7 +200,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<(int i, String, {List<num> b})>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t02.dart
index 1575a3a..ba129eb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -28,12 +27,10 @@
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
 class ArgumentsBindingSuper1_t02 {
   (int i, String, {List<num> b}) m;
 
@@ -268,7 +265,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<(int i, String, {List<num> b})>(forgetType(t0Instance));
@@ -300,5 +296,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<(int i, String, {List<num> b})>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t03.dart
index 66540f6..d590ed1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_arguments_binding_fail_A07_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -28,12 +27,10 @@
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest((int i, String, {List<num> b}) val) {}
   void superTestPositioned((int i, String, {List<num> b}) val, [(int i, String, {List<num> b}) val2 = t1Default]) {}
@@ -237,7 +234,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<(int i, String, {List<num> b})>().superTest(forgetType(t0Instance));
@@ -264,5 +260,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<(int i, String, {List<num> b})>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t01.dart
index 45e76b8..d8fdf76 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class ClassMemberTestStatic {
   static (int, String) s = t1Default;
 
@@ -185,7 +182,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -205,7 +201,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<(int, String)>(t1Instance).getter;
@@ -250,5 +245,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<(int, String)>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t02.dart
index e9a50da..a9befca 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class ClassMemberSuper1_t02 {
   (int, String) m = t1Default;
 
@@ -125,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<(int, String)>();
   }, (e) => e is TypeError);
@@ -147,5 +143,4 @@
   Expect.throws(() {
     new ClassMember2_t02<(int, String)>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t03.dart
index 9516d6b..348f399 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class ClassMemberSuper1_t03 {
   (int, String) m = t1Default;
 
@@ -88,7 +85,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<(int, String)>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -101,5 +97,4 @@
   Expect.throws(() {
     new ClassMember2_t03<(int, String)>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t01.dart
index fe9ecde..f5e80e0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
 class ClassMemberTestStatic {
   static (int, String, bool) s = t1Default;
 
@@ -185,7 +182,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -205,7 +201,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<(int, String, bool)>(t1Instance).getter;
@@ -250,5 +245,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<(int, String, bool)>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t02.dart
index 66cc259..08c1ade 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
 class ClassMemberSuper1_t02 {
   (int, String, bool) m = t1Default;
 
@@ -125,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<(int, String, bool)>();
   }, (e) => e is TypeError);
@@ -147,5 +143,4 @@
   Expect.throws(() {
     new ClassMember2_t02<(int, String, bool)>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t03.dart
index e5c495b..c5aeb03 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
 class ClassMemberSuper1_t03 {
   (int, String, bool) m = t1Default;
 
@@ -88,7 +85,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<(int, String, bool)>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -101,5 +97,4 @@
   Expect.throws(() {
     new ClassMember2_t03<(int, String, bool)>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t01.dart
index 90740a7..6f9e5e4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class ClassMemberTestStatic {
   static (int i, String s) s = t1Default;
 
@@ -185,7 +182,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -205,7 +201,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<(int i, String s)>(t1Instance).getter;
@@ -250,5 +245,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<(int i, String s)>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t02.dart
index 0687e5c..d6c5ef8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class ClassMemberSuper1_t02 {
   (int i, String s) m = t1Default;
 
@@ -125,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<(int i, String s)>();
   }, (e) => e is TypeError);
@@ -147,5 +143,4 @@
   Expect.throws(() {
     new ClassMember2_t02<(int i, String s)>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t03.dart
index 846fcc5..36841c8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class ClassMemberSuper1_t03 {
   (int i, String s) m = t1Default;
 
@@ -88,7 +85,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<(int i, String s)>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -101,5 +97,4 @@
   Expect.throws(() {
     new ClassMember2_t03<(int i, String s)>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t01.dart
index 30c44d0..7e60920 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class ClassMemberTestStatic {
   static (int i, String s, {bool b}) s = t1Default;
 
@@ -185,7 +182,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -205,7 +201,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<(int i, String s, {bool b})>(t1Instance).getter;
@@ -250,5 +245,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<(int i, String s, {bool b})>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t02.dart
index 3f84e2a..92a4f01 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class ClassMemberSuper1_t02 {
   (int i, String s, {bool b}) m = t1Default;
 
@@ -125,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<(int i, String s, {bool b})>();
   }, (e) => e is TypeError);
@@ -147,5 +143,4 @@
   Expect.throws(() {
     new ClassMember2_t02<(int i, String s, {bool b})>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t03.dart
index 74560dc..8c39742 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A04_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class ClassMemberSuper1_t03 {
   (int i, String s, {bool b}) m = t1Default;
 
@@ -88,7 +85,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<(int i, String s, {bool b})>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -101,5 +97,4 @@
   Expect.throws(() {
     new ClassMember2_t03<(int i, String s, {bool b})>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t01.dart
index 24491a3..646d699 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
 class ClassMemberTestStatic {
   static (int i, String s, {bool b1}) s = t1Default;
 
@@ -185,7 +182,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -205,7 +201,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<(int i, String s, {bool b1})>(t1Instance).getter;
@@ -250,5 +245,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<(int i, String s, {bool b1})>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t02.dart
index bb446df..652a0c6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
 class ClassMemberSuper1_t02 {
   (int i, String s, {bool b1}) m = t1Default;
 
@@ -125,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<(int i, String s, {bool b1})>();
   }, (e) => e is TypeError);
@@ -147,5 +143,4 @@
   Expect.throws(() {
     new ClassMember2_t02<(int i, String s, {bool b1})>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t03.dart
index 606b4e9..bd1c208 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A05_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
 class ClassMemberSuper1_t03 {
   (int i, String s, {bool b1}) m = t1Default;
 
@@ -88,7 +85,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<(int i, String s, {bool b1})>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -101,5 +97,4 @@
   Expect.throws(() {
     new ClassMember2_t03<(int i, String s, {bool b1})>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t01.dart
index 46c2bd1..ec2c193 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class ClassMemberTestStatic {
   static (int i, String, {bool b}) s = t1Default;
 
@@ -185,7 +182,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -205,7 +201,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<(int i, String, {bool b})>(t1Instance).getter;
@@ -250,5 +245,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<(int i, String, {bool b})>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t02.dart
index 05538f6..de4f50b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class ClassMemberSuper1_t02 {
   (int i, String, {bool b}) m = t1Default;
 
@@ -125,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<(int i, String, {bool b})>();
   }, (e) => e is TypeError);
@@ -147,5 +143,4 @@
   Expect.throws(() {
     new ClassMember2_t02<(int i, String, {bool b})>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t03.dart
index 3b6696d..e13d02f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A06_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class ClassMemberSuper1_t03 {
   (int i, String, {bool b}) m = t1Default;
 
@@ -88,7 +85,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<(int i, String, {bool b})>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -101,5 +97,4 @@
   Expect.throws(() {
     new ClassMember2_t03<(int i, String, {bool b})>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t01.dart
index 114f8d7..d13cc16 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -28,12 +27,10 @@
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
 class ClassMemberTestStatic {
   static (int i, String, {List<num> b}) s = t1Default;
 
@@ -185,7 +182,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -205,7 +201,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<(int i, String, {List<num> b})>(t1Instance).getter;
@@ -250,5 +245,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<(int i, String, {List<num> b})>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t02.dart
index 7c37056..0bd399c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -28,12 +27,10 @@
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
 class ClassMemberSuper1_t02 {
   (int i, String, {List<num> b}) m = t1Default;
 
@@ -125,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<(int i, String, {List<num> b})>();
   }, (e) => e is TypeError);
@@ -147,5 +143,4 @@
   Expect.throws(() {
     new ClassMember2_t02<(int i, String, {List<num> b})>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t03.dart
index f514e39..53eb3ac 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_class_member_fail_A07_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -28,12 +27,10 @@
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
 class ClassMemberSuper1_t03 {
   (int i, String, {List<num> b}) m = t1Default;
 
@@ -88,7 +85,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<(int i, String, {List<num> b})>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -101,5 +97,4 @@
   Expect.throws(() {
     new ClassMember2_t03<(int i, String, {List<num> b})>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A01_t01.dart
index 4140205..f52932a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A02_t01.dart
index 79d47ce..2c00a0e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A03_t01.dart
index 6943830..0ecba98 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A04_t01.dart
index fcb24b1..49f8d84 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A05_t01.dart
index 1c100e0..82c374c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A06_t01.dart
index 82d625c..03b4ef7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A07_t01.dart
index 4c9507c..f16d82d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_global_variable_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -28,12 +27,10 @@
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A01_t01.dart
index 3bcc56d..1f69fe6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A02_t01.dart
index d9cc5ff..bf23fda 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A03_t01.dart
index 6ba21a2..c1a6904 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A04_t01.dart
index 05e5cde..53a65c0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A05_t01.dart
index 24f34ee..1a6e07c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A06_t01.dart
index 3ee9b23..b7a307f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A07_t01.dart
index a1cfe79..a8aa649 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_local_variable_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -28,12 +27,10 @@
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A01_t01.dart
index 5b5cc8f..9928947 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 (int, String) returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,12 +68,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<(int, String)>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<(int, String)>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A02_t01.dart
index 3c966ff..d685b47 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
 (int, String, bool) returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,12 +68,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<(int, String, bool)>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<(int, String, bool)>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A03_t01.dart
index ea8604d..df43f14 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6");
 
-
-
 (int i, String s) returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,12 +68,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<(int i, String s)>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<(int i, String s)>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A04_t01.dart
index 0582cd9..c358bff 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 (int i, String s, {bool b}) returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,12 +68,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<(int i, String s, {bool b})>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<(int i, String s, {bool b})>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A05_t01.dart
index 92b4588..13d567f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
 (int i, String s, {bool b1}) returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,12 +68,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<(int i, String s, {bool b1})>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<(int i, String s, {bool b1})>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A06_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A06_t01.dart
index f29ec51..f21bff7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -32,8 +31,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
 (int i, String, {bool b}) returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,12 +68,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<(int i, String, {bool b})>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<(int i, String, {bool b})>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A07_t01.dart
index 3b02213..157f16f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_fail_return_value_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,11 +16,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -28,12 +27,10 @@
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
 (int i, String, {List<num> b}) returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,12 +68,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<(int i, String, {List<num> b})>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<(int i, String, {List<num> b})>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A01_t01.dart
index f54ee46..7ab74e0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A02_t01.dart
index 3c7b52c..eb1389a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A03_t01.dart
index 10657d4..7dc9113 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_global_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A01_t01.dart
index 185e89a..4e67f55 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A02_t01.dart
index 45bf111..846ab37 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A03_t01.dart
index 85eb32b..226f676 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_local_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A01_t01.dart
index edfe09a..0e9cf8f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 (num, num, String?) returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +46,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   (num, num, String?) returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +59,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<(num, num, String?)>().testMethod();
   new ReturnValueGen<(num, num, String?)>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A02_t01.dart
index 08c6312..4de2d80 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -34,9 +33,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 (num, num, String?, {num n1, String? n2}) returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -52,7 +48,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   (num, num, String?, {num n1, String? n2}) returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -66,8 +61,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<(num, num, String?, {num n1, String? n2})>().testMethod();
   new ReturnValueGen<(num, num, String?, {num n1, String? n2})>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A03_t01.dart
index 769e7ca..5c8e2a5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/records_return_value_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -32,9 +31,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 ({String? z, num y, num x}) returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -50,7 +46,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   ({String? z, num y, num x}) returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -64,8 +59,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<({String? z, num y, num x})>().testMethod();
   new ReturnValueGen<({String? z, num y, num x})>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t01.dart
index 54f9f30..f4ec957 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,8 +29,6 @@
 
 const t1Default = const T();
 
-
-
 namedArgumentsFunc1(T t1, {T t2 = t1Default}) {}
 positionalArgumentsFunc1(T t1, [T t2 = t1Default]) {}
 
@@ -103,7 +100,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -119,5 +115,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t02.dart
index bee75da..cabc0b2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,9 +29,6 @@
 
 const t1Default = const T();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T m;
 
@@ -112,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T> c2 =
     new ArgumentsBinding2_t02<T>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T>.c2(t1Instance, forgetType(t0Instance));
@@ -123,5 +118,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t03.dart
index 3a2a637..1b49010 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A01_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,9 +29,6 @@
 
 const t1Default = const T();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T m = t1Default;
 
@@ -85,12 +81,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T> c2 = new ArgumentsBinding2_t03<T>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t01.dart
index d8784d6..9d8643e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,8 +25,6 @@
 
 const t1Default = "";
 
-
-
 namedArgumentsFunc1(dynamic t1, {dynamic t2 = t1Default}) {}
 positionalArgumentsFunc1(dynamic t1, [dynamic t2 = t1Default]) {}
 
@@ -99,7 +96,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<dynamic>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -115,5 +111,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t02.dart
index c607ae0..4f34835 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = "";
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   dynamic m;
 
@@ -108,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<dynamic> c2 =
     new ArgumentsBinding2_t02<dynamic>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<dynamic>.c2(t1Instance, forgetType(t0Instance));
@@ -119,5 +114,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t03.dart
index c9933e6..04f6c11 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A02_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = "";
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   dynamic m = t1Default;
 
@@ -81,12 +77,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<dynamic> c2 = new ArgumentsBinding2_t03<dynamic>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t01.dart
index 311e676..1ce7957 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,8 +25,6 @@
 
 const t1Default = const Object();
 
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -99,7 +96,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -115,5 +111,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t02.dart
index f366b27..42c0339 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m;
 
@@ -108,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object> c2 =
     new ArgumentsBinding2_t02<Object>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, forgetType(t0Instance));
@@ -119,5 +114,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t03.dart
index 9d349dd..254bb37 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A03_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
@@ -81,12 +77,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t01.dart
index 24f53da..ae43dfe 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,8 +25,6 @@
 
 const t1Default = null;
 
-
-
 namedArgumentsFunc1(Null t1, {Null t2 = t1Default}) {}
 positionalArgumentsFunc1(Null t1, [Null t2 = t1Default]) {}
 
@@ -99,7 +96,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Null>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -115,5 +111,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t02.dart
index b39759f..919b73b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Null m;
 
@@ -108,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Null> c2 =
     new ArgumentsBinding2_t02<Null>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Null>.c2(t1Instance, forgetType(t0Instance));
@@ -119,5 +114,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t03.dart
index c7301a7..b715063 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_arguments_binding_A04_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Null m = t1Default;
 
@@ -81,12 +77,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Null> c2 = new ArgumentsBinding2_t03<Null>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t01.dart
index a41cfe4..55e382f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,9 +29,6 @@
 
 const t1Default = const T();
 
-
-
-
 class ClassMember1_t01 {
   static T s = forgetType(t0Instance);
   T m = forgetType(t0Instance);
@@ -116,7 +112,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T> c2 = new ClassMember2_t01<T>();
   c2 = new ClassMember2_t01<T>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -124,5 +119,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t02.dart
index 1d42f8e..95a8f36 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,9 +29,6 @@
 
 const t1Default = const T();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T m;
 
@@ -99,12 +95,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T> c2 = new ClassMember2_t02<T>();
   c2 = new ClassMember2_t02<T>.short();
   c2 = new ClassMember2_t02<T>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t03.dart
index 9122620..0ac14a3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A01_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,9 +29,6 @@
 
 const t1Default = const T();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T m = t1Default;
 
@@ -67,10 +63,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T> c2 = new ClassMember2_t03<T>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t01.dart
index 07eba44..8a39ba2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = "";
 
-
-
-
 class ClassMember1_t01 {
   static dynamic s = forgetType(t0Instance);
   dynamic m = forgetType(t0Instance);
@@ -112,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<dynamic> c2 = new ClassMember2_t01<dynamic>();
   c2 = new ClassMember2_t01<dynamic>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -120,5 +115,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t02.dart
index 38f4ba8..f963a1b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = "";
 
-
-
-
 class ClassMemberSuper1_t02 {
   dynamic m;
 
@@ -95,12 +91,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<dynamic> c2 = new ClassMember2_t02<dynamic>();
   c2 = new ClassMember2_t02<dynamic>.short();
   c2 = new ClassMember2_t02<dynamic>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t03.dart
index b1cd10a..1430370 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A02_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = "";
 
-
-
-
 class ClassMemberMixin1_t03 {
   dynamic m = t1Default;
 
@@ -63,10 +59,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<dynamic> c2 = new ClassMember2_t03<dynamic>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t01.dart
index f301275..b9fea53 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static Object s = forgetType(t0Instance);
   Object m = forgetType(t0Instance);
@@ -112,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Object> c2 = new ClassMember2_t01<Object>();
   c2 = new ClassMember2_t01<Object>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -120,5 +115,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t02.dart
index 9fc08fd..b2f5ba0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m;
 
@@ -95,12 +91,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Object> c2 = new ClassMember2_t02<Object>();
   c2 = new ClassMember2_t02<Object>.short();
   c2 = new ClassMember2_t02<Object>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t03.dart
index 595cbc2..80c5f95 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A03_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
@@ -63,10 +59,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Object> c2 = new ClassMember2_t03<Object>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t01.dart
index 9ab788f..6d00ba7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static Null s = forgetType(t0Instance);
   Null m = forgetType(t0Instance);
@@ -112,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Null> c2 = new ClassMember2_t01<Null>();
   c2 = new ClassMember2_t01<Null>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -120,5 +115,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t02.dart
index 85f4757..5a9f2b0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Null m;
 
@@ -95,12 +91,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Null> c2 = new ClassMember2_t02<Null>();
   c2 = new ClassMember2_t02<Null>.short();
   c2 = new ClassMember2_t02<Null>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t03.dart
index 307c0c6..88da998 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_class_member_A04_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Null m = t1Default;
 
@@ -63,10 +59,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Null> c2 = new ClassMember2_t03<Null>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A01_t01.dart
index 5c1b1d3..324a5bf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,9 +29,6 @@
 
 const t1Default = const T();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A02_t01.dart
index ce03039..e0c35c0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A02_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = "";
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A03_t01.dart
index aef6224..117a90f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A03_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A04_t01.dart
index 0b19314..c833e55 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_global_variable_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A01_t01.dart
index b4c571e..48730a4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,9 +29,6 @@
 
 const t1Default = const T();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A02_t01.dart
index 3abaa65..8e344e8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A02_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = "";
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A03_t01.dart
index 3854bda..339a62f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A03_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A04_t01.dart
index 0ba7741..10c7075 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_local_variable_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A01_t01.dart
index e528f2a..9ee538d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,9 +29,6 @@
 
 const t1Default = const T();
 
-
-
-
 T returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -48,7 +44,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -62,8 +57,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T>().testMethod();
   new ReturnValueGen<T>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A02_t01.dart
index 87c0d76..5a41593 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A02_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = "";
 
-
-
-
 dynamic returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -44,7 +40,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   dynamic returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -58,8 +53,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<dynamic>().testMethod();
   new ReturnValueGen<dynamic>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A03_t01.dart
index 29efd0e..90221de 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A03_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -44,7 +40,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Object returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -58,8 +53,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Object>().testMethod();
   new ReturnValueGen<Object>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A04_t01.dart
index 8b43fa7..3e1f235 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/reflexivity_return_value_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 Null returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -44,7 +40,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Null returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -58,8 +53,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Null>().testMethod();
   new ReturnValueGen<Null>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t01.dart
index 757ec7b..f27161b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -53,8 +55,6 @@
 
 const t1Default = const S1();
 
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
@@ -126,7 +126,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<S1>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -142,5 +141,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t02.dart
index 0611f67..719a486 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t02.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -53,9 +55,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m;
 
@@ -135,7 +134,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<S1>> c2 =
     new ArgumentsBinding2_t02<FutureOr<S1>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<FutureOr<S1>>.c2(t1Instance, forgetType(t0Instance));
@@ -146,5 +144,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t03.dart
index 1cb2608..9dd128a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A01_t03.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -53,9 +55,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
@@ -108,12 +107,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<S1>> c2 = new ArgumentsBinding2_t03<FutureOr<S1>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t01.dart
index 4472ccc..976423f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,8 +36,6 @@
 
 const t1Default = const S1();
 
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
@@ -110,7 +107,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<S1>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -126,5 +122,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t02.dart
index 9c370e1..78d8d75 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t02.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m;
 
@@ -119,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<S1>> c2 =
     new ArgumentsBinding2_t02<FutureOr<S1>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<FutureOr<S1>>.c2(t1Instance, forgetType(t0Instance));
@@ -130,5 +125,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t03.dart
index 94f97f7..1bd5f85 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A02_t03.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
@@ -92,12 +88,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<S1>> c2 = new ArgumentsBinding2_t03<FutureOr<S1>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t01.dart
index 8644004..c289fb7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,15 +29,19 @@
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -47,16 +50,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
@@ -128,7 +128,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<S1>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -144,5 +143,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t02.dart
index 40932ad..e675f80 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t02.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,15 +29,19 @@
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -47,17 +50,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m;
 
@@ -137,7 +136,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<S1>> c2 =
     new ArgumentsBinding2_t02<FutureOr<S1>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<FutureOr<S1>>.c2(t1Instance, forgetType(t0Instance));
@@ -148,5 +146,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t03.dart
index 284ff35..2a73ceb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A03_t03.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,15 +29,19 @@
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -47,17 +50,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
@@ -110,12 +109,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<S1>> c2 = new ArgumentsBinding2_t03<FutureOr<S1>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t01.dart
index e9b4325..3b2c2c7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,8 +39,6 @@
 
 const t1Default = const S1();
 
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
@@ -113,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<S1>>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -129,5 +125,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t02.dart
index 860c27b..2774dd5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t02.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m;
 
@@ -122,7 +118,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<S1>> c2 =
     new ArgumentsBinding2_t02<FutureOr<S1>>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<FutureOr<S1>>.c2(t1Instance, forgetType(t0Instance));
@@ -133,5 +128,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t03.dart
index 0f80129..e6c3c02 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_arguments_binding_A04_t03.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
@@ -95,12 +91,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<S1>> c2 = new ArgumentsBinding2_t03<FutureOr<S1>>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t01.dart
index 6da5401..d0f2624 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -53,9 +55,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<S1> s = forgetType(t0Instance);
   FutureOr<S1> m = forgetType(t0Instance);
@@ -139,7 +138,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<FutureOr<S1>> c2 = new ClassMember2_t01<FutureOr<S1>>();
   c2 = new ClassMember2_t01<FutureOr<S1>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -147,5 +145,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t02.dart
index 9842977..b1ddcb0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t02.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -53,9 +55,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m;
 
@@ -122,12 +121,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<FutureOr<S1>> c2 = new ClassMember2_t02<FutureOr<S1>>();
   c2 = new ClassMember2_t02<FutureOr<S1>>.short();
   c2 = new ClassMember2_t02<FutureOr<S1>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t03.dart
index 1727df0..93cde75 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A01_t03.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -53,9 +55,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
@@ -90,10 +89,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<FutureOr<S1>> c2 = new ClassMember2_t03<FutureOr<S1>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t01.dart
index a06b215..80f2098 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<S1> s = forgetType(t0Instance);
   FutureOr<S1> m = forgetType(t0Instance);
@@ -123,7 +119,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<FutureOr<S1>> c2 = new ClassMember2_t01<FutureOr<S1>>();
   c2 = new ClassMember2_t01<FutureOr<S1>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -131,5 +126,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t02.dart
index 7a5308d..2c1d337 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t02.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m;
 
@@ -106,12 +102,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<FutureOr<S1>> c2 = new ClassMember2_t02<FutureOr<S1>>();
   c2 = new ClassMember2_t02<FutureOr<S1>>.short();
   c2 = new ClassMember2_t02<FutureOr<S1>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t03.dart
index 8891fb8..114c1eb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A02_t03.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
@@ -74,10 +70,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<FutureOr<S1>> c2 = new ClassMember2_t03<FutureOr<S1>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t01.dart
index 5e05da8..0259b16 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,15 +29,19 @@
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -47,17 +50,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<S1> s = forgetType(t0Instance);
   FutureOr<S1> m = forgetType(t0Instance);
@@ -141,7 +140,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<FutureOr<S1>> c2 = new ClassMember2_t01<FutureOr<S1>>();
   c2 = new ClassMember2_t01<FutureOr<S1>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -149,5 +147,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t02.dart
index bfd4f08..9d94e21 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t02.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,15 +29,19 @@
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -47,17 +50,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m;
 
@@ -124,12 +123,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<FutureOr<S1>> c2 = new ClassMember2_t02<FutureOr<S1>>();
   c2 = new ClassMember2_t02<FutureOr<S1>>.short();
   c2 = new ClassMember2_t02<FutureOr<S1>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t03.dart
index ee84801..3efa4fa 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A03_t03.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,15 +29,19 @@
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -47,17 +50,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
@@ -92,10 +91,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<FutureOr<S1>> c2 = new ClassMember2_t03<FutureOr<S1>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t01.dart
index f0921122..7ff31d4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<S1> s = forgetType(t0Instance);
   FutureOr<S1> m = forgetType(t0Instance);
@@ -126,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<FutureOr<S1>> c2 = new ClassMember2_t01<FutureOr<S1>>();
   c2 = new ClassMember2_t01<FutureOr<S1>>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -134,5 +129,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t02.dart
index 1f12e82..5ffb95a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t02.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m;
 
@@ -109,12 +105,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<FutureOr<S1>> c2 = new ClassMember2_t02<FutureOr<S1>>();
   c2 = new ClassMember2_t02<FutureOr<S1>>.short();
   c2 = new ClassMember2_t02<FutureOr<S1>>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t03.dart
index 34ffa0c..294806d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_class_member_A04_t03.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
@@ -77,10 +73,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<FutureOr<S1>> c2 = new ClassMember2_t03<FutureOr<S1>>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t01.dart
index cf340d6..16c0176 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t01.dart
@@ -18,11 +18,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -39,8 +38,6 @@
 
 const t1Default = const S1();
 
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
@@ -183,7 +180,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<FutureOr<S1>>(t1Instance, t2: forgetType(t0Instance));
@@ -202,7 +198,6 @@
     new ArgumentsBindingClassGen<FutureOr<S1>>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<FutureOr<S1>>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -212,7 +207,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<FutureOr<S1>>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t02.dart
index b02668b..1dfca52 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t02.dart
@@ -18,11 +18,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -39,8 +38,6 @@
 
 const t1Default = const S1();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m;
 
@@ -275,7 +272,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<FutureOr<S1>>(forgetType(t0Instance));
@@ -307,5 +303,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<FutureOr<S1>>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t03.dart
index 9dcb3cb..93e9a1b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A01_t03.dart
@@ -18,11 +18,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -39,8 +38,6 @@
 
 const t1Default = const S1();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(FutureOr<S1> val) {}
   void superTestPositioned(FutureOr<S1> val, [FutureOr<S1> val2 = t1Default]) {}
@@ -244,7 +241,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<FutureOr<S1>>().superTest(forgetType(t0Instance));
@@ -271,5 +267,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<FutureOr<S1>>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t01.dart
index 2ee584e..ce5a3ca 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t01.dart
@@ -18,11 +18,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const S1();
 
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
@@ -185,7 +182,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<FutureOr<S1>>(t1Instance, t2: forgetType(t0Instance));
@@ -204,7 +200,6 @@
     new ArgumentsBindingClassGen<FutureOr<S1>>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<FutureOr<S1>>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -214,7 +209,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<FutureOr<S1>>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t02.dart
index daf9c0d..7e4200a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t02.dart
@@ -18,11 +18,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const S1();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m;
 
@@ -277,7 +274,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<FutureOr<S1>>(forgetType(t0Instance));
@@ -309,5 +305,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<FutureOr<S1>>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t03.dart
index f4c2b08..33bbb5b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_arguments_binding_fail_A02_t03.dart
@@ -18,11 +18,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const S1();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(FutureOr<S1> val) {}
   void superTestPositioned(FutureOr<S1> val, [FutureOr<S1> val2 = t1Default]) {}
@@ -246,7 +243,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<FutureOr<S1>>().superTest(forgetType(t0Instance));
@@ -273,5 +269,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<FutureOr<S1>>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t01.dart
index d3fa13a..81c7e63 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t01.dart
@@ -18,11 +18,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -39,8 +38,6 @@
 
 const t1Default = const S1();
 
-
-
 class ClassMemberTestStatic {
   static FutureOr<S1> s = t1Default;
 
@@ -192,7 +189,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -212,7 +208,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<FutureOr<S1>>(t1Instance).getter;
@@ -257,5 +252,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<FutureOr<S1>>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t02.dart
index f83c120..19afcff 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t02.dart
@@ -18,11 +18,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -39,8 +38,6 @@
 
 const t1Default = const S1();
 
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
@@ -132,7 +129,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<FutureOr<S1>>();
   }, (e) => e is TypeError);
@@ -154,5 +150,4 @@
   Expect.throws(() {
     new ClassMember2_t02<FutureOr<S1>>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t03.dart
index 6b425fb..592fd01 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A01_t03.dart
@@ -18,11 +18,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -39,8 +38,6 @@
 
 const t1Default = const S1();
 
-
-
 class ClassMemberSuper1_t03 {
   FutureOr<S1> m = t1Default;
 
@@ -95,7 +92,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<FutureOr<S1>>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -108,5 +104,4 @@
   Expect.throws(() {
     new ClassMember2_t03<FutureOr<S1>>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t01.dart
index c0da1b7..07dbdaf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t01.dart
@@ -18,11 +18,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const S1();
 
-
-
 class ClassMemberTestStatic {
   static FutureOr<S1> s = t1Default;
 
@@ -194,7 +191,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -214,7 +210,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<FutureOr<S1>>(t1Instance).getter;
@@ -259,5 +254,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<FutureOr<S1>>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t02.dart
index 1c82e09..ed95cf9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t02.dart
@@ -18,11 +18,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const S1();
 
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
@@ -134,7 +131,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<FutureOr<S1>>();
   }, (e) => e is TypeError);
@@ -156,5 +152,4 @@
   Expect.throws(() {
     new ClassMember2_t02<FutureOr<S1>>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t03.dart
index 4f38cd0..1b25b61 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_class_member_fail_A02_t03.dart
@@ -18,11 +18,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const S1();
 
-
-
 class ClassMemberSuper1_t03 {
   FutureOr<S1> m = t1Default;
 
@@ -97,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<FutureOr<S1>>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -110,5 +106,4 @@
   Expect.throws(() {
     new ClassMember2_t03<FutureOr<S1>>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_global_variable_fail_A01_t01.dart
index b8b89b5..b418977 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_global_variable_fail_A01_t01.dart
@@ -18,11 +18,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -39,8 +38,6 @@
 
 const t1Default = const S1();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_global_variable_fail_A02_t01.dart
index 33b0cdb..641e150 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_global_variable_fail_A02_t01.dart
@@ -18,11 +18,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const S1();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_local_variable_fail_A01_t01.dart
index f3767b8..340df1c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_local_variable_fail_A01_t01.dart
@@ -18,11 +18,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -39,8 +38,6 @@
 
 const t1Default = const S1();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_local_variable_fail_A02_t01.dart
index cb5a24d..cbd43ef 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_local_variable_fail_A02_t01.dart
@@ -18,11 +18,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const S1();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_return_value_fail_A01_t01.dart
index 79ffab4..6532515 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_return_value_fail_A01_t01.dart
@@ -18,11 +18,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -39,8 +38,6 @@
 
 const t1Default = const S1();
 
-
-
 FutureOr<S1> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -78,12 +75,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<FutureOr<S1>>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<FutureOr<S1>>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_return_value_fail_A02_t01.dart
index 7dd2148..68d525e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_fail_return_value_fail_A02_t01.dart
@@ -18,11 +18,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const S1();
 
-
-
 FutureOr<S1> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -80,12 +77,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<FutureOr<S1>>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<FutureOr<S1>>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A01_t01.dart
index 5276137..a76afb6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A01_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -53,9 +55,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A02_t01.dart
index 473d8f6..03e5be7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A02_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A03_t01.dart
index a16708d..ed47007 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A03_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,15 +29,19 @@
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -47,17 +50,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A04_t01.dart
index c275ae2..e929466 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_global_variable_A04_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A01_t01.dart
index 8c7dcc1..eaa162b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A01_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -53,9 +55,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A02_t01.dart
index fb76e4c..7475a9d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A02_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A03_t01.dart
index 0b06335..cac5ede 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A03_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,15 +29,19 @@
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -47,17 +50,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A04_t01.dart
index 18ba874..ee5dcfb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_local_variable_A04_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A01_t01.dart
index e8bf4e5..79cb3c6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A01_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -53,9 +55,6 @@
 
 const t1Default = const S1();
 
-
-
-
 FutureOr<S1> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -71,7 +70,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   FutureOr<S1> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -85,8 +83,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<FutureOr<S1>>().testMethod();
   new ReturnValueGen<FutureOr<S1>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A02_t01.dart
index dd9775e..040b4b1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A02_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 FutureOr<S1> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -55,7 +51,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   FutureOr<S1> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -69,8 +64,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<FutureOr<S1>>().testMethod();
   new ReturnValueGen<FutureOr<S1>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A03_t01.dart
index 464f38f..85b3625 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A03_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -30,15 +29,19 @@
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -47,17 +50,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 FutureOr<S1> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -73,7 +72,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   FutureOr<S1> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -87,8 +85,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<FutureOr<S1>>().testMethod();
   new ReturnValueGen<FutureOr<S1>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A04_t01.dart
index 217ad43..57c9869 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_FutureOr_return_value_A04_t01.dart
@@ -17,11 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 FutureOr<S1> returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -58,7 +54,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   FutureOr<S1> returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -72,8 +67,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<FutureOr<S1>>().testMethod();
   new ReturnValueGen<FutureOr<S1>>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t01.dart
index 9f75c87..e16fa0d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -37,8 +35,6 @@
 
 const t1Default = const S1();
 
-
-
 namedArgumentsFunc1(S1? t1, {S1? t2 = t1Default}) {}
 positionalArgumentsFunc1(S1? t1, [S1? t2 = t1Default]) {}
 
@@ -110,7 +106,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<S1?>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -126,5 +121,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t02.dart
index ab0fb32..d8c27d0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -37,9 +35,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   S1? m;
 
@@ -119,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<S1?> c2 =
     new ArgumentsBinding2_t02<S1?>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<S1?>.c2(t1Instance, forgetType(t0Instance));
@@ -130,5 +124,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t03.dart
index 4db17f6..13b9830 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -37,9 +35,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   S1? m = t1Default;
 
@@ -92,12 +87,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<S1?> c2 = new ArgumentsBinding2_t03<S1?>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t01.dart
index f792286..5fae238 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -36,8 +34,6 @@
 
 const t1Default = const S1();
 
-
-
 namedArgumentsFunc1(S1? t1, {S1? t2 = t1Default}) {}
 positionalArgumentsFunc1(S1? t1, [S1? t2 = t1Default]) {}
 
@@ -109,7 +105,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<S1?>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -125,5 +120,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t02.dart
index d473bd8..c3df40f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   S1? m;
 
@@ -118,7 +113,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<S1?> c2 =
     new ArgumentsBinding2_t02<S1?>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<S1?>.c2(t1Instance, forgetType(t0Instance));
@@ -129,5 +123,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t03.dart
index 04ed429..0783bef 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   S1? m = t1Default;
 
@@ -91,12 +86,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<S1?> c2 = new ArgumentsBinding2_t03<S1?>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t01.dart
index ec226ad..dc4b2d2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -38,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 namedArgumentsFunc1(S1? t1, {S1? t2 = t1Default}) {}
 positionalArgumentsFunc1(S1? t1, [S1? t2 = t1Default]) {}
 
@@ -82,10 +77,7 @@
   set testSetter(X val) {}
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   // test functions
   namedArgumentsFunc1(forgetType(t0Instance), t2: forgetType(t0Instance));
   positionalArgumentsFunc1(forgetType(t0Instance), forgetType(t0Instance));
@@ -115,7 +107,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<S1?>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -131,8 +122,6 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t02.dart
index 0027706..d91866c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -38,10 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   S1? m;
 
@@ -103,10 +97,7 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(forgetType(t0Instance));
   c1 = new ArgumentsBinding1_t02.c2(t1Instance, forgetType(t0Instance));
   c1 = new ArgumentsBinding1_t02.c3(forgetType(t0Instance));
@@ -124,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<S1?> c2 =
     new ArgumentsBinding2_t02<S1?>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<S1?>.c2(t1Instance, forgetType(t0Instance));
@@ -135,8 +125,6 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t03.dart
index 9f4ce14..6402f68 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_arguments_binding_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -38,10 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class ArgumentsBindingMixin1_t03 {
   S1? m = t1Default;
 
@@ -81,10 +75,7 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
   c1.test(forgetType(t0Instance), t1Instance);
@@ -97,15 +88,11 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<S1?> c2 = new ArgumentsBinding2_t03<S1?>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t01.dart
index 0acb547..317851f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -37,9 +35,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static S1? s = forgetType(t0Instance);
   S1? m = forgetType(t0Instance);
@@ -123,7 +118,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<S1?> c2 = new ClassMember2_t01<S1?>();
   c2 = new ClassMember2_t01<S1?>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -131,5 +125,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t02.dart
index 856a5d5..8e9cb09 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -37,9 +35,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   S1? m;
 
@@ -106,12 +101,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<S1?> c2 = new ClassMember2_t02<S1?>();
   c2 = new ClassMember2_t02<S1?>.short();
   c2 = new ClassMember2_t02<S1?>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t03.dart
index 4200909..9f1a14a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -37,9 +35,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   S1? m = t1Default;
 
@@ -74,10 +69,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<S1?> c2 = new ClassMember2_t03<S1?>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t01.dart
index 026d3b8..3a833f6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static S1? s = forgetType(t0Instance);
   S1? m = forgetType(t0Instance);
@@ -122,7 +117,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<S1?> c2 = new ClassMember2_t01<S1?>();
   c2 = new ClassMember2_t01<S1?>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -130,5 +124,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t02.dart
index 7005b1f..5347045 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   S1? m;
 
@@ -105,12 +100,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<S1?> c2 = new ClassMember2_t02<S1?>();
   c2 = new ClassMember2_t02<S1?>.short();
   c2 = new ClassMember2_t02<S1?>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t03.dart
index d3575da..9f66538 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   S1? m = t1Default;
 
@@ -73,10 +68,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<S1?> c2 = new ClassMember2_t03<S1?>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t01.dart
index 6872621..ad8c91c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -38,10 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class ClassMember1_t01 {
   static S1? s = forgetType(t0Instance);
   S1? m = forgetType(t0Instance);
@@ -108,10 +102,7 @@
   S1? get getter => forgetType(_p);
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   ClassMember1_t01 c1 = new ClassMember1_t01();
   c1 = new ClassMember1_t01.short(forgetType(t0Instance),
       forgetType(t0Instance));
@@ -128,7 +119,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<S1?> c2 = new ClassMember2_t01<S1?>();
   c2 = new ClassMember2_t01<S1?>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -136,8 +126,6 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t02.dart
index 5b991a0..b4f59db 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -38,10 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   S1? m;
 
@@ -98,10 +92,7 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   ClassMember1_t02 c1 = new ClassMember1_t02();
   c1 = new ClassMember1_t02.short();
   c1 = new ClassMember1_t02.named();
@@ -111,15 +102,12 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<S1?> c2 = new ClassMember2_t02<S1?>();
   c2 = new ClassMember2_t02<S1?>.short();
   c2 = new ClassMember2_t02<S1?>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t03.dart
index aed060e..5523670 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_class_member_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -38,10 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class ClassMemberMixin1_t03 {
   S1? m = t1Default;
 
@@ -68,10 +62,7 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   ClassMember1_t03 c1 = new ClassMember1_t03();
   c1.m = forgetType(t0Instance);
   c1.test();
@@ -79,13 +70,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<S1?> c2 = new ClassMember2_t03<S1?>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A01_t01.dart
index c216bcb..57c8ef5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -37,9 +35,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A02_t01.dart
index c4181db..f5bd6b6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A03_t01.dart
index 5049c6b..12dc3b6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_global_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -38,10 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -56,10 +50,7 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   bar () {
     t1Instance = forgetType(t0Instance);
   }
@@ -69,7 +60,6 @@
   GlobalVariableTest t = new GlobalVariableTest();
   t.foo();
   GlobalVariableTest.test();
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A01_t01.dart
index 8132e42..c6ff1eb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -37,9 +35,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A02_t01.dart
index ca3f8d5..5b8742e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A03_t01.dart
index 66f6cb5..e70588f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_local_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -38,10 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -60,10 +54,7 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   foo() {
     S1? t1 = forgetType(t0Instance);
     t1 = forgetType(t0Instance);
@@ -75,7 +66,6 @@
   LocalVariableTest x = new LocalVariableTest();
   x.test();
   LocalVariableTest.staticTest();
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A01_t01.dart
index 141faa0..0cca55c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -37,9 +35,6 @@
 
 const t1Default = const S1();
 
-
-
-
 S1? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -55,7 +50,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   S1? returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -69,8 +63,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<S1?>().testMethod();
   new ReturnValueGen<S1?>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A02_t01.dart
index 38f1bf6..e4a0fcb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 S1? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -54,7 +49,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   S1? returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -68,8 +62,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<S1?>().testMethod();
   new ReturnValueGen<S1?>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A03_t01.dart
index 0e1c8e4..d82582b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_nullable_return_value_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,15 +18,13 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
-
 class S1 {
   const S1();
 }
@@ -38,10 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 S1? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -57,11 +51,7 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
-
-
 test<T extends S1>(T t0Instance) {
-
   S1? returnValueLocalFunc() => forgetType(t0Instance);
 
   returnValueFunc();
@@ -74,11 +64,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<S1?>().testMethod();
   new ReturnValueGen<S1?>().testGetter;
-  //# -->
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t01.dart
index 2e028fc..89d78a9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -81,57 +77,51 @@
   set testSetter(X val) {}
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  // test functions
-  namedArgumentsFunc1(forgetType(t0Instance), t2: forgetType(t0Instance));
-  positionalArgumentsFunc1(forgetType(t0Instance), forgetType(t0Instance));
+    // test functions
+    namedArgumentsFunc1(forgetType(t0Instance), t2: forgetType(t0Instance));
+    positionalArgumentsFunc1(forgetType(t0Instance), forgetType(t0Instance));
 
-  // test class constructors
-  ArgumentsBindingClass instance1 =
-      new ArgumentsBindingClass(forgetType(t0Instance));
-  instance1 = new ArgumentsBindingClass.fNamed(forgetType(t0Instance),
-      t2: forgetType(t0Instance));
-  instance1 = new ArgumentsBindingClass.named(forgetType(t0Instance),
-      t2: forgetType(t0Instance));
-  instance1 = new ArgumentsBindingClass.positional(forgetType(t0Instance),
-      forgetType(t0Instance));
+    // test class constructors
+    ArgumentsBindingClass instance1 =
+        new ArgumentsBindingClass(forgetType(t0Instance));
+    instance1 = new ArgumentsBindingClass.fNamed(forgetType(t0Instance),
+        t2: forgetType(t0Instance));
+    instance1 = new ArgumentsBindingClass.named(forgetType(t0Instance),
+        t2: forgetType(t0Instance));
+    instance1 = new ArgumentsBindingClass.positional(forgetType(t0Instance),
+        forgetType(t0Instance));
 
-  // tests methods and setters
-  instance1.namedArgumentsMethod(forgetType(t0Instance),
-      t2: forgetType(t0Instance));
-  instance1.positionalArgumentsMethod(forgetType(t0Instance),
-      forgetType(t0Instance));
-  instance1.testSetter = forgetType(t0Instance);
+    // tests methods and setters
+    instance1.namedArgumentsMethod(forgetType(t0Instance),
+        t2: forgetType(t0Instance));
+    instance1.positionalArgumentsMethod(forgetType(t0Instance),
+        forgetType(t0Instance));
+    instance1.testSetter = forgetType(t0Instance);
 
-  // test static methods
-  ArgumentsBindingClass.namedArgumentsStaticMethod(forgetType(t0Instance),
-      t2: forgetType(t0Instance));
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(
-      forgetType(t0Instance), forgetType(t0Instance));
+    // test static methods
+    ArgumentsBindingClass.namedArgumentsStaticMethod(forgetType(t0Instance),
+        t2: forgetType(t0Instance));
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(
+        forgetType(t0Instance), forgetType(t0Instance));
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  // test generic functions
-  namedArgumentsFunc2<Object>(forgetType(t0Instance), t2: forgetType(t0Instance));
+    // test generic functions
+    namedArgumentsFunc2<Object>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
-  // test generic class constructors
-  ArgumentsBindingGen<Object> instance2 =
-      new ArgumentsBindingGen<Object>(forgetType(t0Instance));
-  instance2 = new ArgumentsBindingGen<Object>.fNamed(forgetType(t0Instance),
-      t2: forgetType(t0Instance));
-  instance2 = new ArgumentsBindingGen<Object>.named(forgetType(t0Instance),
-      t2: forgetType(t0Instance));
+    // test generic class constructors
+    ArgumentsBindingGen<Object> instance2 =
+        new ArgumentsBindingGen<Object>(forgetType(t0Instance));
+    instance2 = new ArgumentsBindingGen<Object>.fNamed(forgetType(t0Instance),
+        t2: forgetType(t0Instance));
+    instance2 = new ArgumentsBindingGen<Object>.named(forgetType(t0Instance),
+        t2: forgetType(t0Instance));
 
-  // test generic class methods and setters
-  instance2.namedArgumentsMethod(forgetType(t0Instance),
-      t2: forgetType(t0Instance));
-  instance2.testSetter = forgetType(t0Instance);
-  //# -->
-
+    // test generic class methods and setters
+    instance2.namedArgumentsMethod(forgetType(t0Instance),
+        t2: forgetType(t0Instance));
+    instance2.testSetter = forgetType(t0Instance);
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t02.dart
index fba929e..21986a4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m;
 
@@ -102,40 +97,34 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(forgetType(t0Instance));
-  c1 = new ArgumentsBinding1_t02.c2(t1Instance, forgetType(t0Instance));
-  c1 = new ArgumentsBinding1_t02.c3(forgetType(t0Instance));
-  c1 = new ArgumentsBinding1_t02.c4(t1Instance, forgetType(t0Instance));
-  c1 = new ArgumentsBinding1_t02.c5(forgetType(t0Instance));
+    ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(forgetType(t0Instance));
+    c1 = new ArgumentsBinding1_t02.c2(t1Instance, forgetType(t0Instance));
+    c1 = new ArgumentsBinding1_t02.c3(forgetType(t0Instance));
+    c1 = new ArgumentsBinding1_t02.c4(t1Instance, forgetType(t0Instance));
+    c1 = new ArgumentsBinding1_t02.c5(forgetType(t0Instance));
 
-  c1.test(forgetType(t0Instance), t1Instance);
-  c1.superTest(forgetType(t0Instance));
-  c1.superTestPositioned(forgetType(t0Instance));
-  c1.superTestPositioned(t1Instance, forgetType(t0Instance));
-  c1.superTestNamed(forgetType(t0Instance));
-  c1.superTestNamed(t1Instance, val2: forgetType(t0Instance));
-  c1.superSetter = forgetType(t0Instance);
-  c1.superGetter;
+    c1.test(forgetType(t0Instance), t1Instance);
+    c1.superTest(forgetType(t0Instance));
+    c1.superTestPositioned(forgetType(t0Instance));
+    c1.superTestPositioned(t1Instance, forgetType(t0Instance));
+    c1.superTestNamed(forgetType(t0Instance));
+    c1.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+    c1.superSetter = forgetType(t0Instance);
+    c1.superGetter;
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t02<Object> c2 =
-    new ArgumentsBinding2_t02<Object>(forgetType(t0Instance));
-  c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, forgetType(t0Instance));
-  c2 = new ArgumentsBinding2_t02<Object>.c5(forgetType(t0Instance));
+    ArgumentsBinding2_t02<Object> c2 =
+      new ArgumentsBinding2_t02<Object>(forgetType(t0Instance));
+    c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, forgetType(t0Instance));
+    c2 = new ArgumentsBinding2_t02<Object>.c5(forgetType(t0Instance));
 
-  c2.test(forgetType(t0Instance), t1Instance);
-  c2.superTest(forgetType(t0Instance));
-  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
-  c2.superSetter = forgetType(t0Instance);
-  c2.superGetter;
-  //# -->
-
+    c2.test(forgetType(t0Instance), t1Instance);
+    c2.superTest(forgetType(t0Instance));
+    c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+    c2.superSetter = forgetType(t0Instance);
+    c2.superGetter;
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t03.dart
index a0f6636..9ca2610 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
@@ -80,31 +75,24 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
+    ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
-  c1.test(forgetType(t0Instance), t1Instance);
-  c1.superTest(forgetType(t0Instance));
-  c1.superTestPositioned(forgetType(t0Instance));
-  c1.superTestPositioned(t1Instance, forgetType(t0Instance));
-  c1.superTestNamed(forgetType(t0Instance));
-  c1.superTestNamed(t1Instance, val2: forgetType(t0Instance));
-  c1.superSetter = forgetType(t0Instance);
-  c1.superGetter;
+    c1.test(forgetType(t0Instance), t1Instance);
+    c1.superTest(forgetType(t0Instance));
+    c1.superTestPositioned(forgetType(t0Instance));
+    c1.superTestPositioned(t1Instance, forgetType(t0Instance));
+    c1.superTestNamed(forgetType(t0Instance));
+    c1.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+    c1.superSetter = forgetType(t0Instance);
+    c1.superGetter;
 
-  // Test type parameters
-
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
-  c2.test(forgetType(t0Instance), t1Instance);
-  c2.superTest(forgetType(t0Instance));
-  c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
-  c2.superSetter = forgetType(t0Instance);
-  //# -->
-
+    // Test type parameters
+    ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
+    c2.test(forgetType(t0Instance), t1Instance);
+    c2.superTest(forgetType(t0Instance));
+    c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
+    c2.superSetter = forgetType(t0Instance);
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t01.dart
index 1b3d05b..9173a17 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,8 +37,6 @@
 
 const t1Default = const Object();
 
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -111,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -127,5 +123,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t02.dart
index 931e64f..53136b6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m;
 
@@ -120,7 +116,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object> c2 =
     new ArgumentsBinding2_t02<Object>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, forgetType(t0Instance));
@@ -131,5 +126,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t03.dart
index c36df5a..eb9f9da 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A04_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
@@ -93,12 +89,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t01.dart
index b9d0c42..31ab7e5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,8 +37,6 @@
 
 const t1Default = const Object();
 
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -111,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -127,5 +123,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t02.dart
index ebafd15..84d0c1a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m;
 
@@ -120,7 +116,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object> c2 =
     new ArgumentsBinding2_t02<Object>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, forgetType(t0Instance));
@@ -131,5 +126,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t03.dart
index 985a91d..1eac575 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_arguments_binding_A05_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
@@ -93,12 +89,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t01.dart
index c182921..249dde2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMember1_t01 {
   static Object s = forgetType(t0Instance);
   Object m = forgetType(t0Instance);
@@ -107,36 +102,30 @@
   Object get getter => forgetType(_p);
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  ClassMember1_t01 c1 = new ClassMember1_t01();
-  c1 = new ClassMember1_t01.short(forgetType(t0Instance),
-      forgetType(t0Instance));
-  c1 = new ClassMember1_t01.named(forgetType(t0Instance));
-  c1.m = forgetType(t0Instance);
-  c1.test();
-  c1.setter = forgetType(t0Instance);
-  c1.getter;
+    ClassMember1_t01 c1 = new ClassMember1_t01();
+    c1 = new ClassMember1_t01.short(forgetType(t0Instance),
+        forgetType(t0Instance));
+    c1 = new ClassMember1_t01.named(forgetType(t0Instance));
+    c1.m = forgetType(t0Instance);
+    c1.test();
+    c1.setter = forgetType(t0Instance);
+    c1.getter;
 
-  ClassMember1_t01.s = forgetType(t0Instance);
-  ClassMember1_t01.staticTest();
-  ClassMember1_t01.staticSetter = forgetType(t0Instance);
-  ClassMember1_t01.staticGetter;
+    ClassMember1_t01.s = forgetType(t0Instance);
+    ClassMember1_t01.staticTest();
+    ClassMember1_t01.staticSetter = forgetType(t0Instance);
+    ClassMember1_t01.staticGetter;
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  ClassMember2_t01<Object> c2 = new ClassMember2_t01<Object>();
-  c2 = new ClassMember2_t01<Object>.short(forgetType(t0Instance),
-  forgetType(t0Instance));
-  c2 = new ClassMember2_t01<Object>.named(forgetType(t0Instance));
-  c2.m = forgetType(t0Instance);
-  c2.test(forgetType(t0Instance));
-  c2.getter;
-  //# -->
-
+    ClassMember2_t01<Object> c2 = new ClassMember2_t01<Object>();
+    c2 = new ClassMember2_t01<Object>.short(forgetType(t0Instance),
+    forgetType(t0Instance));
+    c2 = new ClassMember2_t01<Object>.named(forgetType(t0Instance));
+    c2.m = forgetType(t0Instance);
+    c2.test(forgetType(t0Instance));
+    c2.getter;
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t02.dart
index 6c5f4d3..782d122 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   Object m;
 
@@ -97,28 +92,22 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  ClassMember1_t02 c1 = new ClassMember1_t02();
-  c1 = new ClassMember1_t02.short();
-  c1 = new ClassMember1_t02.named();
-  c1.m = forgetType(t0Instance);
-  c1.test();
-  c1.superSetter = forgetType(t0Instance);
+    ClassMember1_t02 c1 = new ClassMember1_t02();
+    c1 = new ClassMember1_t02.short();
+    c1 = new ClassMember1_t02.named();
+    c1.m = forgetType(t0Instance);
+    c1.test();
+    c1.superSetter = forgetType(t0Instance);
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  ClassMember2_t02<Object> c2 = new ClassMember2_t02<Object>();
-  c2 = new ClassMember2_t02<Object>.short();
-  c2 = new ClassMember2_t02<Object>.named();
-  c2.m = forgetType(t0Instance);
-  c2.test();
-  c2.superSetter = forgetType(t0Instance);
-  //# -->
-
+    ClassMember2_t02<Object> c2 = new ClassMember2_t02<Object>();
+    c2 = new ClassMember2_t02<Object>.short();
+    c2 = new ClassMember2_t02<Object>.named();
+    c2.m = forgetType(t0Instance);
+    c2.test();
+    c2.superSetter = forgetType(t0Instance);
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t03.dart
index f9cb033..59c5885 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
@@ -67,24 +62,18 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  ClassMember1_t03 c1 = new ClassMember1_t03();
-  c1.m = forgetType(t0Instance);
-  c1.test();
-  c1.superSetter = forgetType(t0Instance);
+    ClassMember1_t03 c1 = new ClassMember1_t03();
+    c1.m = forgetType(t0Instance);
+    c1.test();
+    c1.superSetter = forgetType(t0Instance);
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  ClassMember2_t03<Object> c2 = new ClassMember2_t03<Object>(t1Instance);
-  c2.m = forgetType(t0Instance);
-  c2.test();
-  c2.superSetter = forgetType(t0Instance);
-  //# -->
-
+    ClassMember2_t03<Object> c2 = new ClassMember2_t03<Object>(t1Instance);
+    c2.m = forgetType(t0Instance);
+    c2.test();
+    c2.superSetter = forgetType(t0Instance);
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t01.dart
index ec9ddab..5700e26 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static Object s = forgetType(t0Instance);
   Object m = forgetType(t0Instance);
@@ -124,7 +120,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Object> c2 = new ClassMember2_t01<Object>();
   c2 = new ClassMember2_t01<Object>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -132,5 +127,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t02.dart
index 5e62786..c8800fc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m;
 
@@ -107,12 +103,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Object> c2 = new ClassMember2_t02<Object>();
   c2 = new ClassMember2_t02<Object>.short();
   c2 = new ClassMember2_t02<Object>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t03.dart
index 9c31c8f..4f6a05e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A04_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
@@ -75,10 +71,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Object> c2 = new ClassMember2_t03<Object>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t01.dart
index 5325010..621b7cf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static Object s = forgetType(t0Instance);
   Object m = forgetType(t0Instance);
@@ -124,7 +120,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Object> c2 = new ClassMember2_t01<Object>();
   c2 = new ClassMember2_t01<Object>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -132,5 +127,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t02.dart
index 5cdaabd..56e0f21 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m;
 
@@ -107,12 +103,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Object> c2 = new ClassMember2_t02<Object>();
   c2 = new ClassMember2_t02<Object>.short();
   c2 = new ClassMember2_t02<Object>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t03.dart
index f604c3b..34c0ce2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_class_member_A05_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
@@ -75,10 +71,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Object> c2 = new ClassMember2_t03<Object>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t01.dart
index 6fa5826..e21a58c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 class S {}
@@ -40,8 +40,6 @@
 
 const t1Default = const Object();
 
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -184,7 +182,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<Object>(t1Instance, t2: forgetType(t0Instance));
@@ -203,7 +200,6 @@
     new ArgumentsBindingClassGen<Object>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<Object>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -213,7 +209,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<Object>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t02.dart
index 683d5d6..072d68a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 class S {}
@@ -40,8 +40,6 @@
 
 const t1Default = const Object();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m;
 
@@ -276,7 +274,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<Object>(forgetType(t0Instance));
@@ -308,5 +305,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<Object>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t03.dart
index 7d2b8ac..497cc03 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A07_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 class S {}
@@ -40,8 +40,6 @@
 
 const t1Default = const Object();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
@@ -245,7 +243,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<Object>().superTest(forgetType(t0Instance));
@@ -272,5 +269,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<Object>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t01.dart
index 397f60f..e8e66d7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 FutureOr<Null> t0Instance = null;
@@ -38,8 +38,6 @@
 
 const t1Default = const Object();
 
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -182,7 +180,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<Object>(t1Instance, t2: forgetType(t0Instance));
@@ -201,7 +198,6 @@
     new ArgumentsBindingClassGen<Object>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<Object>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -211,7 +207,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<Object>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t02.dart
index a652d2b..45037b4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 FutureOr<Null> t0Instance = null;
@@ -38,8 +38,6 @@
 
 const t1Default = const Object();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m;
 
@@ -274,7 +272,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<Object>(forgetType(t0Instance));
@@ -306,5 +303,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<Object>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t03.dart
index de60a85..4a540dc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_arguments_binding_fail_A08_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 FutureOr<Null> t0Instance = null;
@@ -38,8 +38,6 @@
 
 const t1Default = const Object();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
@@ -243,7 +241,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<Object>().superTest(forgetType(t0Instance));
@@ -270,5 +267,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<Object>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t01.dart
index 6a0ca0e..490aa3f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 class S {}
@@ -40,8 +40,6 @@
 
 const t1Default = const Object();
 
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
@@ -193,7 +191,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -213,7 +210,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<Object>(t1Instance).getter;
@@ -258,5 +254,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<Object>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t02.dart
index 60bf6af..84b4df2 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 class S {}
@@ -40,8 +40,6 @@
 
 const t1Default = const Object();
 
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
@@ -133,7 +131,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<Object>();
   }, (e) => e is TypeError);
@@ -155,5 +152,4 @@
   Expect.throws(() {
     new ClassMember2_t02<Object>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t03.dart
index a512b38..75c173e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A07_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 class S {}
@@ -40,8 +40,6 @@
 
 const t1Default = const Object();
 
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
 
@@ -96,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<Object>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -109,5 +106,4 @@
   Expect.throws(() {
     new ClassMember2_t03<Object>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t01.dart
index bcb3844..6bdfd70 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 FutureOr<Null> t0Instance = null;
@@ -38,8 +38,6 @@
 
 const t1Default = const Object();
 
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
@@ -191,7 +189,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -211,7 +208,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<Object>(t1Instance).getter;
@@ -256,5 +252,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<Object>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t02.dart
index 77b10d8..33d8dc5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 FutureOr<Null> t0Instance = null;
@@ -38,8 +38,6 @@
 
 const t1Default = const Object();
 
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
@@ -131,7 +129,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<Object>();
   }, (e) => e is TypeError);
@@ -153,5 +150,4 @@
   Expect.throws(() {
     new ClassMember2_t02<Object>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t03.dart
index cc8a584..59379b5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_class_member_fail_A08_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 FutureOr<Null> t0Instance = null;
@@ -38,8 +38,6 @@
 
 const t1Default = const Object();
 
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
 
@@ -94,7 +92,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<Object>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -107,5 +104,4 @@
   Expect.throws(() {
     new ClassMember2_t03<Object>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_global_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_global_variable_fail_A07_t01.dart
index 2b8fa1c..df7a92a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_global_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_global_variable_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 class S {}
@@ -40,8 +40,6 @@
 
 const t1Default = const Object();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_global_variable_fail_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_global_variable_fail_A08_t01.dart
index 75d24a1..3e0a90c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_global_variable_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_global_variable_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 FutureOr<Null> t0Instance = null;
@@ -38,8 +38,6 @@
 
 const t1Default = const Object();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_local_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_local_variable_fail_A07_t01.dart
index 2c0dd48..d682f68 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_local_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_local_variable_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 class S {}
@@ -40,8 +40,6 @@
 
 const t1Default = const Object();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_local_variable_fail_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_local_variable_fail_A08_t01.dart
index e947b03..f5c9187 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_local_variable_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_local_variable_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 FutureOr<Null> t0Instance = null;
@@ -38,8 +38,6 @@
 
 const t1Default = const Object();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_return_value_fail_A07_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_return_value_fail_A07_t01.dart
index 02e7869..e9befeb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_return_value_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_return_value_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 class S {}
@@ -40,8 +40,6 @@
 
 const t1Default = const Object();
 
-
-
 Object returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -79,12 +77,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<Object>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<Object>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_return_value_fail_A08_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_return_value_fail_A08_t01.dart
index 30ddbc4..a7686f7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_return_value_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_fail_return_value_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,16 +21,16 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 FutureOr<Null> t0Instance = null;
@@ -38,8 +38,6 @@
 
 const t1Default = const Object();
 
-
-
 Object returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -77,12 +75,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<Object>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<Object>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A01_t01.dart
index b00e486..baf6db5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
@@ -55,20 +50,16 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  bar () {
+    bar () {
+      t1Instance = forgetType(t0Instance);
+    }
+
     t1Instance = forgetType(t0Instance);
-  }
-
-  t1Instance = forgetType(t0Instance);
-  bar();
-  GlobalVariableTest t = new GlobalVariableTest();
-  t.foo();
-  GlobalVariableTest.test();
-
+    bar();
+    GlobalVariableTest t = new GlobalVariableTest();
+    t.foo();
+    GlobalVariableTest.test();
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A04_t01.dart
index 08349de..5e222fe 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A05_t01.dart
index eea6612..a7e9001 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_global_variable_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A01_t01.dart
index bb36bf8..5a6777b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -59,22 +54,18 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  foo() {
+    foo() {
+      Object t1 = forgetType(t0Instance);
+      t1 = forgetType(t0Instance);
+    }
+
     Object t1 = forgetType(t0Instance);
     t1 = forgetType(t0Instance);
-  }
-
-  Object t1 = forgetType(t0Instance);
-  t1 = forgetType(t0Instance);
-  foo();
-  LocalVariableTest x = new LocalVariableTest();
-  x.test();
-  LocalVariableTest.staticTest();
-
+    foo();
+    LocalVariableTest x = new LocalVariableTest();
+    x.test();
+    LocalVariableTest.staticTest();
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A04_t01.dart
index 1bace29..8cd055b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A05_t01.dart
index aca3fcc..62d7789 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_local_variable_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A01_t01.dart
index c9a305e..6bb7e7f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -37,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 Object returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -56,28 +51,21 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
-
-
 test<T extends B>(T t0Instance) {
-    
-  Object returnValueLocalFunc() => forgetType(t0Instance);
+    Object returnValueLocalFunc() => forgetType(t0Instance);
 
-  returnValueFunc();
-  returnValueLocalFunc();
+    returnValueFunc();
+    returnValueLocalFunc();
 
-  ReturnValueTest.staticTestMethod();
+    ReturnValueTest.staticTestMethod();
 
-  new ReturnValueTest().testMethod();
-  new ReturnValueTest().testGetter;
+    new ReturnValueTest().testMethod();
+    new ReturnValueTest().testGetter;
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  new ReturnValueGen<Object>().testMethod();
-  new ReturnValueGen<Object>().testGetter;
-  //# -->
-
+    new ReturnValueGen<Object>().testMethod();
+    new ReturnValueGen<Object>().testGetter;
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A04_t01.dart
index 5e39260..e0ad492 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -56,7 +52,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Object returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -70,8 +65,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Object>().testMethod();
   new ReturnValueGen<Object>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A05_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A05_t01.dart
index 3d0a189..9661a25 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_object_return_value_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,11 +21,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -38,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -56,7 +52,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Object returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -70,8 +65,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Object>().testMethod();
   new ReturnValueGen<Object>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t01.dart
index 16826c2..02f555f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,8 +27,6 @@
 
 const t1Default = null;
 
-
-
 namedArgumentsFunc1(Object? t1, {Object? t2 = t1Default}) {}
 positionalArgumentsFunc1(Object? t1, [Object? t2 = t1Default]) {}
 
@@ -101,7 +98,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object?>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -117,5 +113,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t02.dart
index a1a47a8..28442f7 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object? m;
 
@@ -110,7 +106,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object?> c2 =
     new ArgumentsBinding2_t02<Object?>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Object?>.c2(t1Instance, forgetType(t0Instance));
@@ -121,5 +116,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t03.dart
index 129b771..954cc12 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A01_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Object? m = t1Default;
 
@@ -83,12 +79,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object?> c2 = new ArgumentsBinding2_t03<Object?>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t01.dart
index 29ed16e..03badd3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,8 +27,6 @@
 
 const t1Default = null;
 
-
-
 namedArgumentsFunc1(dynamic t1, {dynamic t2 = t1Default}) {}
 positionalArgumentsFunc1(dynamic t1, [dynamic t2 = t1Default]) {}
 
@@ -101,7 +98,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<dynamic>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -117,5 +113,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t02.dart
index ff34abb..cd14219 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   dynamic m;
 
@@ -110,7 +106,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<dynamic> c2 =
     new ArgumentsBinding2_t02<dynamic>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<dynamic>.c2(t1Instance, forgetType(t0Instance));
@@ -121,5 +116,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t03.dart
index f091107..6fd3c78 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A02_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   dynamic m = t1Default;
 
@@ -83,12 +79,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<dynamic> c2 = new ArgumentsBinding2_t03<dynamic>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t01.dart
index 7b8795c..1b2acc8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,8 +25,6 @@
 
 const t1Default = null;
 
-
-
 namedArgumentsFunc1(Object? t1, {Object? t2 = t1Default}) {}
 positionalArgumentsFunc1(Object? t1, [Object? t2 = t1Default]) {}
 
@@ -99,7 +96,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object?>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -115,5 +111,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t02.dart
index 47a5f46..1b5c79f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object? m;
 
@@ -108,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object?> c2 =
     new ArgumentsBinding2_t02<Object?>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<Object?>.c2(t1Instance, forgetType(t0Instance));
@@ -119,5 +114,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t03.dart
index 0f5eba3..9626516 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A03_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   Object? m = t1Default;
 
@@ -81,12 +77,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object?> c2 = new ArgumentsBinding2_t03<Object?>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t01.dart
index 83b10d4..c608f76 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,8 +25,6 @@
 
 const t1Default = null;
 
-
-
 namedArgumentsFunc1(dynamic t1, {dynamic t2 = t1Default}) {}
 positionalArgumentsFunc1(dynamic t1, [dynamic t2 = t1Default]) {}
 
@@ -99,7 +96,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<dynamic>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -115,5 +111,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t02.dart
index e7a998f..5a739da 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   dynamic m;
 
@@ -108,7 +104,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<dynamic> c2 =
     new ArgumentsBinding2_t02<dynamic>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<dynamic>.c2(t1Instance, forgetType(t0Instance));
@@ -119,5 +114,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t03.dart
index 742e603..d60da15 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_arguments_binding_A04_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   dynamic m = t1Default;
 
@@ -81,12 +77,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<dynamic> c2 = new ArgumentsBinding2_t03<dynamic>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t01.dart
index 9704803..3a4a1ed 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static Object? s = forgetType(t0Instance);
   Object? m = forgetType(t0Instance);
@@ -114,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Object?> c2 = new ClassMember2_t01<Object?>();
   c2 = new ClassMember2_t01<Object?>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -122,5 +117,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t02.dart
index bb726c1..6d84b3a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object? m;
 
@@ -97,12 +93,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Object?> c2 = new ClassMember2_t02<Object?>();
   c2 = new ClassMember2_t02<Object?>.short();
   c2 = new ClassMember2_t02<Object?>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t03.dart
index a2bc182..40f7c28 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A01_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object? m = t1Default;
 
@@ -65,10 +61,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Object?> c2 = new ClassMember2_t03<Object?>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t01.dart
index 5acb6bb..f89e45d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static dynamic s = forgetType(t0Instance);
   dynamic m = forgetType(t0Instance);
@@ -114,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<dynamic> c2 = new ClassMember2_t01<dynamic>();
   c2 = new ClassMember2_t01<dynamic>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -122,5 +117,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t02.dart
index 63bd4ee..447e646 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   dynamic m;
 
@@ -97,12 +93,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<dynamic> c2 = new ClassMember2_t02<dynamic>();
   c2 = new ClassMember2_t02<dynamic>.short();
   c2 = new ClassMember2_t02<dynamic>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t03.dart
index 2fcbcdc..e15454e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A02_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   dynamic m = t1Default;
 
@@ -65,10 +61,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<dynamic> c2 = new ClassMember2_t03<dynamic>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t01.dart
index 4a666f1..6004ef9 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static Object? s = forgetType(t0Instance);
   Object? m = forgetType(t0Instance);
@@ -112,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<Object?> c2 = new ClassMember2_t01<Object?>();
   c2 = new ClassMember2_t01<Object?>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -120,5 +115,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t02.dart
index fe5ee60..18f1af1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object? m;
 
@@ -95,12 +91,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<Object?> c2 = new ClassMember2_t02<Object?>();
   c2 = new ClassMember2_t02<Object?>.short();
   c2 = new ClassMember2_t02<Object?>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t03.dart
index 261480f..ee8bd31 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A03_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object? m = t1Default;
 
@@ -63,10 +59,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<Object?> c2 = new ClassMember2_t03<Object?>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t01.dart
index f1d91ce..a8b0a86 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static dynamic s = forgetType(t0Instance);
   dynamic m = forgetType(t0Instance);
@@ -112,7 +108,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<dynamic> c2 = new ClassMember2_t01<dynamic>();
   c2 = new ClassMember2_t01<dynamic>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -120,5 +115,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t02.dart
index 6bf91b5..d525273 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t02.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   dynamic m;
 
@@ -95,12 +91,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<dynamic> c2 = new ClassMember2_t02<dynamic>();
   c2 = new ClassMember2_t02<dynamic>.short();
   c2 = new ClassMember2_t02<dynamic>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t03.dart
index 9766d28..9a2b9a3 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_class_member_A04_t03.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   dynamic m = t1Default;
 
@@ -63,10 +59,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<dynamic> c2 = new ClassMember2_t03<dynamic>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A01_t01.dart
index f0c02d0..e07faa1 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A02_t01.dart
index 2abdcc3..8e3a4ad 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A02_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A03_t01.dart
index 700ee7c..5c231a6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A03_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A04_t01.dart
index b48f391..15f3b6d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_global_variable_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A01_t01.dart
index 19c07a2..9c299d4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A02_t01.dart
index 5f90923..3a068ad 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A02_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A03_t01.dart
index 4781741..a1b648b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A03_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A04_t01.dart
index 3653351..afb8dc6 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_local_variable_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A01_t01.dart
index 960f406..2335338 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A01_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 Object? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -46,7 +42,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Object? returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -60,8 +55,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Object?>().testMethod();
   new ReturnValueGen<Object?>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A02_t01.dart
index 5d5707e..11e7748 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A02_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -28,9 +27,6 @@
 
 const t1Default = null;
 
-
-
-
 dynamic returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -46,7 +42,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   dynamic returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -60,8 +55,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<dynamic>().testMethod();
   new ReturnValueGen<dynamic>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A03_t01.dart
index 86416d0..f7ebcb5 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A03_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 Object? returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -44,7 +40,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   Object? returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -58,8 +53,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<Object?>().testMethod();
   new ReturnValueGen<Object?>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A04_t01.dart
index 9446bde..91607db 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/right_top_return_value_A04_t01.dart
@@ -13,11 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -26,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 dynamic returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -44,7 +40,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   dynamic returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -58,8 +53,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<dynamic>().testMethod();
   new ReturnValueGen<dynamic>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t01.dart
index e3f6e9c..5b24baf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,8 +38,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -112,7 +109,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -128,5 +124,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t02.dart
index c9052f2..3be5c29 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t02.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -121,7 +117,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
@@ -132,5 +127,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t03.dart
index 142f212..9f4bc29 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A01_t03.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -94,12 +90,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t01.dart
index c2c0e7b..4120af4 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,8 +39,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -113,7 +110,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -129,5 +125,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t02.dart
index 7c3a372..5354b85 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t02.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -122,7 +118,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
@@ -133,5 +128,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t03.dart
index 68b5991..40fc96a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A02_t03.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -95,12 +91,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t01.dart
index 6f7b761..cc553c8 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -42,8 +41,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -115,7 +112,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -131,5 +127,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t02.dart
index 385f1df..07b2fdc 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t02.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -42,9 +41,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -124,7 +120,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, forgetType(t0Instance));
@@ -135,5 +130,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t03.dart
index 95f6c84..601bd9f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_arguments_binding_A03_t03.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -42,9 +41,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
@@ -97,12 +93,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t01.dart
index 9e23167..77253bf 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -125,7 +121,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
   c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -133,5 +128,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t02.dart
index c3a7e51..207b60f 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t02.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -108,12 +104,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
   c2 = new ClassMember2_t02<T1>.short();
   c2 = new ClassMember2_t02<T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t03.dart
index e813189..028222a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A01_t03.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -76,10 +72,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t01.dart
index 33ee5dd..ae8e60d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -126,7 +122,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
   c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -134,5 +129,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t02.dart
index f71efcd..2e5846b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t02.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -109,12 +105,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
   c2 = new ClassMember2_t02<T1>.short();
   c2 = new ClassMember2_t02<T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t03.dart
index c06e926..30d4a73 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A02_t03.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -77,10 +73,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t01.dart
index 7a55d1c..3e9007d 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -42,9 +41,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = forgetType(t0Instance);
   T1 m = forgetType(t0Instance);
@@ -128,7 +124,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<T1> c2 = new ClassMember2_t01<T1>();
   c2 = new ClassMember2_t01<T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -136,5 +131,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t02.dart
index 9ee99c1..e6bf05b 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t02.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -42,9 +41,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m;
 
@@ -111,12 +107,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<T1> c2 = new ClassMember2_t02<T1>();
   c2 = new ClassMember2_t02<T1>.short();
   c2 = new ClassMember2_t02<T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t03.dart
index 3e7bbc5..f6d12ed 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_class_member_A03_t03.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -42,9 +41,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -79,10 +75,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<T1> c2 = new ClassMember2_t03<T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t01.dart
index 6f88138..2950eca 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t01.dart
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const T1();
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -185,7 +182,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<T1>(t1Instance, t2: forgetType(t0Instance));
@@ -204,7 +200,6 @@
     new ArgumentsBindingClassGen<T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -214,7 +209,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t02.dart
index 3f868c9..1a4caac 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t02.dart
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// arguments_binding_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const T1();
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m;
 
@@ -277,7 +274,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<T1>(forgetType(t0Instance));
@@ -309,5 +305,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t03.dart
index 8598365..f6a9cac 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_arguments_binding_fail_A01_t03.dart
@@ -14,11 +14,10 @@
 /// be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// arguments_binding_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const T1();
 
-
-
 class ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
@@ -246,7 +243,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<T1>().superTest(forgetType(t0Instance));
@@ -273,5 +269,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t01.dart
index 110f26d..d48c9fb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t01.dart
@@ -14,11 +14,10 @@
 /// be used as a class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -194,7 +191,6 @@
     new ClassMemberTestPublic(t1Instance).getter;
   }, (e) => e is TypeError);
 
-
   // Test static stuff
   Expect.throws(() {
     new ClassMemberTestStatic(t0Instance);
@@ -214,7 +210,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<T1>(t1Instance).getter;
@@ -259,5 +254,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t02.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t02.dart
index 2851862..8a377cb 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t02.dart
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// class_member_fail_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/class_member_fail_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -134,7 +131,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<T1>();
   }, (e) => e is TypeError);
@@ -156,5 +152,4 @@
   Expect.throws(() {
     new ClassMember2_t02<T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t03.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t03.dart
index 3dc1061..fff5982 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_class_member_fail_A01_t03.dart
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// class_member_fail_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/class_member_fail_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const T1();
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
 
@@ -97,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -110,5 +106,4 @@
   Expect.throws(() {
     new ClassMember2_t03<T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_global_variable_fail_A01_t01.dart
index 098e08f..c6ffa26 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_global_variable_fail_A01_t01.dart
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const T1();
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_local_variable_fail_A01_t01.dart
index 6f6985e..bed8b66 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_local_variable_fail_A01_t01.dart
@@ -14,11 +14,10 @@
 /// instance of T0 cannot be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const T1();
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_return_value_fail_A01_t01.dart
index 593834d..de7eac0 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_fail_return_value_fail_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 cannot be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 import '../../../../Utils/expect.dart';
@@ -41,8 +40,6 @@
 
 const t1Default = const T1();
 
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -80,12 +77,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A01_t01.dart
index 8f0be45..4483245 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A02_t01.dart
index ef3d76c..d41247e 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A02_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A03_t01.dart
index 2c1c448..ce0ad3c 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_global_variable_A03_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -42,9 +41,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A01_t01.dart
index 229ded4..3c10434 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A02_t01.dart
index e48eb4b..629ee64 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A02_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A03_t01.dart
index 31e6ff5..93dc711 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_local_variable_A03_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -42,9 +41,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A01_t01.dart
index 34fef7d..a42b590 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A01_t01.dart
@@ -14,11 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -39,9 +38,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -57,7 +53,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -71,8 +66,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1>().testMethod();
   new ReturnValueGen<T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A02_t01.dart
index 9e2dad5..15ff91a 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A02_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -40,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -58,7 +54,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -72,8 +67,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1>().testMethod();
   new ReturnValueGen<T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A03_t01.dart
index 209fb4b..89ca992 100644
--- a/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/generated/super_interface_return_value_A03_t01.dart
@@ -15,11 +15,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import '../../utils/common.dart';
 
@@ -42,9 +41,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -60,7 +56,6 @@
   X get testGetter => forgetType(t0Instance);
 }
 
-
 main() {
   T1 returnValueLocalFunc() => forgetType(t0Instance);
 
@@ -74,8 +69,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<T1>().testMethod();
   new ReturnValueGen<T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x01.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x01.dart
index e4d897f..463365a 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x01.dart
@@ -148,7 +148,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test generic functions
   Expect.throws(() {
     namedArgumentsFunc2<@T1>(t1Instance, t2: forgetType(t0Instance));
@@ -167,7 +166,6 @@
     new ArgumentsBindingClassGen<@T1>.fNamed(t1Instance, t2: forgetType(t0Instance));
   }, (e) => e is TypeError);
 
-
   // Test instance methods and setters
   Expect.throws(() {
     new ArgumentsBindingClassGen<@T1>(t1Instance).namedArgumentsMethod(t1Instance,
@@ -177,7 +175,6 @@
   Expect.throws(() {
     new ArgumentsBindingClassGen<@T1>(t1Instance).testSetter = forgetType(t0Instance);
   }, (e) => e is TypeError);
-  //# -->
 
   // Test superclass constructor call
   Expect.throws(() {
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x02.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x02.dart
index 0b91d80..9fdfd37 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x02.dart
@@ -240,7 +240,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class constructors
   Expect.throws(() {
     new ArgumentsBinding2_t02<@T1>(forgetType(t0Instance));
@@ -272,5 +271,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t02<@T1>(t1Instance).test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x03.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x03.dart
index 9a3abea..de1de07 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_fail_x03.dart
@@ -209,7 +209,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic class members
   Expect.throws(() {
     new ArgumentsBinding2_t03<@T1>().superTest(forgetType(t0Instance));
@@ -236,5 +235,4 @@
   }, (e) => e is TypeError);
 
   new ArgumentsBinding2_t03<@T1>().test();
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x01.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x01.dart
index b0b457c..488cc7d 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x01.dart
@@ -77,7 +77,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<@T1>(forgetType(t0Instance), t2: forgetType(t0Instance));
 
@@ -93,5 +92,4 @@
   instance2.namedArgumentsMethod(forgetType(t0Instance),
       t2: forgetType(t0Instance));
   instance2.testSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x02.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x02.dart
index 753a2b3..810dbac 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x02.dart
@@ -6,7 +6,6 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 
-
 class ArgumentsBindingSuper1_t02 {
   @T1 m;
 
@@ -86,7 +85,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<@T1> c2 =
     new ArgumentsBinding2_t02<@T1>(forgetType(t0Instance));
   c2 = new ArgumentsBinding2_t02<@T1>.c2(t1Instance, forgetType(t0Instance));
@@ -97,5 +95,4 @@
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x03.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x03.dart
index 463f647..5ef3e1a 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/arguments_binding_x03.dart
@@ -6,7 +6,6 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 
-
 class ArgumentsBindingMixin1_t03 {
   @T1 m = t1Default;
 
@@ -59,12 +58,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<@T1> c2 = new ArgumentsBinding2_t03<@T1>();
   c2.test(forgetType(t0Instance), t1Instance);
   c2.superTest(forgetType(t0Instance));
   c2.superTestNamed(t1Instance, val2: forgetType(t0Instance));
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x01.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x01.dart
index 81c6b43..1e70020 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x01.dart
@@ -177,7 +177,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // Test getters
   Expect.throws(() {
     new ClassMemberTestGenericPublic<@T1>(t1Instance).getter;
@@ -222,5 +221,4 @@
   Expect.throws(() {
     new ClassMemberTestGenericPrivate<@T1>.short(forgetType(t0Instance));
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x02.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x02.dart
index 3f78e6e..aac4cf2 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x02.dart
@@ -97,7 +97,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t02<@T1>();
   }, (e) => e is TypeError);
@@ -119,5 +118,4 @@
   Expect.throws(() {
     new ClassMember2_t02<@T1>().test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x03.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x03.dart
index a423512..ad475d9 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_fail_x03.dart
@@ -60,7 +60,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ClassMember2_t03<@T1>(t1Instance).m = forgetType(t0Instance);
   }, (e) => e is TypeError);
@@ -73,5 +72,4 @@
   Expect.throws(() {
     new ClassMember2_t03<@T1>(t1Instance).test2();
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x01.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x01.dart
index b4516d9..5626aff 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x01.dart
@@ -6,7 +6,6 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class ClassMember1_t01 {
   static @T1 s = forgetType(t0Instance);
   @T1 m = forgetType(t0Instance);
@@ -90,7 +89,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t01<@T1> c2 = new ClassMember2_t01<@T1>();
   c2 = new ClassMember2_t01<@T1>.short(forgetType(t0Instance),
   forgetType(t0Instance));
@@ -98,5 +96,4 @@
   c2.m = forgetType(t0Instance);
   c2.test(forgetType(t0Instance));
   c2.getter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x02.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x02.dart
index db16cfa..c8387d6 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x02.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x02.dart
@@ -6,7 +6,6 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class ClassMemberSuper1_t02 {
   @T1 m;
 
@@ -73,12 +72,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t02<@T1> c2 = new ClassMember2_t02<@T1>();
   c2 = new ClassMember2_t02<@T1>.short();
   c2 = new ClassMember2_t02<@T1>.named();
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x03.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x03.dart
index 8386c6e..646d0f1 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x03.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/class_member_x03.dart
@@ -6,7 +6,6 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class ClassMemberMixin1_t03 {
   @T1 m = t1Default;
 
@@ -41,10 +40,8 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   ClassMember2_t03<@T1> c2 = new ClassMember2_t03<@T1>(t1Instance);
   c2.m = forgetType(t0Instance);
   c2.test();
   c2.superSetter = forgetType(t0Instance);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/global_variable_x01.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/global_variable_x01.dart
index 5c363e9..ce76c0c 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/global_variable_x01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/global_variable_x01.dart
@@ -6,7 +6,6 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = forgetType(t0Instance);
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/local_variable_x01.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/local_variable_x01.dart
index bfbed8a..9117eaa 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/local_variable_x01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/local_variable_x01.dart
@@ -6,7 +6,6 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/return_value_fail_x01.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/return_value_fail_x01.dart
index 4505eab..859b96c 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/return_value_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/return_value_fail_x01.dart
@@ -43,12 +43,10 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   Expect.throws(() {
     new ReturnValueGen<@T1>().testMethod();
   }, (e) => e is TypeError);
   Expect.throws(() {
     new ReturnValueGen<@T1>().testGetter;
   }, (e) => e is TypeError);
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_cases/return_value_x01.dart b/LanguageFeatures/Subtyping/dynamic/test_cases/return_value_x01.dart
index d5a9810..9705a7e 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_cases/return_value_x01.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_cases/return_value_x01.dart
@@ -6,7 +6,6 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 
-
 @T1 returnValueFunc() => forgetType(t0Instance);
 
 class ReturnValueTest {
@@ -36,8 +35,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   new ReturnValueGen<@T1>().testMethod();
   new ReturnValueGen<@T1>().testGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/dynamic/test_types/right_object_fail_A07.dart b/LanguageFeatures/Subtyping/dynamic/test_types/right_object_fail_A07.dart
index 6edf698..452b0a5 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_types/right_object_fail_A07.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_types/right_object_fail_A07.dart
@@ -18,6 +18,7 @@
 /// @author sgrekhov@unipro.ru
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 class S {}
diff --git a/LanguageFeatures/Subtyping/dynamic/test_types/right_object_fail_A08.dart b/LanguageFeatures/Subtyping/dynamic/test_types/right_object_fail_A08.dart
index 9c4466a..7c3dca1 100644
--- a/LanguageFeatures/Subtyping/dynamic/test_types/right_object_fail_A08.dart
+++ b/LanguageFeatures/Subtyping/dynamic/test_types/right_object_fail_A08.dart
@@ -18,6 +18,7 @@
 /// @author sgrekhov@unipro.ru
 
 // Requirements=nnbd-strong
+
 import "dart:async";
 
 FutureOr<Null> t0Instance = null;
diff --git a/LanguageFeatures/Subtyping/generator/generator.dart b/LanguageFeatures/Subtyping/generator/generator.dart
index 24112bc..2945012 100644
--- a/LanguageFeatures/Subtyping/generator/generator.dart
+++ b/LanguageFeatures/Subtyping/generator/generator.dart
@@ -23,51 +23,15 @@
 /// //# @T1 = dynamic
 ///
 /// - If test case or test type is negative, then its name must contain "_fail_"
-/// - If test type contains generic function types it must contain
-///   "//# @GenericFunctionType" string at the end. For example
-///   ...
-///  typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
-///  V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-///  {V2<dynamic, void, Object> x2, V3<dynamic, void, Object> x3, V4<dynamic, void, Object> x4});
-///  typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
-///  S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
-///  {S2<C, List<String>, int> x2, S3<C, List<String>, int> x3});
-///
-///  U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
-///  V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-///  {V2<dynamic, void, Object> x2, V3<dynamic, void, Object> x3,
-///  V4<dynamic, void, Object> x4}) => null;
-///  U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
-///  S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
-///  {S2<C, List<String>, int> x2, S3<C, List<String>, int> x3}) => null;
-///
-///  T0 t0Instance = t0Func;
-///  T1 t1Instance = t1Func;
-///  //# @T0 = T0
-///  //# @T1 = T1
-///  //# @GenericFunctionType
-///
-/// - If test case has tests for the types wich are not generic function types,
-/// this block must be marked by
-///   //# <-- NotGenericFunctionType
-///   ...
-///   //# -->
-/// TODO complete the description
 
 import "dart:io";
 
-const GENERIC_FUNCTION_TYPE_FLAG = "@GenericFunctionType";
 const DYNAMIC_TESTS_DIR = "dynamic";
 const STATIC_TESTS_DIR = "static";
 const TEST_CASES_DIR = "test_cases";
 const TEST_TYPES_DIR = "test_types";
 const OUTPUT_DIR = "generated";
 
-const COPYRIGHT = '''// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-''';
 const IMPORT_COMMON = "import '../../utils/common.dart';";
 const IMPORT_EXPECT = "import '../../../../Utils/expect.dart';";
 
@@ -75,43 +39,57 @@
 
 main() {
   // Generate dynamic tests
-
   // First generate tests for common test types
-
-  Directory testCasesDir = new Directory(".." + Platform.pathSeparator +
-      DYNAMIC_TESTS_DIR + Platform.pathSeparator + TEST_CASES_DIR);
-  Directory testTypesDir = new Directory(".." + Platform.pathSeparator +
-      TEST_TYPES_DIR);
-  Directory outputDir = new Directory(".." + Platform.pathSeparator +
-      DYNAMIC_TESTS_DIR + Platform.pathSeparator + OUTPUT_DIR);
+  Directory testCasesDir = new Directory(".." +
+      Platform.pathSeparator +
+      DYNAMIC_TESTS_DIR +
+      Platform.pathSeparator +
+      TEST_CASES_DIR);
+  Directory testTypesDir =
+      new Directory(".." + Platform.pathSeparator + TEST_TYPES_DIR);
+  Directory outputDir = new Directory(".." +
+      Platform.pathSeparator +
+      DYNAMIC_TESTS_DIR +
+      Platform.pathSeparator +
+      OUTPUT_DIR);
   generateTests(testCasesDir, testTypesDir, outputDir, "dynamic");
 
   // Now generate tests for dynamic only test types
-  testTypesDir = new Directory(".." + Platform.pathSeparator +
-      DYNAMIC_TESTS_DIR + Platform.pathSeparator + TEST_TYPES_DIR);
+  testTypesDir = new Directory(".." +
+      Platform.pathSeparator +
+      DYNAMIC_TESTS_DIR +
+      Platform.pathSeparator +
+      TEST_TYPES_DIR);
   generateTests(testCasesDir, testTypesDir, outputDir, "dynamic", clear: false);
 
   // Generate static tests
-
   // First generate tests for common test types
-  testCasesDir = new Directory(".." + Platform.pathSeparator +
-      STATIC_TESTS_DIR + Platform.pathSeparator + TEST_CASES_DIR);
-  testTypesDir = new Directory(".." + Platform.pathSeparator +
-      TEST_TYPES_DIR);
-  outputDir = new Directory(".." + Platform.pathSeparator +
-      STATIC_TESTS_DIR + Platform.pathSeparator + OUTPUT_DIR);
+  testCasesDir = new Directory(".." +
+      Platform.pathSeparator +
+      STATIC_TESTS_DIR +
+      Platform.pathSeparator +
+      TEST_CASES_DIR);
+  testTypesDir = new Directory(".." + Platform.pathSeparator + TEST_TYPES_DIR);
+  outputDir = new Directory(".." +
+      Platform.pathSeparator +
+      STATIC_TESTS_DIR +
+      Platform.pathSeparator +
+      OUTPUT_DIR);
   generateTests(testCasesDir, testTypesDir, outputDir, "static");
 
   // Now generate tests for static only test types
 
-  testTypesDir = new Directory(".." + Platform.pathSeparator +
-      STATIC_TESTS_DIR + Platform.pathSeparator + TEST_TYPES_DIR);
+  testTypesDir = new Directory(".." +
+      Platform.pathSeparator +
+      STATIC_TESTS_DIR +
+      Platform.pathSeparator +
+      TEST_TYPES_DIR);
   generateTests(testCasesDir, testTypesDir, outputDir, "static", clear: false);
-
 }
 
 void generateTests(Directory testCasesDir, Directory testTypesDir,
-    Directory outputDir, String testsType, {bool clear = true}) {
+    Directory outputDir, String testsType,
+    {bool clear = true}) {
   // First, clear output directory
   if (clear) {
     List<FileSystemEntity> existing = outputDir.listSync();
@@ -129,266 +107,296 @@
   int generatedCount = 0;
   for (int i = 0; i < testTypes.length; i++) {
     File testType = testTypes[i] as File;
-    bool isFailTest = isFail(testType);
-    String testTypeText = testType.readAsStringSync();
-    List<String> testTypeTextStrings = testTypeText.split("\n");
-    bool hasMainFunc = hasMain(testTypeTextStrings);
-    bool isGenericFunctionType = findIsGenericFunctionType(testTypeTextStrings);
-    Map<String, String> replacement = findReplacements(testTypeTextStrings);
-    if (replacement.length == 0) {
-      continue;
-    }
-    if (testsType != "static") {
-      testTypeTextStrings = addImport(testTypeTextStrings, isFailTest);
-    }
     for (int j = 0; j < testCases.length; j++) {
       File testCase = testCases[j] as File;
-      if (isFailTest) {
-        if (!isFail(testCase)) {
+      Test test = Test(testType, testCase, outputDir, testsType == "dynamic");
+      if (test.isTestTypeFailing) {
+        if (!test.isTestCaseFailing) {
           continue;
         }
       } else {
-        if (isFail(testCase)) {
+        if (test.isTestCaseFailing) {
           continue;
         }
       }
-      String testCaseText = testCase.readAsStringSync();
-      testCaseText = removeNotGenericFunctionTypePart(isGenericFunctionType,
-          testCaseText);
-      testCaseText = replace(testCaseText, replacement);
-      String testTypeText = removeReplacements(testTypeTextStrings);
-
-      String header = getGeneratedTestHeader(testTypeText, testCaseText,
-          getGeneratedFileComment(testType, testCase));
-      testCaseText = removeHeader(testCaseText);
-      testTypeText = removeHeader(testTypeText);
-      String generatedTestText = "";
-      if (hasMainFunc) {
-        String beforeMain = getBeforeMain(testCaseText);
-        String mainContent = getMainContent(testCaseText);
-        generatedTestText = header + testTypeText.replaceFirst(
-            new RegExp(r"\/\/#\s*<!--\s*Global\s*variables\s*&\s*classes\s*definition\s*-->"),
-            beforeMain).replaceFirst(new RegExp(r"\/\/#\s*<!--\s*Test\s*body\s*-->"), mainContent);
-      } else {
-        generatedTestText = header + removeHeader(testTypeText) + testCaseText;
-      }
-      File generatedTest = getGeneratedTestFile(testType, testCase, outputDir);
-      generatedTest.writeAsStringSync(generatedTestText);
+      test.generate();
       generatedCount++;
     }
   }
   print("$generatedCount $testsType tests generated successfully");
 }
 
-String getGeneratedFileComment(File testType, File testCase) {
-  String testTypeFileName = getFileName(testType);
-  String testCaseFileName = getFileName(testCase);
-  return '''
-///
-/// This test is generated from $testTypeFileName and 
-/// $testCaseFileName.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-''';
-}
+class Test {
+  final File _testType;
+  final File _testCase;
+  final Directory _outputDir;
+  late final String _testTypeFileName;
+  late final String _testCaseFileName;
+  List<String> _testTypeLines = [];
+  List<String> _testCaseLines = [];
+  bool _isDynamic = false;
 
-bool findIsGenericFunctionType(List<String> strings) {
-  for (int i = 0; i < strings.length; i++) {
-    if (strings[i].startsWith(META_PREFIX)) {
-      String s = strings[i].substring(META_PREFIX.length).trim();
-      if (s == GENERIC_FUNCTION_TYPE_FLAG) {
+  Test(this._testType, this._testCase, this._outputDir, this._isDynamic) {
+    _testTypeFileName = _getFileName(_testType);
+    _testCaseFileName = _getFileName(_testCase);
+  }
+
+  void generate() {
+    _testTypeLines = _testType.readAsStringSync().split("\n");
+    _testCaseLines = _testCase.readAsStringSync().split("\n");
+
+    if (_isDynamic) {
+      _addImport(_testTypeLines, isTestTypeFailing);
+    }
+
+    // Find //# T0 = ActualType
+    Map<String, String> replacement = _findReplacements(_testTypeLines);
+    // Replace T0 by ActualType
+    _replace(_testCaseLines, replacement);
+    List<String> testCaseHeader = _removeHeader(_testCaseLines,
+        returnCopyright: false);
+    List<String> testTypeHeader = _removeHeader(_testTypeLines);
+
+    List<String> test = [];
+    if (_hasMain(_testTypeLines)) {
+      test = [
+        ...testTypeHeader,
+        "///",
+        ...testCaseHeader,
+        _getGeneratedFileHeader,
+        ..._replaceMain(_testTypeLines, _getBeforeMain(_testCaseLines),
+            _getMainContent(_testCaseLines))
+      ];
+    } else {
+      test = [
+        ...testTypeHeader,
+        "///",
+        ...testCaseHeader,
+        _getGeneratedFileHeader,
+        ..._testTypeLines,
+        ..._testCaseLines
+      ];
+    }
+    File generatedTest = _createGeneratedTestFile();
+    generatedTest.writeAsStringSync(_toNormalizedString(test));
+  }
+
+  bool get isTestTypeFailing => _testTypeFileName.contains("_fail_");
+  bool get isTestCaseFailing => _testCaseFileName.contains("_fail_");
+
+  String _getFileName(File file) =>
+      file.path.substring(file.path.lastIndexOf(Platform.pathSeparator) + 1);
+
+  bool _hasMain(List<String> lines) {
+    for (int i = 0; i < lines.length; i++) {
+      if (lines[i].contains(new RegExp(r"[\s]*main[\s]*\("))) {
         return true;
       }
     }
+    return false;
   }
-  return false;
-}
 
-bool hasMain(List<String> strings) {
-  for (int i = 0; i < strings.length; i++) {
-    if (strings[i].contains(new RegExp(r"[\s]*main[\s]*\("))) {
-      return true;
+  void _addImport(List<String> lines, bool addExpect) {
+    int ind = 0;
+    for (int i = 0; i < lines.length; i++) {
+      if (lines[i].startsWith("///")) {
+        ind = i;
+      }
     }
+    if (addExpect) {
+      lines.insert(ind + 1, IMPORT_EXPECT);
+    }
+    lines.insert(ind + 1, IMPORT_COMMON);
   }
-  return false;
-}
 
-Map<String, String> findReplacements(List<String> strings) {
-  Map<String, String> found = new Map<String, String>();
-  for (int i = 0; i < strings.length; i++) {
-    if (strings[i].startsWith(META_PREFIX)) {
-      String s = strings[i].substring(META_PREFIX.length).trim();
-      List<String> l = s.split("=");
-      if (l.length != 2) {
+  Map<String, String> _findReplacements(List<String> lines) {
+    Map<String, String> found = new Map<String, String>();
+    for (int i = 0; i < lines.length; i++) {
+      if (lines[i].startsWith(META_PREFIX)) {
+        String s = lines[i].substring(META_PREFIX.length).trim();
+        List<String> l = s.split("=");
+        if (l.length != 2) {
+          continue;
+        }
+        String key = l[0].trim();
+        String value = l[1].trim();
+        found[key] = value;
+        lines[i] = "";
+      }
+    }
+    return found;
+  }
+
+  void _replace(List<String> lines, Map<String, String> replacement) {
+    replacement.keys.toList().forEach((String Ti) {
+      String? actualType = replacement[Ti];
+      if (actualType != null) {
+        for (int i = 0; i < lines.length; i++) {
+          lines[i] = lines[i].replaceAll(Ti, actualType);
+        }
+      }
+    });
+  }
+
+  List<String> _removeHeader(List<String> lines,
+      {bool returnCopyright = true}) {
+    bool copyrightPart = false;
+    bool assertionPart = false;
+    List<String> header = [];
+    for (int i = lines.length - 1; i >= 0; i--) {
+      if (lines[i].trim().length == 0) {
         continue;
       }
-      String key = l[0].trim();
-      String value = l[1].trim();
-      found[key] = value;
-    }
-  }
-  return found;
-}
-
-String removeHeader(String text) {
-  List<String> strings = text.split("\n");
-  strings.removeWhere((s) => s.startsWith("///") || s.startsWith("// Copyright")
-      || s.startsWith("// for details") || s.startsWith("// BSD-style"));
-  return strings.join("\n");
-}
-
-String getHeaderComment(String text) {
-  List<String> strings = text.split("\n");
-  // find last bunch of strings starting with ///
-  int start = -1, end = -1;
-  bool wasComment = false;
-  for (int i = 0; i < strings.length; i++) {
-    if (strings[i].startsWith('///')) {
-      if (!wasComment) {
-        start = i;
-        end = i;
-        wasComment = true;
-      }
-    } else {
-      if (wasComment) {
-        end = i;
-        wasComment = false;
-      }
-    }
-  }
-  if (start > -1 && end > -1) {
-    return strings.getRange(start, end).join("\n");
-  }
-  return "";
-}
-
-String getGeneratedTestHeader(String testTypeText, String testCaseText, String text) {
-  String testTypeHeader = getHeaderComment(testTypeText);
-  String testCaseHeader = getHeaderComment(testCaseText);
-  return COPYRIGHT
-      + testTypeHeader + "\n"
-      + "///\n"
-      + testCaseHeader + "\n"
-      + text + "\n";
-}
-
-String removeReplacements(List<String> strings) {
-  List<String> found = [];
-  for (int i = 0; i < strings.length; i++) {
-    if (strings[i].startsWith(new RegExp("$META_PREFIX\\s+@"))) {
-      found.add(strings[i]);
-    }
-  }
-  found.forEach((String el) {
-    strings.remove(el);
-  });
-  StringBuffer sb = new StringBuffer();
-  sb.writeAll(strings, "\n");
-  return sb.toString();
-}
-
-String removeNotGenericFunctionTypePart(bool isGenericFunctionType, String text) {
-  if (isGenericFunctionType) {
-    List<String> strings = text.split("\n");
-    bool skip = false;
-    StringBuffer sb = new StringBuffer();
-    for (int i = 0; i < strings.length; i++) {
-      if (strings[i].trim().startsWith(META_PREFIX)) {
-        if (skip) {
-          if (strings[i].contains("-->")) {
-            skip = false;
-            continue;
-          } else {
-            throw new Exception("Unexpected '${strings[i]}'");
+      if (lines[i].startsWith("///")) {
+        if (!assertionPart) {
+          assertionPart = true;
+        }
+        header.insert(0, lines[i]);
+        lines.removeAt(i);
+      } else if (lines[i].startsWith("//")) {
+        if (!assertionPart && !copyrightPart) {
+          continue;
+        }
+        if (assertionPart) {
+          assertionPart = false;
+          copyrightPart = true;
+          if (returnCopyright) {
+            header.insert(0, "");
           }
+        }
+        if (returnCopyright) {
+          header.insert(0, lines[i]);
+        }
+        lines.removeAt(i);
+      }
+    }
+    return header;
+  }
+
+  String get _getGeneratedFileHeader => '''
+///
+/// This test is generated from test_types/$_testTypeFileName and 
+/// test_cases/$_testCaseFileName. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
+''';
+
+  List<String> _getBeforeMain(List<String> lines) {
+    List<String> found = [];
+    for (int i = 0; i < lines.length; i++) {
+      if (!lines[i].contains(new RegExp(r"main[\s]*\("))) {
+        found.add(lines[i]);
+      } else {
+        break;
+      }
+    }
+    return found;
+  }
+
+  List<String> _getMainContent(List<String> lines) {
+    List<String> found = [];
+    bool go = false;
+    for (int i = lines.length - 1; i >= 0; i--) {
+      if (go) {
+        if (lines[i].contains(new RegExp(r"main[\s]*\("))) {
+          break;
         } else {
-          if (strings[i].contains("NotGenericFunctionType")) {
-            skip = true;
-            continue;
-          }
+          found.insert(0, lines[i]);
         }
       } else {
-        if (skip) {
-          continue;
-        } else {
-          sb.write(strings[i] + "\n");
+        if (lines[i].contains("}")) {
+          go = true;
         }
       }
     }
-    return sb.toString();
-  } else {
-    // remove "//# <-- NotGenericFunctionType" and "//# -->"
-    return text.replaceFirst("$META_PREFIX <-- NotGenericFunctionType\n", "").replaceFirst("$META_PREFIX -->\n", "");
+    return found;
   }
-}
 
-String replace(String text, Map<String, String> replacement) {
-  replacement.keys.toList().forEach((String Ti) {
-    String? repl = replacement[Ti];
-    if (repl != null) {
-      text = text.replaceAll(Ti, repl);
+  List<String> _replaceMain(
+      List<String> lines, List<String> beforeMain, List<String> mainContent) {
+    List<String> result = [];
+    for (int i = 0; i < lines.length; i++) {
+      if (lines[i].contains(new RegExp(
+          r"//#\s*<!--\s*Global\s*variables\s*&\s*classes\s*definition\s*-->"))) {
+        result.addAll(beforeMain);
+      } else if (lines[i]
+          .contains(new RegExp(r"//#\s*<!--\s*Test\s*body\s*-->"))) {
+        int numOfSpaces = lines[i].indexOf(META_PREFIX);
+        result.addAll(_makeIndent(numOfSpaces, mainContent));
+      } else {
+        result.add(lines[i]);
+      }
     }
-  });
-  return text;
-}
+    return result;
+  }
 
-File getGeneratedTestFile(File testType, File testCase, Directory outputDir) {
-  String testTypeName = getFileName(testType);
-  String testCaseName = getFileName(testCase);
-  // testTypeName file name looks like interface_compositionality_A01.dart
-  // prefix = interface_compositionality, suffix = _A01
-  int index = testTypeName.lastIndexOf("_");
-  String testNamePrefix = testTypeName.substring(0, index);
-  String testNameSuffix = testTypeName.substring(index, index + 4);
-
-  // testCaseName file name looks like arguments_binding_x01.dart
-  // prefix = arguments_binding, suffix = _x01.dart
-  index = testCaseName.lastIndexOf("_");
-  String testCasePrefix = testCaseName.substring(0, index);
-  String testCaseSuffix = testCaseName.substring(index).replaceFirst("x", "t");
-
-  String generatedTestName = "";
-  File? generatedFile = null;
-  String testNameSuffix2 = "";
-  for (int i = 1;;i++) {
-    generatedTestName = testNamePrefix + "_" + testCasePrefix +
-        testNameSuffix + testNameSuffix2 + testCaseSuffix;
-    generatedFile = new File(outputDir.path + Platform.pathSeparator + generatedTestName);
-    if (generatedFile.existsSync()) {
-      testNameSuffix2 = "_$i";
-    } else {
-      break;
+  List<String> _makeIndent(int newIndent, List<String> lines) {
+    int currentIndent = lines[0].indexOf(RegExp(r"\S"));
+    if (currentIndent > 0 && newIndent > currentIndent) {
+      String _old = List.filled(currentIndent, " ").join();
+      String _new = List.filled(newIndent, " ").join();
+      for (int i = 0; i < lines.length; i++) {
+        lines[i] = lines[i].replaceFirst(_old, _new);
+      }
     }
+    return lines;
   }
-  generatedFile.createSync();
-  return generatedFile;
-}
 
-String getFileName(File file) =>
-    file.path.substring(file.path.lastIndexOf(Platform.pathSeparator) + 1);
+  File _createGeneratedTestFile() {
+    // _testTypeFileName looks like interface_compositionality_A01.dart
+    // prefix = interface_compositionality, suffix = _A01
+    int index = _testTypeFileName.lastIndexOf("_");
+    String testNamePrefix = _testTypeFileName.substring(0, index);
+    String testNameSuffix = _testTypeFileName.substring(index, index + 4);
 
-bool isFail(File file) => getFileName(file).contains("_fail_");
+    // testCaseName file name looks like arguments_binding_x01.dart
+    // prefix = arguments_binding, suffix = _x01.dart
+    index = _testCaseFileName.lastIndexOf("_");
+    String testCasePrefix = _testCaseFileName.substring(0, index);
+    String testCaseSuffix =
+        _testCaseFileName.substring(index).replaceFirst("x", "t");
 
-List<String> addImport(List<String> testTypeTextStrings, bool addExpect) {
-  int ind = 0;
-  for (int i = 0; i < testTypeTextStrings.length; i++) {
-    if (testTypeTextStrings[i].startsWith("///")) {
-      ind = i;
+    String generatedTestName = "";
+    File? generatedFile = null;
+    String testNameSuffix2 = "";
+    for (int i = 1;; i++) {
+      generatedTestName = testNamePrefix +
+          "_" +
+          testCasePrefix +
+          testNameSuffix +
+          testNameSuffix2 +
+          testCaseSuffix;
+      generatedFile = new File(
+          _outputDir.path + Platform.pathSeparator + generatedTestName);
+      if (generatedFile.existsSync()) {
+        testNameSuffix2 = "_$i";
+      } else {
+        break;
+      }
     }
+    generatedFile.createSync();
+    return generatedFile;
   }
-  if (addExpect) {
-    testTypeTextStrings.insert(ind + 1, IMPORT_EXPECT);
+
+  // Remove excessive empty lines
+  String _toNormalizedString(List<String> lines) {
+    int counter = 0;
+    for (int i = lines.length - 1; i >= 0; i--) {
+      lines[i] = lines[i].trimRight();
+      if (lines[i].length == 0) {
+        counter++;
+      } else {
+        if (counter > 1) {
+          for (int j = counter; j > 1; j--) {
+            lines.removeAt(i + j);
+          }
+        }
+        counter = 0;
+      }
+    }
+    StringBuffer sb = new StringBuffer();
+    sb.writeAll(lines, "\n");
+    String rez = sb.toString();
+    return rez;
   }
-  testTypeTextStrings.insert(ind + 1, IMPORT_COMMON);
-  return testTypeTextStrings;
-}
-
-String getBeforeMain(String text) {
-  return text.substring(0, text.indexOf(new RegExp(r"main[\s]*\(")));
-}
-
-String getMainContent(String text) {
-  int start = text.indexOf("{", text.indexOf(new RegExp(r"main\s*\(.*\)\s*\{")));
-  int end = text.lastIndexOf("}");
-  return text.substring(start + 1, end);
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t01.dart
index aaabf0e..c9f9a97 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 typedef void T0();
 
@@ -28,9 +26,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -95,7 +90,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -107,5 +101,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t02.dart
index 0c43153..9bf94fb 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 typedef void T0();
 
@@ -28,9 +26,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -111,8 +106,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -123,5 +116,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t03.dart
index fcd730e..a403d50 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A01_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 typedef void T0();
 
@@ -28,10 +26,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -55,7 +50,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -83,12 +78,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t01.dart
index f5cd58d..6d446a8 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -98,7 +93,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -110,5 +104,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t02.dart
index 44e5d93..678598e 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -114,8 +109,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -126,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t03.dart
index bed7da3..cfbb79a 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A02_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +29,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -58,7 +53,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +81,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t01.dart
index f98276a..571c83b 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -99,7 +93,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -111,5 +104,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t02.dart
index f13c821..2c39885 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -115,8 +109,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -127,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t03.dart
index 219ca53..a6fe044 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A03_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,11 +29,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -59,7 +53,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -87,12 +81,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t01.dart
index 693dabd..4bd5bb8 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -97,7 +92,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -109,5 +103,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t02.dart
index 0c65c3a..a597260 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -113,8 +108,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -125,5 +118,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t03.dart
index 155d6c1..83b6b5b 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A04_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,10 +28,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -57,7 +52,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -85,12 +80,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t01.dart
index 44e34f3..845bab9 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -97,7 +92,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -109,5 +103,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t02.dart
index d2cead3..8e96c74 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -113,8 +108,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -125,5 +118,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t03.dart
index 50bed9f..7893172 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A05_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,10 +28,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -57,7 +52,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -85,12 +80,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t01.dart
index 844d218..e108e31 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -97,7 +92,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -109,5 +103,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t02.dart
index 5a312fd..0e95417 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t02.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -113,8 +108,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -125,5 +118,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t03.dart
index 3ebd3cd..fd6c5f9 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A06_t03.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,10 +28,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -57,7 +52,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -85,12 +80,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t01.dart
index 073eca0..4cbca0b 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -97,7 +92,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -109,5 +103,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t02.dart
index 421d7e0..0a81904 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t02.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -113,8 +108,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -125,5 +118,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t03.dart
index 623560f..d77720c 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A07_t03.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,10 +28,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -57,7 +52,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -85,12 +80,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t01.dart
index cad012d..7288cad 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -97,7 +92,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -109,5 +103,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t02.dart
index 4a25d8b..7c961b4 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t02.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -113,8 +108,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -125,5 +118,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t03.dart
index 68aae27..bdc1cb8 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A08_t03.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,10 +28,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -57,7 +52,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -85,12 +80,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t01.dart
index fd4f3bb..48af0a2 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -97,7 +92,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -109,5 +103,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t02.dart
index 468abdc..3127b6d 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t02.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -113,8 +108,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -125,5 +118,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t03.dart
index 36bd132..bf60d53 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A09_t03.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,10 +28,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -57,7 +52,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -85,12 +80,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t01.dart
index 287852a..5a22bbb 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -98,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -110,5 +105,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t02.dart
index 5b919aa..cbaf37d 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -114,8 +110,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -126,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t03.dart
index 9acad8c..c0f03e6 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A10_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +30,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -58,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t01.dart
index a9b144d..4acfe29 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t01.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -99,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -111,5 +105,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t02.dart
index 1f55b37..15f3bc3 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t02.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -115,8 +110,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -127,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t03.dart
index 8771cea..dca08bb 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A11_t03.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,10 +30,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -59,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -87,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t01.dart
index 5346e84..5854d90 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t01.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -99,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -111,5 +105,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t02.dart
index 9992123..66d552a 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t02.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -115,8 +110,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -127,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t03.dart
index d024224..92a80d6 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A12_t03.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,10 +30,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -59,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -87,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t01.dart
index 56f0420..d2e7a4f 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -98,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -110,5 +105,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t02.dart
index e7227aa..2ea7696 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -114,8 +110,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -126,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t03.dart
index 4f5dbef..2563163 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A13_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +30,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -58,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t01.dart
index 672380f..c351470 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -98,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -110,5 +105,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t02.dart
index b510aab..7e94b67 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -114,8 +110,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -126,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t03.dart
index a35f1ea..9384c92 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A14_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +30,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -58,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t01.dart
index 344c257..dc39775 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -98,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -110,5 +105,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t02.dart
index fc158ea..f5b1bcd 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -114,8 +110,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -126,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t03.dart
index 823fd1c..f26c3e9 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A15_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +30,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -58,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t01.dart
index ad35ce1..bc8856d 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t01.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -99,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -111,5 +105,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t02.dart
index 8fc48fe..c68cb7d 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t02.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -115,8 +110,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -127,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t03.dart
index 9267deb..4e312e7 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A16_t03.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,10 +30,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -59,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -87,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t01.dart
index 9a28894..51af45a 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -98,7 +93,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -110,5 +104,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t02.dart
index abcc9b5..c380f5b 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t02.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -114,8 +109,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -126,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t03.dart
index 986a6c9..e0db8fc 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A17_t03.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +29,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -58,7 +53,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +81,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t01.dart
index d3ff538..e2cfc16 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 namedArgumentsFunc1(Function t1, {Function t2 = t1Default}) {}
 positionalArgumentsFunc1(Function t1, [Function t2 = t1Default]) {}
 
@@ -98,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Function>(t0Instance, t2: t0Instance);
 
@@ -110,5 +105,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t02.dart
index fff0577..61bdf3c 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Function m = t1Default;
 
@@ -114,8 +110,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Function> c2 =
     new ArgumentsBinding2_t02<Function>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Function>.c2(t1Instance, t0Instance);
@@ -126,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t03.dart
index 772214c..a010e70 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_arguments_binding_A18_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +30,7 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Function m = t1Default;
 
   void superTest(Function val) {}
@@ -58,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Function> c2 = new ArgumentsBinding2_t03<Function>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t01.dart
index b956bc4..d5fcefe 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 typedef void T0();
 
@@ -28,9 +26,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t02.dart
index 5f657fc..c24443b 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 typedef void T0();
 
@@ -28,9 +26,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t03.dart
index 8bbcf7b..03d58a3 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A01_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 typedef void T0();
 
@@ -28,9 +26,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t01.dart
index 7056bcb..95bdc4b 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t02.dart
index ef68f9f..d48774d 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t03.dart
index c2b1871..7ea6dbe 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A02_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t01.dart
index 0e3b0ba..c239fd3 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t02.dart
index 7de1634..75557ed 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t03.dart
index d3802d4..581e2a9 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A03_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t01.dart
index df19400..15d958d 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t02.dart
index edaa6b1..bc0bd73 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t03.dart
index 90b01cd..da0df85 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A04_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t01.dart
index 5bbaeeb..e832dea 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t02.dart
index edebb1a..0e762f7 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t03.dart
index 85077fd..0aaba5a 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A05_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t01.dart
index 9ea7702..01c0545 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t02.dart
index 5ed21cf..ed77897 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t02.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t03.dart
index bba672d..8685142 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A06_t03.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t01.dart
index cf51c0a..78fbcdb 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t02.dart
index fcf0561..12b32c2 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t02.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t03.dart
index 87c120b..b08a2d2 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A07_t03.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t01.dart
index 526ca39..29d759e 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t02.dart
index 49c466f..9fa95f9 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t02.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t03.dart
index 7724118..1e828d1 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A08_t03.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t01.dart
index 0744dcb..7ff7b03 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t02.dart
index c51fe95..aea5cfe 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t02.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t03.dart
index 0cfcb89..6cdf70c 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A09_t03.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t01.dart
index 18c2287..c008657 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t02.dart
index 6f523a5..3ecef64 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t03.dart
index 67d1b27..d7981a7 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A10_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t01.dart
index 4093aae..cf79ee8 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t01.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t02.dart
index bac27f2..05d9f51 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t02.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t03.dart
index d05b768..e0fe73d 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A11_t03.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t01.dart
index 193736d..b7ffbea 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t01.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t02.dart
index 16b5c4f..77c50ce 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t02.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t03.dart
index 49497ec..8f6966b 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A12_t03.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t01.dart
index 084a18a..838a010 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t02.dart
index df45c42..5dab1b9 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t03.dart
index d814880..d8af549 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A13_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t01.dart
index 5f2707e..c2da928 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t02.dart
index b53b5c4..db9f0de 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t03.dart
index 58c178e..d06ef01 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A14_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t01.dart
index be86d48..172c905 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t02.dart
index c425dba..4b2b710 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t03.dart
index 7eb56a7..240fb96 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A15_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t01.dart
index 1c7e87b..3b49565 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t01.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t02.dart
index ec7619f..374e1da 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t02.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t03.dart
index 6a74b9b..3613cce 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A16_t03.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t01.dart
index 9158167..cd6bc34 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t02.dart
index dd360e2..0f4cf32 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t02.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t03.dart
index 573d1bf..15c86ee 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A17_t03.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t01.dart
index 638661b..1e93d7a 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMember1_t01 {
   static Function s = t0Instance;
   Function m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t02.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t02.dart
index a743615..882f64a 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t02.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t03.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t03.dart
index 040977a..6e645a7 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_class_member_A18_t03.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Function m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A01_t01.dart
index 98cf232..2ca3d72 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 typedef void T0();
 
@@ -28,9 +26,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A02_t01.dart
index 6b2231b..8725922 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A03_t01.dart
index 3a5ed85..ac9aa80 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A03_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A04_t01.dart
index 25b4393..c12b6ce 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A04_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A05_t01.dart
index 4c06d6c..f816006 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A05_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A06_t01.dart
index 7eae220..f2f2aaf 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A06_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A07_t01.dart
index 55b464c..bedfd9c 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A07_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A08_t01.dart
index 6704b28..d5d6376 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A08_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A09_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A09_t01.dart
index fe6b125..9fee7c2 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A09_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A09_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A10_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A10_t01.dart
index 77b8277..123a566 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A10_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A10_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A11_t01.dart
index 704b416..c5fe754 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A11_t01.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A12_t01.dart
index 9436443..ba4a100 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A12_t01.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A13_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A13_t01.dart
index 0a19f06..a770f5e 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A13_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A14_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A14_t01.dart
index 432459d..fc339b3 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A14_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A15_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A15_t01.dart
index 29067f7..8733df0 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A15_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A15_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A16_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A16_t01.dart
index 6e66dd8..f65a079 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A16_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A16_t01.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A17_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A17_t01.dart
index 43df180..e976ce5 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A17_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A17_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A18_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A18_t01.dart
index f21b81f..7784657 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A18_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_global_variable_A18_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A01_t01.dart
index cb41a41..f0bc722 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 typedef void T0();
 
@@ -28,9 +26,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A02_t01.dart
index d195fab..848ba33 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A03_t01.dart
index dec0a72..779ff05 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A03_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A04_t01.dart
index b069709..52e22f4 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A04_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A05_t01.dart
index 1e86a36..2a9f4c8 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A05_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A06_t01.dart
index fb91c42..7ca9b26 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A06_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A07_t01.dart
index 77de096..e0ab222 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A07_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A08_t01.dart
index a728b55..ad6a908 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A08_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A09_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A09_t01.dart
index 8d2e8de..27089b2 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A09_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A09_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A10_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A10_t01.dart
index bbc7d4d..930a1fd 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A10_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A10_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A11_t01.dart
index 67ae404..5afb52e 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A11_t01.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A12_t01.dart
index 204f823..fb8567a 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A12_t01.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A13_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A13_t01.dart
index b84fa6c..ae91201 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A13_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A14_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A14_t01.dart
index 8565bb9..1b9d79b 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A14_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A15_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A15_t01.dart
index 63373af..a168c4a 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A15_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A15_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A16_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A16_t01.dart
index da063a8..ec0eb17 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A16_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A16_t01.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A17_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A17_t01.dart
index 761c233..f57ad47 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A17_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A17_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A18_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A18_t01.dart
index 9a42d3a..04fa5ca 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A18_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_local_variable_A18_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A01_t01.dart
index c81e890..4a316ae 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 typedef void T0();
 
@@ -28,9 +26,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -51,5 +46,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A02_t01.dart
index 9f7248e..eb1f93f 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +49,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A03_t01.dart
index 51a1fdc..d6bb130 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A03_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,10 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -55,5 +49,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A04_t01.dart
index 7c01b70..d8dde4f 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A04_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -53,5 +48,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A05_t01.dart
index 6d8d2ab..6eb828d 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A05_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A05.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A05.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -53,5 +48,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A06_t01.dart
index c06a6f7..cc7b821 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A06_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A06.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A06.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -53,5 +48,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A07_t01.dart
index 250ca01..b1aa4e1 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A07_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A07.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A07.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -53,5 +48,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A08_t01.dart
index 870b50f..2056a95 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A08_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A08.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A08.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -53,5 +48,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A09_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A09_t01.dart
index cbcf2c4..6b3f612 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A09_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A09_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A09.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A09.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -30,9 +28,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -53,5 +48,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A10_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A10_t01.dart
index 4c01877..4e56744 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A10_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A10_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A10.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A10.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +50,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A11_t01.dart
index 2a6ffc4..d51b96e 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A11_t01.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A11.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A11.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -55,5 +50,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A12_t01.dart
index 19a8ad7..8df8571 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A12_t01.dart
@@ -5,21 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A12.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A12.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -55,5 +50,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A13_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A13_t01.dart
index 26b4403..ebe9054 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A13_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A13.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A13.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +50,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A14_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A14_t01.dart
index 948f2b1..0ccf4aa 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A14_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A14.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A14.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +50,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A15_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A15_t01.dart
index 673b4c1..f338a7a 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A15_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A15_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A15.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A15.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +50,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A16_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A16_t01.dart
index 5419754..c4f6765 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A16_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A16_t01.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 ///
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A16.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A16.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -32,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -55,5 +50,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A17_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A17_t01.dart
index 556422a..ec5a8ae 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A17_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A17_t01.dart
@@ -5,20 +5,18 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A17.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A17.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +29,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +49,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A18_t01.dart b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A18_t01.dart
index 61f182c..9ac4333 100644
--- a/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A18_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/function_type_function_return_value_A18_t01.dart
@@ -5,20 +5,19 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is a subtype of a type T1, then instance
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from function_type_function_A18.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/function_type_function_A18.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class C {}
 
@@ -31,9 +30,6 @@
 void foo() {}
 const t1Default = foo;
 
-
-
-
 Function returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +50,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t01.dart
index b6c998e..8b8a51d 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 namedArgumentsFunc1(C0<U0, U1, U2> t1, {C0<U0, U1, U2> t2 = t1Default}) {}
 positionalArgumentsFunc1(C0<U0, U1, U2> t1, [C0<U0, U1, U2> t2 = t1Default]) {}
 
@@ -106,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<C0<U0, U1, U2>>(t0Instance, t2: t0Instance);
 
@@ -118,5 +112,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t02.dart
index 30bcc69..bdca216 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t02.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   C0<U0, U1, U2> m = t1Default;
 
@@ -122,8 +117,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<C0<U0, U1, U2>> c2 =
     new ArgumentsBinding2_t02<C0<U0, U1, U2>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<C0<U0, U1, U2>>.c2(t1Instance, t0Instance);
@@ -134,5 +127,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t03.dart
index ebfffe9..bf28eff 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A01_t03.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,10 +37,7 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   C0<U0, U1, U2> m = t1Default;
 
   void superTest(C0<U0, U1, U2> val) {}
@@ -66,7 +61,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -94,12 +89,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<C0<U0, U1, U2>> c2 = new ArgumentsBinding2_t03<C0<U0, U1, U2>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t01.dart
index c580cea..9461c51 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 namedArgumentsFunc1(C0<U0, U1, U2> t1, {C0<U0, U1, U2> t2 = t1Default}) {}
 positionalArgumentsFunc1(C0<U0, U1, U2> t1, [C0<U0, U1, U2> t2 = t1Default]) {}
 
@@ -106,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<C0<U0, U1, U2>>(t0Instance, t2: t0Instance);
 
@@ -118,5 +112,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t02.dart
index 4fd2af9..3c0f241 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t02.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   C0<U0, U1, U2> m = t1Default;
 
@@ -122,8 +117,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<C0<U0, U1, U2>> c2 =
     new ArgumentsBinding2_t02<C0<U0, U1, U2>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<C0<U0, U1, U2>>.c2(t1Instance, t0Instance);
@@ -134,5 +127,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t03.dart
index d6ec917..6543c0f 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_arguments_binding_A02_t03.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,10 +37,7 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   C0<U0, U1, U2> m = t1Default;
 
   void superTest(C0<U0, U1, U2> val) {}
@@ -66,7 +61,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -94,12 +89,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<C0<U0, U1, U2>> c2 = new ArgumentsBinding2_t03<C0<U0, U1, U2>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t01.dart
index d79a7d5..c7d3d19 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMember1_t01 {
   static C0<U0, U1, U2> s = t0Instance;
   C0<U0, U1, U2> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t02.dart
index 768afd6..3fba81d 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t02.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberSuper1_t02 {
   C0<U0, U1, U2> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t03.dart
index 229511a..6524d6d 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A01_t03.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberMixin1_t03 {
   C0<U0, U1, U2> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t01.dart
index 0e20e75..d959644 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMember1_t01 {
   static C0<U0, U1, U2> s = t0Instance;
   C0<U0, U1, U2> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t02.dart
index 2fb9b5d..79e4e8a 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t02.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberSuper1_t02 {
   C0<U0, U1, U2> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t03.dart
index e6e74b0..d45b19f 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_class_member_A02_t03.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberMixin1_t03 {
   C0<U0, U1, U2> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_fail_A01_t01.dart
index 5a73fc0..9f80832 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -41,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 namedArgumentsFunc1(C0<U0, U1, U2> t1, {C0<U0, U1, U2> t2 = t1Default}) {}
 positionalArgumentsFunc1(C0<U0, U1, U2> t1, [C0<U0, U1, U2> t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_mixin_fail_A01_t01.dart
index 899cd89..f8fe423 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -42,10 +40,7 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(C0<U0, U1, U2> val) {}
   void superTestPositioned(C0<U0, U1, U2> val, [C0<U0, U1, U2> val2 = t1Default]) {}
   void superTestNamed(C0<U0, U1, U2> val, {C0<U0, U1, U2> val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_super_fail_A01_t01.dart
index 1436683..6a985de 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_arguments_binding_super_fail_A01_t01.dart
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -42,9 +40,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   C0<U0, U1, U2> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_fail_A01_t01.dart
index 8f3eeb5..1d71a67 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_fail_A01_t01.dart
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -42,9 +40,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberTestStatic {
   static C0<U0, U1, U2> s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_mixin_fail_A01_t01.dart
index a4fc72f..6a837f5 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_mixin_fail_A01_t01.dart
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -42,9 +40,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberSuper1_t03 {
   C0<U0, U1, U2> m = t1Default;
   void set superSetter(C0<U0, U1, U2> val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_super_fail_A01_t01.dart
index 8bcacd6..794dfc2 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_class_member_super_fail_A01_t01.dart
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -42,9 +40,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class ClassMemberSuper1_t02 {
   C0<U0, U1, U2> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_global_variable_fail_A01_t01.dart
index 20446b4..78daf6a 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_global_variable_fail_A01_t01.dart
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -42,9 +40,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_local_variable_fail_A01_t01.dart
index 0953980..8b0d462 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_local_variable_fail_A01_t01.dart
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -42,9 +40,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     C0<U0, U1, U2> t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_return_value_fail_A01_t01.dart
index ac8af90..0821680 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_fail_return_value_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from interface_compositionality_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -41,9 +39,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 C0<U0, U1, U2> returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_global_variable_A01_t01.dart
index 1ee3ed5..3db14b1 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_global_variable_A01_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_global_variable_A02_t01.dart
index b93736e..6e5ee28 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_global_variable_A02_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_local_variable_A01_t01.dart
index 2521e9c..0c04000 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_local_variable_A01_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_local_variable_A02_t01.dart
index 6ece49e..609bbb9 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_local_variable_A02_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_return_value_A01_t01.dart
index 5178266..15b7bd6 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_return_value_A01_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 C0<U0, U1, U2> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -62,5 +57,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_return_value_A02_t01.dart
index 344ac88..606f434 100644
--- a/LanguageFeatures/Subtyping/static/generated/interface_compositionality_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/interface_compositionality_return_value_A02_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from interface_compositionality_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/interface_compositionality_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 abstract class U0 {}
 abstract class U1 {}
@@ -39,9 +37,6 @@
 
 const t1Default = const C0<U0, U1, U2>();
 
-
-
-
 C0<U0, U1, U2> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -62,5 +57,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t01.dart
index 034a215..224de5d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 namedArgumentsFunc1(FutureOr<C> t1, {FutureOr<C> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<C> t1, [FutureOr<C> t2 = t1Default]) {}
 
@@ -102,7 +97,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<C>>(t0Instance, t2: t0Instance);
 
@@ -114,5 +108,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t02.dart
index f0137ec..9eb22b1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t02.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<C> m = t1Default;
 
@@ -118,8 +113,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<C>> c2 =
     new ArgumentsBinding2_t02<FutureOr<C>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<FutureOr<C>>.c2(t1Instance, t0Instance);
@@ -130,5 +123,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t03.dart
index 57a2ab1..8dbd4db 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A01_t03.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,10 +33,7 @@
 
 const t1Default = const C();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   FutureOr<C> m = t1Default;
 
   void superTest(FutureOr<C> val) {}
@@ -62,7 +57,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -90,12 +85,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<C>> c2 = new ArgumentsBinding2_t03<FutureOr<C>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t01.dart
index 1046cd5..2b8154f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 namedArgumentsFunc1(FutureOr<C> t1, {FutureOr<C> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<C> t1, [FutureOr<C> t2 = t1Default]) {}
 
@@ -102,7 +97,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<C>>(t0Instance, t2: t0Instance);
 
@@ -114,5 +108,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t02.dart
index f8ecb7f..d829906 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t02.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<C> m = t1Default;
 
@@ -118,8 +113,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<C>> c2 =
     new ArgumentsBinding2_t02<FutureOr<C>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<FutureOr<C>>.c2(t1Instance, t0Instance);
@@ -130,5 +123,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t03.dart
index 80b303e..7f69d3f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A02_t03.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,10 +33,7 @@
 
 const t1Default = const C();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   FutureOr<C> m = t1Default;
 
   void superTest(FutureOr<C> val) {}
@@ -62,7 +57,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -90,12 +85,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<C>> c2 = new ArgumentsBinding2_t03<FutureOr<C>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t01.dart
index 7042a9c..9cd3591 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 namedArgumentsFunc1(FutureOr<C<A>> t1, {FutureOr<C<A>> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<C<A>> t1, [FutureOr<C<A>> t2 = t1Default]) {}
 
@@ -104,7 +99,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<C<A>>>(t0Instance, t2: t0Instance);
 
@@ -116,5 +110,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t02.dart
index 0ec82b7..5b430a8 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t02.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<C<A>> m = t1Default;
 
@@ -120,8 +115,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<C<A>>> c2 =
     new ArgumentsBinding2_t02<FutureOr<C<A>>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<FutureOr<C<A>>>.c2(t1Instance, t0Instance);
@@ -132,5 +125,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t03.dart
index 24992cf..3282331 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A03_t03.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,10 +35,7 @@
 
 const t1Default = const C<A>();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   FutureOr<C<A>> m = t1Default;
 
   void superTest(FutureOr<C<A>> val) {}
@@ -64,7 +59,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -92,12 +87,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<C<A>>> c2 = new ArgumentsBinding2_t03<FutureOr<C<A>>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t01.dart
index e076783..9249400 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 namedArgumentsFunc1(FutureOr<C<A>> t1, {FutureOr<C<A>> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<C<A>> t1, [FutureOr<C<A>> t2 = t1Default]) {}
 
@@ -105,7 +100,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<C<A>>>(t0Instance, t2: t0Instance);
 
@@ -117,5 +111,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t02.dart
index aea6138..d0d4b54 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t02.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<C<A>> m = t1Default;
 
@@ -121,8 +116,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<C<A>>> c2 =
     new ArgumentsBinding2_t02<FutureOr<C<A>>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<FutureOr<C<A>>>.c2(t1Instance, t0Instance);
@@ -133,5 +126,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t03.dart
index 4d66d0d..6c3d522 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_arguments_binding_A04_t03.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,10 +36,7 @@
 
 const t1Default = const C<A>();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   FutureOr<C<A>> m = t1Default;
 
   void superTest(FutureOr<C<A>> val) {}
@@ -65,7 +60,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -93,12 +88,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<C<A>>> c2 = new ArgumentsBinding2_t03<FutureOr<C<A>>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t01.dart
index f7e8743..f9a12ae 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<C> s = t0Instance;
   FutureOr<C> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t02.dart
index a8795ad..6a338dd 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t02.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<C> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t03.dart
index 10dcc53..0fcbfdd 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A01_t03.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<C> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t01.dart
index a525d3a..55a0229 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<C> s = t0Instance;
   FutureOr<C> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t02.dart
index c211f37..d9c4921 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t02.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<C> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t03.dart
index eda70de..c59fa24 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A02_t03.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<C> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t01.dart
index cca6a1b..01f2913 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<C<A>> s = t0Instance;
   FutureOr<C<A>> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t02.dart
index 08ad772..40fbd91 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t02.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<C<A>> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t03.dart
index 050d9be..724add9 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A03_t03.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<C<A>> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t01.dart
index 09ae065..e492c02 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<C<A>> s = t0Instance;
   FutureOr<C<A>> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t02.dart
index 6638851..00d976c 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t02.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<C<A>> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t03.dart
index df0958c..7968c1d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_class_member_A04_t03.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<C<A>> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A01_t01.dart
index 52317ab..dee437f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A01_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(Future? t1, {Future? t2 = t1Default}) {}
 positionalArgumentsFunc1(Future? t1, [Future? t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A02_t01.dart
index f0231b3..e429db2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A02_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A03_t01.dart
index 2fcb1fb..ab0094a 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A03_t01.dart
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A03.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(Future? t1, {Future? t2 = t1Default}) {}
 positionalArgumentsFunc1(Future? t1, [Future? t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A04_t01.dart
index 51f8796..502bb2e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_fail_A04_t01.dart
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A04.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(Future? t1, {Future? t2 = t1Default}) {}
 positionalArgumentsFunc1(Future? t1, [Future? t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A01_t01.dart
index 0baeb8b..007d5e1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,10 +30,7 @@
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Future? val) {}
   void superTestPositioned(Future? val, [Future? val2 = t1Default]) {}
   void superTestNamed(Future? val, {Future? val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A02_t01.dart
index fcda7a3..4a1a49c 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A02_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,10 +35,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A03_t01.dart
index 4640d32..a00d941 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A03_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A03.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A03.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,10 +30,7 @@
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Future? val) {}
   void superTestPositioned(Future? val, [Future? val2 = t1Default]) {}
   void superTestNamed(Future? val, {Future? val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A04_t01.dart
index e3b0d2d..1c779e2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_mixin_fail_A04_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A04.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A04.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,10 +30,7 @@
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Future? val) {}
   void superTestPositioned(Future? val, [Future? val2 = t1Default]) {}
   void superTestNamed(Future? val, {Future? val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A01_t01.dart
index 5b1d5e8..1535da5 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A01_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Future? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A02_t01.dart
index 3661373..f9d5f6d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A02_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A03_t01.dart
index 9e38bbe..55087d2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A03_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A03.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A03.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Future? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A04_t01.dart
index 79473a3..643c2f6 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_arguments_binding_super_fail_A04_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A04.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A04.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Future? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A01_t01.dart
index 777f1ee..945e247 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A01_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberTestStatic {
   static Future? s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A02_t01.dart
index 5420947..6430c1a 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A02_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A03_t01.dart
index c55b510..227f9df 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A03_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A03.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A03.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberTestStatic {
   static Future? s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A04_t01.dart
index f0ba2af..5bec267 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_fail_A04_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A04.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A04.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberTestStatic {
   static Future? s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A01_t01.dart
index b90527a..a1d4eb4 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A01_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t03 {
   Future? m = t1Default;
   void set superSetter(Future? val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A02_t01.dart
index 901aaa7..d5a2930 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A02_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A03_t01.dart
index 5ce82be..15d27f3 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A03_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A03.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A03.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t03 {
   Future? m = t1Default;
   void set superSetter(Future? val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A04_t01.dart
index d4cbd6a..5941569 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_mixin_fail_A04_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A04.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A04.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t03 {
   Future? m = t1Default;
   void set superSetter(Future? val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A01_t01.dart
index 374956e..39150d0 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A01_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Future? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A02_t01.dart
index 54e55e7..83b9fdd 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A02_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A03_t01.dart
index c72a79d..b9d3b85 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A03_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A03.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A03.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Future? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A04_t01.dart
index 9e331ad..90f181d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_class_member_super_fail_A04_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A04.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A04.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Future? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A01_t01.dart
index 84e1dd0..cf8d54d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A01_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A02_t01.dart
index 5191460..0400ec0 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A02_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A03_t01.dart
index 8c98f5e..5dca494 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A03_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A03.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A03.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A04_t01.dart
index 90a7813..71e4111 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_global_variable_fail_A04_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A04.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A04.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A01_t01.dart
index 4bf4d3c..52b7c04 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A01_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Future? t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A02_t01.dart
index 2fbf1c9..327ce0f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A02_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A03_t01.dart
index e0aca47..647e9b2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A03_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A03.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A03.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Future? t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A04_t01.dart
index 7767517..51a2f8e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_local_variable_fail_A04_t01.dart
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A04.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A04.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Future? t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A01_t01.dart
index d4bafcf..4ac499f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A01_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 Future? returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A02_t01.dart
index 57911d3..34f3d00 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A02_t01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A03_t01.dart
index 4d7fd69..a04ffcf 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A03_t01.dart
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A03.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A03.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 Future? returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A04_t01.dart
index 2f4171c..8e343cf 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_fail_return_value_fail_A04_t01.dart
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_FutureOr_fail_A04.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_fail_A04.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 Future? returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A01_t01.dart
index f6cf357..581ce6a 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A01_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A02_t01.dart
index 022de0c..29a7bd3 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A02_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A03_t01.dart
index 992d69b..76991c2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A03_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A04_t01.dart
index 3d84d74..63dc863 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_global_variable_A04_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A01_t01.dart
index 03c0788..e3850db 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A01_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A02_t01.dart
index 83d08d2..fdb93c7 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A02_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A03_t01.dart
index 4e747af..50e4993 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A03_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A04_t01.dart
index df8cb9c..c2789d6 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_local_variable_A04_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A01_t01.dart
index 21265f8..fb030f7 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A01_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 FutureOr<C> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -58,5 +53,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A02_t01.dart
index e5729ae..fa9cf61 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A02_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -35,9 +33,6 @@
 
 const t1Default = const C();
 
-
-
-
 FutureOr<C> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -58,5 +53,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A03_t01.dart
index 2b9daf7..163d272 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A03_t01.dart
@@ -16,12 +16,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 FutureOr<C<A>> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -60,5 +55,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A04_t01.dart
index 953182b..15206a5 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_FutureOr_return_value_A04_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_FutureOr_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_FutureOr_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const C<A>();
 
-
-
-
 FutureOr<C<A>> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -61,5 +56,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t01.dart
index 873aefd..f1e2f35 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -97,7 +92,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object>(t0Instance, t2: t0Instance);
 
@@ -109,5 +103,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t02.dart
index 5857acc..a4e5aae 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
@@ -113,8 +108,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object> c2 =
     new ArgumentsBinding2_t02<Object>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, t0Instance);
@@ -125,5 +118,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t03.dart
index d4085f2..1a2dd3e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,10 +28,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
   void superTest(Object val) {}
@@ -57,7 +52,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -85,12 +80,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t01.dart
index ea9ce8d..ae0f7cb 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -101,7 +96,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
@@ -113,5 +107,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t02.dart
index d29ed13..5676d95 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -117,8 +112,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
@@ -129,5 +122,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t03.dart
index e73b3fb..92f5e57 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_arguments_binding_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,10 +32,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -61,7 +56,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -89,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t01.dart
index 9d526c5..172c8b2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static Object s = t0Instance;
   Object m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t02.dart
index 258ecc9..23bb82f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t03.dart
index 35ef711..a811cf2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t01.dart
index f3b4557..21f3034 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t02.dart
index b7cd35d..3dc8d08 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t03.dart
index 2e2f510..e94fedd 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_class_member_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A01_t01.dart
index 73edd16..0faa6f4 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -15,12 +15,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = "Lily was here";
 
-
-
-
 namedArgumentsFunc1(String t1, {String t2 = t1Default}) {}
 positionalArgumentsFunc1(String t1, [String t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A02_t01.dart
index 7692765..0613d3a 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -15,12 +15,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,9 +32,6 @@
 
 const t1Default = const A();
 
-
-
-
 namedArgumentsFunc1(A t1, {A t2 = t1Default}) {}
 positionalArgumentsFunc1(A t1, [A t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A03_t01.dart
index 5b79a34..2077da3 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -15,12 +15,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(Null t1, {Null t2 = t1Default}) {}
 positionalArgumentsFunc1(Null t1, [Null t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A01_t01.dart
index f362f74..47b58be 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,10 +29,7 @@
 
 const t1Default = "Lily was here";
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(String val) {}
   void superTestPositioned(String val, [String val2 = t1Default]) {}
   void superTestNamed(String val, {String val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A02_t01.dart
index 8df12de..77f3fc2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -35,10 +33,7 @@
 
 const t1Default = const A();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(A val) {}
   void superTestPositioned(A val, [A val2 = t1Default]) {}
   void superTestNamed(A val, {A val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A03_t01.dart
index 611299e..0db17cd 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_mixin_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,10 +29,7 @@
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Null val) {}
   void superTestPositioned(Null val, [Null val2 = t1Default]) {}
   void superTestNamed(Null val, {Null val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A01_t01.dart
index 2377cfb..a2e90ee 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = "Lily was here";
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   String m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A02_t01.dart
index 9910748..24ad225 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -35,9 +33,6 @@
 
 const t1Default = const A();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   A m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A03_t01.dart
index 1f9a5a1..8b0f05d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_arguments_binding_super_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Null m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A01_t01.dart
index ab58654..00248c3 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = "Lily was here";
 
-
-
-
 class ClassMemberTestStatic {
   static String s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A02_t01.dart
index 390b8e0..720c9e6 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -35,9 +33,6 @@
 
 const t1Default = const A();
 
-
-
-
 class ClassMemberTestStatic {
   static A s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A03_t01.dart
index a9a9f5f..34b245e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberTestStatic {
   static Null s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A01_t01.dart
index 7faa6bd..3a5dd26 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = "Lily was here";
 
-
-
-
 class ClassMemberSuper1_t03 {
   String m = t1Default;
   void set superSetter(String val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A02_t01.dart
index bd7c950..0936d61 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -35,9 +33,6 @@
 
 const t1Default = const A();
 
-
-
-
 class ClassMemberSuper1_t03 {
   A m = t1Default;
   void set superSetter(A val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A03_t01.dart
index ac74890..f089383 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_mixin_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t03 {
   Null m = t1Default;
   void set superSetter(Null val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A01_t01.dart
index 6fbbae0..e796429 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = "Lily was here";
 
-
-
-
 class ClassMemberSuper1_t02 {
   String m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A02_t01.dart
index 30c448c..1f4ddac 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -35,9 +33,6 @@
 
 const t1Default = const A();
 
-
-
-
 class ClassMemberSuper1_t02 {
   A m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A03_t01.dart
index 550d6af..1e169c4 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_class_member_super_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Null m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A01_t01.dart
index 74ecb3d..0c04323 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = "Lily was here";
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A02_t01.dart
index fde471e..b42b770 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -35,9 +33,6 @@
 
 const t1Default = const A();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A03_t01.dart
index 4c7e3b2..8abdaeb 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_global_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A01_t01.dart
index 02fdbea..a8f4981 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = "Lily was here";
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     String t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A02_t01.dart
index 7a45ed6..6bccf92 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -35,9 +33,6 @@
 
 const t1Default = const A();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     A t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A03_t01.dart
index a1fc648..8943e86 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_local_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Null t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A01_t01.dart
index 89f56fc..61eef37 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -6,8 +6,8 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
@@ -15,12 +15,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = "Lily was here";
 
-
-
-
 String returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A02_t01.dart
index a4271e1..623bfb9 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -15,12 +15,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,9 +32,6 @@
 
 const t1Default = const A();
 
-
-
-
 A returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A03_t01.dart
index 00bd9bd..064361d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_fail_return_value_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -15,12 +15,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_legacy_fail_A03.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_fail_A03.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = null;
 
-
-
-
 Null returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_global_variable_A01_t01.dart
index 3217c3f..b072ddf 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_global_variable_A02_t01.dart
index 88817f2..1d850b1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_global_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_local_variable_A01_t01.dart
index 62def62..553ee11 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_local_variable_A02_t01.dart
index 15fafc4..a70925e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_local_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_return_value_A01_t01.dart
index 411243f..ddcdd22 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -30,9 +28,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -53,5 +48,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_legacy_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_legacy_return_value_A02_t01.dart
index 6ed552f..2b98ff8 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_legacy_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_legacy_return_value_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_legacy_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_legacy_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -57,5 +52,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t01.dart
index 28fde29..7ca1236 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(FutureOr<Null> t1, {FutureOr<Null> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<Null> t1, [FutureOr<Null> t2 = t1Default]) {}
 
@@ -98,7 +93,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<Null>>(t0Instance, t2: t0Instance);
 
@@ -110,5 +104,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t02.dart
index 4081fa3..ae3ff0f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<Null> m = t1Default;
 
@@ -114,8 +109,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<Null>> c2 =
     new ArgumentsBinding2_t02<FutureOr<Null>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<FutureOr<Null>>.c2(t1Instance, t0Instance);
@@ -126,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t03.dart
index f58f6c0..5239003 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,10 +29,7 @@
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   FutureOr<Null> m = t1Default;
 
   void superTest(FutureOr<Null> val) {}
@@ -58,7 +53,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +81,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<Null>> c2 = new ArgumentsBinding2_t03<FutureOr<Null>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t01.dart
index 9430bde..cf78b1e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(FutureOr<Object?> t1, {FutureOr<Object?> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<Object?> t1, [FutureOr<Object?> t2 = t1Default]) {}
 
@@ -98,7 +93,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<Object?>>(t0Instance, t2: t0Instance);
 
@@ -110,5 +104,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t02.dart
index 3a1b778..54f4156 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<Object?> m = t1Default;
 
@@ -114,8 +109,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<Object?>> c2 =
     new ArgumentsBinding2_t02<FutureOr<Object?>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<FutureOr<Object?>>.c2(t1Instance, t0Instance);
@@ -126,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t03.dart
index 605292e..2d57319 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,10 +29,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   FutureOr<Object?> m = t1Default;
 
   void superTest(FutureOr<Object?> val) {}
@@ -58,7 +53,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +81,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<Object?>> c2 = new ArgumentsBinding2_t03<FutureOr<Object?>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t01.dart
index e004a0e..f7ea474 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(Null? t1, {Null? t2 = t1Default}) {}
 positionalArgumentsFunc1(Null? t1, [Null? t2 = t1Default]) {}
 
@@ -97,7 +91,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Null?>(t0Instance, t2: t0Instance);
 
@@ -109,5 +102,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t02.dart
index 9d9c2e4..6d2b3d0 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Null? m = t1Default;
 
@@ -113,8 +107,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Null?> c2 =
     new ArgumentsBinding2_t02<Null?>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Null?>.c2(t1Instance, t0Instance);
@@ -125,5 +117,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t03.dart
index dfe6d7a..c1c54b4 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A04_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,17 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Null? m = t1Default;
 
   void superTest(Null? val) {}
@@ -57,7 +51,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -85,12 +79,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Null?> c2 = new ArgumentsBinding2_t03<Null?>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t01.dart
index 36edc67..e2f8021 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,13 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S {
   const S();
@@ -34,9 +31,6 @@
 
 const t1Default = const S();
 
-
-
-
 namedArgumentsFunc1(S? t1, {S? t2 = t1Default}) {}
 positionalArgumentsFunc1(S? t1, [S? t2 = t1Default]) {}
 
@@ -101,7 +95,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<S?>(t0Instance, t2: t0Instance);
 
@@ -113,5 +106,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t02.dart
index 9a24205..77ffc17 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,13 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S {
   const S();
@@ -34,9 +31,6 @@
 
 const t1Default = const S();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   S? m = t1Default;
 
@@ -117,8 +111,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<S?> c2 =
     new ArgumentsBinding2_t02<S?>(t0Instance);
   c2 = new ArgumentsBinding2_t02<S?>.c2(t1Instance, t0Instance);
@@ -129,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t03.dart
index 3c7c009..fa5df0e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A05_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,13 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S {
   const S();
@@ -34,10 +31,7 @@
 
 const t1Default = const S();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   S? m = t1Default;
 
   void superTest(S? val) {}
@@ -61,7 +55,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -89,12 +83,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<S?> c2 = new ArgumentsBinding2_t03<S?>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t01.dart
index b64cc29..74a0b93 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,9 +30,6 @@
 
 const t1Default = const X();
 
-
-
-
 namedArgumentsFunc1(X? t1, {X? t2 = t1Default}) {}
 positionalArgumentsFunc1(X? t1, [X? t2 = t1Default]) {}
 
@@ -99,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<X?>(t0Instance, t2: t0Instance);
 
@@ -111,5 +105,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t02.dart
index be0aa26..0c8fca9 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,9 +30,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   X? m = t1Default;
 
@@ -115,8 +110,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<X?> c2 =
     new ArgumentsBinding2_t02<X?>(t0Instance);
   c2 = new ArgumentsBinding2_t02<X?>.c2(t1Instance, t0Instance);
@@ -127,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t03.dart
index 5b4c576..b8842aa 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_arguments_binding_A06_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,10 +30,7 @@
 
 const t1Default = const X();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   X? m = t1Default;
 
   void superTest(X? val) {}
@@ -59,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -87,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<X?> c2 = new ArgumentsBinding2_t03<X?>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t01.dart
index 1ba9689..65e5368 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<Null> s = t0Instance;
   FutureOr<Null> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t02.dart
index 027a5bc..a0c537d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<Null> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t03.dart
index e6f3066..1091cec 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<Null> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t01.dart
index edba258..37b9608 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<Object?> s = t0Instance;
   FutureOr<Object?> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t02.dart
index fa05189..b54fe40 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<Object?> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t03.dart
index acc75a9..921c835 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<Object?> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t01.dart
index ed68d16..e384c95 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static Null? s = t0Instance;
   Null? m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t02.dart
index a08ae78..d6ab16d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Null? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t03.dart
index a3ee753..7512964 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A04_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Null? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t01.dart
index 8a3f685..213a334 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,13 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S {
   const S();
@@ -34,9 +31,6 @@
 
 const t1Default = const S();
 
-
-
-
 class ClassMember1_t01 {
   static S? s = t0Instance;
   S? m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t02.dart
index b46a476..11568c1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,13 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S {
   const S();
@@ -34,9 +31,6 @@
 
 const t1Default = const S();
 
-
-
-
 class ClassMemberSuper1_t02 {
   S? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t03.dart
index a9f04a3..962ca79 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A05_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,13 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S {
   const S();
@@ -34,9 +31,6 @@
 
 const t1Default = const S();
 
-
-
-
 class ClassMemberMixin1_t03 {
   S? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t01.dart
index 98f9bc3..0b133bd 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,9 +30,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ClassMember1_t01 {
   static X? s = t0Instance;
   X? m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t02.dart
index d788b92..132ccfb 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,9 +30,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ClassMemberSuper1_t02 {
   X? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t03.dart
index 35b8a50..050e5f6 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_class_member_A06_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,9 +30,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ClassMemberMixin1_t03 {
   X? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A01_t01.dart
index fd6c1a7..ec746f2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(FutureOr<Object> t1, {FutureOr<Object> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<Object> t1, [FutureOr<Object> t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A02_t01.dart
index 63a50d7..e483087 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A03_t01.dart
index e76e236..b4c792e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_fail_A03.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A04_t01.dart
index 2443118..b4c91c1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_fail_A04.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,9 +30,6 @@
 
 const t1Default = const X();
 
-
-
-
 namedArgumentsFunc1(X t1, {X t2 = t1Default}) {}
 positionalArgumentsFunc1(X t1, [X t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A01_t01.dart
index 4f628c5..11c0830 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -19,12 +19,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -33,10 +31,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(FutureOr<Object> val) {}
   void superTestPositioned(FutureOr<Object> val, [FutureOr<Object> val2 = t1Default]) {}
   void superTestNamed(FutureOr<Object> val, {FutureOr<Object> val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A02_t01.dart
index 0a954c4..c90bbd3 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,23 +18,17 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A02.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A02.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
   void superTestNamed(Object val, {Object val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A03_t01.dart
index 01e7d4f..ef27c7f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,23 +18,17 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A03.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A03.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
   void superTestNamed(Object val, {Object val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A04_t01.dart
index 2b489b9..1df9949 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_mixin_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A04.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A04.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -33,10 +31,7 @@
 
 const t1Default = const X();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(X val) {}
   void superTestPositioned(X val, [X val2 = t1Default]) {}
   void superTestNamed(X val, {X val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A01_t01.dart
index 19bc3b2..9edd8a5 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -19,12 +19,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -33,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<Object> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A02_t01.dart
index a7c128c..d972fa5 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A02.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A02.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A03_t01.dart
index 7714bf8..eeddbbc 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A03.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A03.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A04_t01.dart
index 1fefa60..1221704 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_arguments_binding_super_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A04.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A04.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -33,9 +31,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   X m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A01_t01.dart
index bf6982a..4fee961 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -19,12 +19,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -33,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberTestStatic {
   static FutureOr<Object> s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A02_t01.dart
index db17e3a..e5074df 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A03_t01.dart
index 7e96dae..6636452 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A03.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A03.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A04_t01.dart
index c0d74b8..7e14b98 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A04.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A04.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -33,9 +31,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ClassMemberTestStatic {
   static X s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A01_t01.dart
index 5fded1a..e8e2a86 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -19,12 +19,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -33,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t03 {
   FutureOr<Object> m = t1Default;
   void set superSetter(FutureOr<Object> val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A02_t01.dart
index 3bfc6da..24152d9 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A02.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A02.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
   void set superSetter(Object val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A03_t01.dart
index a85471e..37e0308 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A03.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A03.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
   void set superSetter(Object val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A04_t01.dart
index 5c65f98..4b6f744 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_mixin_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A04.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A04.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -33,9 +31,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ClassMemberSuper1_t03 {
   X m = t1Default;
   void set superSetter(X val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A01_t01.dart
index 065754e..340f384 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -19,12 +19,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -33,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<Object> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A02_t01.dart
index f9ca47d..92c4bca 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A02.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A02.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A03_t01.dart
index d72fade..00c9aa2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A03.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A03.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A04_t01.dart
index 43f3cf2..b55a5b9 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_class_member_super_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A04.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A04.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -33,9 +31,6 @@
 
 const t1Default = const X();
 
-
-
-
 class ClassMemberSuper1_t02 {
   X m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A01_t01.dart
index b7e6d4f..e1705f1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -19,12 +19,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -33,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A02_t01.dart
index 6c17cf7..67addb1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A03_t01.dart
index ccb08ab..bde0bf2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A03.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A03.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A04_t01.dart
index 31cbdfb..6c9e535 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_global_variable_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A04.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A04.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -33,9 +31,6 @@
 
 const t1Default = const X();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A01_t01.dart
index f3bb998..52444c1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -19,12 +19,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -33,9 +31,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     FutureOr<Object> t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A02_t01.dart
index 061f86c..0dab8ba 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Object t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A03_t01.dart
index d22d437..a76ec90 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,22 +18,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A03.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A03.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Object t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A04_t01.dart
index 1acccd2..8b4c876 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_local_variable_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A04.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A04.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -33,9 +31,6 @@
 
 const t1Default = const X();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     X t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A01_t01.dart
index 3872c48..c27189e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -32,9 +30,6 @@
 
 const t1Default = const Object();
 
-
-
-
 FutureOr<Object> returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A02_t01.dart
index cf722b2..924dcff 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A03_t01.dart
index f9fa9eb..d9d4aa7 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A03.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_fail_A03.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A04_t01.dart
index efd6267..18eccd3 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_fail_return_value_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_null_fail_A04.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_fail_A04.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,9 +30,6 @@
 
 const t1Default = const X();
 
-
-
-
 X returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A02_t01.dart
index f6a4789..6b6cf6d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A03_t01.dart
index dbea306..38e1823 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A04_t01.dart
index 76089c2..b28033f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A05_t01.dart
index bca2482..c54e8dc 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,13 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S {
   const S();
@@ -34,9 +31,6 @@
 
 const t1Default = const S();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A06_t01.dart
index c104960..d2aaa08 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_global_variable_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,9 +30,6 @@
 
 const t1Default = const X();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A02_t01.dart
index 65fcff9..6c658a7 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A03_t01.dart
index 2cb2e5f..98329a8 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A04_t01.dart
index 680ce9f..fc9dde4 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A05_t01.dart
index 6aae787..5e45f90 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,13 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S {
   const S();
@@ -34,9 +31,6 @@
 
 const t1Default = const S();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A06_t01.dart
index e06a274..f63fa13 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_local_variable_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,9 +30,6 @@
 
 const t1Default = const X();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A02_t01.dart
index a318099..a5745e2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = null;
 
-
-
-
 FutureOr<Null> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +49,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A03_t01.dart
index 34a47e9..fab90ac 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -31,9 +29,6 @@
 
 const t1Default = const Object();
 
-
-
-
 FutureOr<Object?> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +49,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A04_t01.dart
index 1f84345..e6b8368 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,22 +17,16 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null? t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 Null? returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -53,5 +47,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A05_t01.dart
index 067b9a7..98dd740 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,13 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A05.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_null_A05.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S {
   const S();
@@ -34,9 +31,6 @@
 
 const t1Default = const S();
 
-
-
-
 S? returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -57,5 +51,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A06_t01.dart
index bec2633..0b1024a 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_null_return_value_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_null_A06.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_null_A06.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -32,9 +30,6 @@
 
 const t1Default = const X();
 
-
-
-
 X? returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -55,5 +50,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t01.dart
index bac24fb..1ae7cf2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,9 +31,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1? t1, {T1? t2 = t1Default}) {}
 positionalArgumentsFunc1(T1? t1, [T1? t2 = t1Default]) {}
 
@@ -100,7 +95,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1?>(t0Instance, t2: t0Instance);
 
@@ -112,5 +106,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t02.dart
index ba8342d..885d455 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,9 +31,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1? m = t1Default;
 
@@ -116,8 +111,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1?> c2 =
     new ArgumentsBinding2_t02<T1?>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1?>.c2(t1Instance, t0Instance);
@@ -128,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t03.dart
index e65810a..7ba4180 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,10 +31,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1? m = t1Default;
 
   void superTest(T1? val) {}
@@ -60,7 +55,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -88,12 +83,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1?> c2 = new ArgumentsBinding2_t03<T1?>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t01.dart
index 77641ce..8c8cf2f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,9 +31,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1? s = t0Instance;
   T1? m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t02.dart
index 27967e1..77b0a2f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,9 +31,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t03.dart
index 9edc902..2c2488a 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,9 +31,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_fail_A01_t01.dart
index e71d9e1..f7909a1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -15,13 +15,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -35,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_fail_A02_t01.dart
index ac654b3..fc5f651 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -15,12 +15,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1? t1, {T1? t2 = t1Default}) {}
 positionalArgumentsFunc1(T1? t1, [T1? t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_mixin_fail_A01_t01.dart
index 1faa3e5..bf08c50 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,13 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -36,10 +33,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_mixin_fail_A02_t01.dart
index 3c58ce8..d8186e1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_mixin_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -35,10 +33,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1? val) {}
   void superTestPositioned(T1? val, [T1? val2 = t1Default]) {}
   void superTestNamed(T1? val, {T1? val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_super_fail_A01_t01.dart
index 9926fee..1ab2408 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_super_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,13 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -36,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_super_fail_A02_t01.dart
index d05bd99..58d243f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_arguments_binding_super_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -35,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_fail_A01_t01.dart
index 19a2411..dd531da 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,13 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -36,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_fail_A02_t01.dart
index fa39d30..420ab9d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -35,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberTestStatic {
   static T1? s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_mixin_fail_A01_t01.dart
index a36b66d..292b65e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_mixin_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,13 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -36,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_mixin_fail_A02_t01.dart
index 262c4f6..c273431 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_mixin_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -35,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1? m = t1Default;
   void set superSetter(T1? val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_super_fail_A01_t01.dart
index 26eace3..840315d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_super_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,13 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -36,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_super_fail_A02_t01.dart
index 2d4608b..1b727af 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_class_member_super_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -35,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_global_variable_fail_A01_t01.dart
index bb178b8..57ea1f6 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_global_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,13 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -36,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_global_variable_fail_A02_t01.dart
index 5ae4af6..f6f8814 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_global_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -35,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_local_variable_fail_A01_t01.dart
index 69a134a..63ec996 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_local_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,13 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -36,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_local_variable_fail_A02_t01.dart
index 01472cc..7897970 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_local_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -35,9 +33,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1? t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_return_value_fail_A01_t01.dart
index 893e2e7..97e658f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_return_value_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -15,13 +15,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_nullable_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -35,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_return_value_fail_A02_t01.dart
index 6f434c6..387b11e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_fail_return_value_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -15,12 +15,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_nullable_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1? returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_global_variable_A01_t01.dart
index f9e2cf3..b6e41ae 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,9 +31,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_local_variable_A01_t01.dart
index 350f044..316423f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,9 +31,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_nullable_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_nullable_return_value_A01_t01.dart
index 610dee6..1781639 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_nullable_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_nullable_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_nullable_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_nullable_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,9 +31,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1? returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -56,5 +51,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t01.dart
index 4c08b03..68febca 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -77,48 +71,42 @@
   set testSetter(X val) {}
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
 
   if (t0Instance is S0) {
-    
-  // test functions
-  namedArgumentsFunc1(t0Instance, t2: t0Instance);
-  positionalArgumentsFunc1(t0Instance, t0Instance);
+    // test functions
+    namedArgumentsFunc1(t0Instance, t2: t0Instance);
+    positionalArgumentsFunc1(t0Instance, t0Instance);
 
-  // test class constructors
-  ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
-  instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
-  instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
+    // test class constructors
+    ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
+    instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
+    instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
 
-  // tests methods and setters
-  instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance1.positionalArgumentsMethod(t0Instance, t0Instance);
-  instance1.testSetter = t0Instance;
+    // tests methods and setters
+    instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance1.positionalArgumentsMethod(t0Instance, t0Instance);
+    instance1.testSetter = t0Instance;
 
-  // test static methods
-  ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
+    // test static methods
+    ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  // test generic functions
-  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
+    // test generic functions
+    namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
-  // test generic class constructors
-  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
-  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
-  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+    // test generic class constructors
+    ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+    instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+    instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
 
-  // test generic class methods and setters
-  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance2.testSetter = t0Instance;
-  //# -->
-
+    // test generic class methods and setters
+    instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance2.testSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t02.dart
index 304e0a2..9d28dda 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -98,43 +92,36 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
 
   if (t0Instance is S0) {
-    
-  ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c1(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c3(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c5(t0Instance);
+    ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c1(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c3(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c5(t0Instance);
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
+    // Test type parameters
+    ArgumentsBinding2_t02<T1> c2 =
+      new ArgumentsBinding2_t02<T1>(t0Instance);
+    c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+    c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t02<T1> c2 =
-    new ArgumentsBinding2_t02<T1>(t0Instance);
-  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
-  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
-
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  c2.superGetter;
-  //# -->
-
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
+    c2.superGetter;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t03.dart
index 9a78b6a..9c10a88 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A01_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,16 +25,12 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -60,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -75,33 +69,26 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
 
   if (t0Instance is S0) {
-    
-  ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
+    ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
-
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  //# -->
-
+    // Test type parameters
+    ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t01.dart
index 0417fbc..fa59a05 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -77,47 +71,41 @@
   set testSetter(X val) {}
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  // test functions
-  namedArgumentsFunc1(t0Instance, t2: t0Instance);
-  positionalArgumentsFunc1(t0Instance, t0Instance);
+    // test functions
+    namedArgumentsFunc1(t0Instance, t2: t0Instance);
+    positionalArgumentsFunc1(t0Instance, t0Instance);
 
-  // test class constructors
-  ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
-  instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
-  instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
+    // test class constructors
+    ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
+    instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
+    instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
 
-  // tests methods and setters
-  instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance1.positionalArgumentsMethod(t0Instance, t0Instance);
-  instance1.testSetter = t0Instance;
+    // tests methods and setters
+    instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance1.positionalArgumentsMethod(t0Instance, t0Instance);
+    instance1.testSetter = t0Instance;
 
-  // test static methods
-  ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
+    // test static methods
+    ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  // test generic functions
-  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
+    // test generic functions
+    namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
-  // test generic class constructors
-  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
-  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
-  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+    // test generic class constructors
+    ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+    instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+    instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
 
-  // test generic class methods and setters
-  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance2.testSetter = t0Instance;
-  //# -->
-
+    // test generic class methods and setters
+    instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance2.testSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t02.dart
index 6026a31..313d4c1 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -98,42 +92,35 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c1(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c3(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c5(t0Instance);
+    ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c1(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c3(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c5(t0Instance);
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
+    // Test type parameters
+    ArgumentsBinding2_t02<T1> c2 =
+      new ArgumentsBinding2_t02<T1>(t0Instance);
+    c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+    c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t02<T1> c2 =
-    new ArgumentsBinding2_t02<T1>(t0Instance);
-  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
-  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
-
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  c2.superGetter;
-  //# -->
-
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
+    c2.superGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t03.dart
index 4ebe833..98fb125 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_arguments_binding_A02_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,16 +25,12 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -60,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -75,32 +69,25 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
+    ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
-
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  //# -->
-
+    // Test type parameters
+    ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t01.dart
index aa31741..64c81e2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -78,26 +72,22 @@
   static T1 get staticGetter => t0Instance;
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
 
   if (t0Instance is S0) {
-    
-  ClassMember1_t01 c1 = new ClassMember1_t01();
-  c1 = new ClassMember1_t01.short(t0Instance,
-      t0Instance);
-  c1 = new ClassMember1_t01.named(t0Instance);
-  c1.m = t0Instance;
-  c1.test();
-  c1.setter = t0Instance;
-  c1.getter;
+    ClassMember1_t01 c1 = new ClassMember1_t01();
+    c1 = new ClassMember1_t01.short(t0Instance,
+        t0Instance);
+    c1 = new ClassMember1_t01.named(t0Instance);
+    c1.m = t0Instance;
+    c1.test();
+    c1.setter = t0Instance;
+    c1.getter;
 
-  ClassMember1_t01.s = t0Instance;
-  ClassMember1_t01.staticTest();
-  ClassMember1_t01.staticSetter = t0Instance;
-  ClassMember1_t01.staticGetter;
-
+    ClassMember1_t01.s = t0Instance;
+    ClassMember1_t01.staticTest();
+    ClassMember1_t01.staticSetter = t0Instance;
+    ClassMember1_t01.staticGetter;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t02.dart
index e978b36..39d1e73 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -66,19 +60,15 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
 
   if (t0Instance is S0) {
-    
-  ClassMember1_t02 c1 = new ClassMember1_t02();
-  c1 = new ClassMember1_t02.short();
-  c1 = new ClassMember1_t02.named();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t02 c1 = new ClassMember1_t02();
+    c1 = new ClassMember1_t02.short();
+    c1 = new ClassMember1_t02.named();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t03.dart
index 2910f8f..b1ea169 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A01_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -49,17 +43,13 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
 
   if (t0Instance is S0) {
-    
-  ClassMember1_t03 c1 = new ClassMember1_t03();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t03 c1 = new ClassMember1_t03();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t01.dart
index 79c4076..1bc9eeb 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -78,25 +72,21 @@
   static T1 get staticGetter => t0Instance;
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  ClassMember1_t01 c1 = new ClassMember1_t01();
-  c1 = new ClassMember1_t01.short(t0Instance,
-      t0Instance);
-  c1 = new ClassMember1_t01.named(t0Instance);
-  c1.m = t0Instance;
-  c1.test();
-  c1.setter = t0Instance;
-  c1.getter;
+    ClassMember1_t01 c1 = new ClassMember1_t01();
+    c1 = new ClassMember1_t01.short(t0Instance,
+        t0Instance);
+    c1 = new ClassMember1_t01.named(t0Instance);
+    c1.m = t0Instance;
+    c1.test();
+    c1.setter = t0Instance;
+    c1.getter;
 
-  ClassMember1_t01.s = t0Instance;
-  ClassMember1_t01.staticTest();
-  ClassMember1_t01.staticSetter = t0Instance;
-  ClassMember1_t01.staticGetter;
-
+    ClassMember1_t01.s = t0Instance;
+    ClassMember1_t01.staticTest();
+    ClassMember1_t01.staticSetter = t0Instance;
+    ClassMember1_t01.staticGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t02.dart
index ae4c289..7a34952 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -66,18 +60,14 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  ClassMember1_t02 c1 = new ClassMember1_t02();
-  c1 = new ClassMember1_t02.short();
-  c1 = new ClassMember1_t02.named();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t02 c1 = new ClassMember1_t02();
+    c1 = new ClassMember1_t02.short();
+    c1 = new ClassMember1_t02.named();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t03.dart
index dfc9e45..500182d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_class_member_A02_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -49,16 +43,12 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  ClassMember1_t03 c1 = new ClassMember1_t03();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t03 c1 = new ClassMember1_t03();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_global_variable_A01_t01.dart
index 8d5e1be..67cf3b2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_global_variable_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -50,22 +44,18 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
 
   if (t0Instance is S0) {
-    
-  bar () {
+    bar () {
+      t1Instance = t0Instance;
+    }
+
     t1Instance = t0Instance;
-  }
-
-  t1Instance = t0Instance;
-  bar();
-  GlobalVariableTest t = new GlobalVariableTest();
-  t.foo();
-  GlobalVariableTest.test();
-
+    bar();
+    GlobalVariableTest t = new GlobalVariableTest();
+    t.foo();
+    GlobalVariableTest.test();
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_global_variable_A02_t01.dart
index ba8c4e1..642e9c8 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_global_variable_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -50,21 +44,17 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  bar () {
+    bar () {
+      t1Instance = t0Instance;
+    }
+
     t1Instance = t0Instance;
-  }
-
-  t1Instance = t0Instance;
-  bar();
-  GlobalVariableTest t = new GlobalVariableTest();
-  t.foo();
-  GlobalVariableTest.test();
-
+    bar();
+    GlobalVariableTest t = new GlobalVariableTest();
+    t.foo();
+    GlobalVariableTest.test();
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_local_variable_A01_t01.dart
index 9ef5a37..5d80a27 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_local_variable_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -54,24 +48,20 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
 
   if (t0Instance is S0) {
-    
-  foo() {
+    foo() {
+      T1 t1 = t0Instance;
+      t1 = t0Instance;
+    }
+
     T1 t1 = t0Instance;
     t1 = t0Instance;
-  }
-
-  T1 t1 = t0Instance;
-  t1 = t0Instance;
-  foo();
-  LocalVariableTest x = new LocalVariableTest();
-  x.test();
-  LocalVariableTest.staticTest();
-
+    foo();
+    LocalVariableTest x = new LocalVariableTest();
+    x.test();
+    LocalVariableTest.staticTest();
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_local_variable_A02_t01.dart
index b5fdee9..68ecbfa 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_local_variable_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -54,23 +48,19 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  foo() {
+    foo() {
+      T1 t1 = t0Instance;
+      t1 = t0Instance;
+    }
+
     T1 t1 = t0Instance;
     t1 = t0Instance;
-  }
-
-  T1 t1 = t0Instance;
-  t1 = t0Instance;
-  foo();
-  LocalVariableTest x = new LocalVariableTest();
-  x.test();
-  LocalVariableTest.staticTest();
-
+    foo();
+    LocalVariableTest x = new LocalVariableTest();
+    x.test();
+    LocalVariableTest.staticTest();
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_return_value_A01_t01.dart
index 97c1ccf..6ea5115 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_return_value_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -46,23 +40,18 @@
   T1 get testGetter => t0Instance;
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
 
   if (t0Instance is S0) {
-    
-  T1 returnValueLocalFunc() => t0Instance;
+    T1 returnValueLocalFunc() => t0Instance;
 
-  returnValueFunc();
-  returnValueLocalFunc();
+    returnValueFunc();
+    returnValueLocalFunc();
 
-  ReturnValueTest.staticTestMethod();
+    ReturnValueTest.staticTestMethod();
 
-  new ReturnValueTest().testMethod();
-  new ReturnValueTest().testGetter;
-
-
+    new ReturnValueTest().testMethod();
+    new ReturnValueTest().testGetter;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_return_value_A02_t01.dart
index 560de79..ec95528 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_promoted_variable_return_value_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_promoted_variable_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_promoted_variable_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -27,15 +25,11 @@
 class X0 {}
 class S0 extends X0 implements T1 {}
 
-
 S0 t0Instance = new S0();
 T1 t1Instance = new T1();
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -46,22 +40,17 @@
   T1 get testGetter => t0Instance;
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  T1 returnValueLocalFunc() => t0Instance;
+    T1 returnValueLocalFunc() => t0Instance;
 
-  returnValueFunc();
-  returnValueLocalFunc();
+    returnValueFunc();
+    returnValueLocalFunc();
 
-  ReturnValueTest.staticTestMethod();
+    ReturnValueTest.staticTestMethod();
 
-  new ReturnValueTest().testMethod();
-  new ReturnValueTest().testGetter;
-
-
+    new ReturnValueTest().testMethod();
+    new ReturnValueTest().testGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t01.dart
index 6fa78d6..b86cd35 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t01.dart
@@ -13,22 +13,16 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object? t1, {Object? t2 = t1Default}) {}
 positionalArgumentsFunc1(Object? t1, [Object? t2 = t1Default]) {}
 
@@ -93,7 +87,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object?>(t0Instance, t2: t0Instance);
 
@@ -105,5 +98,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t02.dart
index 4cea1bd..70e7c1a 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t02.dart
@@ -13,22 +13,16 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object? m = t1Default;
 
@@ -109,8 +103,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object?> c2 =
     new ArgumentsBinding2_t02<Object?>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Object?>.c2(t1Instance, t0Instance);
@@ -121,5 +113,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t03.dart
index 308cf36..5581ef3 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_top_arguments_binding_A01_t03.dart
@@ -13,23 +13,17 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Object? m = t1Default;
 
   void superTest(Object? val) {}
@@ -53,7 +47,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -81,12 +75,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object?> c2 = new ArgumentsBinding2_t03<Object?>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t01.dart
index 4bfddea..38d8735 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t01.dart
@@ -13,22 +13,16 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static Object? s = t0Instance;
   Object? m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t02.dart
index b56a2e7..752e218 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t02.dart
@@ -13,22 +13,16 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t03.dart
index c4e6f63..7d34f52 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_top_class_member_A01_t03.dart
@@ -13,22 +13,16 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_top_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_top_global_variable_A01_t01.dart
index 6e56794..ca71e10 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_top_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_top_global_variable_A01_t01.dart
@@ -13,22 +13,16 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_top_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_top_local_variable_A01_t01.dart
index 9abd512..aadbe1f 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_top_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_top_local_variable_A01_t01.dart
@@ -13,22 +13,16 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_top_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_top_return_value_A01_t01.dart
index a13ba5b..7fe2ec2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_top_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_top_return_value_A01_t01.dart
@@ -13,22 +13,16 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_top_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/left_top_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 Object? returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -49,5 +43,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t01.dart
index b139686..d98c10e 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -32,9 +30,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -99,7 +94,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
@@ -111,5 +105,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t02.dart
index bb80a51..cb3e4a2 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -32,9 +30,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -115,8 +110,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
@@ -127,5 +120,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t03.dart
index e12f01d..463a7f0 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_arguments_binding_A01_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -32,10 +30,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -59,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -87,12 +82,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t01.dart
index 3a6c56d..24a270d 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -32,9 +30,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t02.dart
index 8e78e57..02ddb1b 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -32,9 +30,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t03.dart
index cbb2724..d7dca17 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_class_member_A01_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -32,9 +30,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t01.dart
index 54122d1..ef132a3 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_fail_A01_t01.dart
@@ -15,12 +15,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,9 +31,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_mixin_fail_A01_t01.dart
index 40f1d8a..ca35f54 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -34,10 +32,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_super_fail_A01_t01.dart
index 83415e7..664ebd8 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_arguments_binding_super_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_fail_A01_t01.dart
index 16cd069..3c83369 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_mixin_fail_A01_t01.dart
index 2661320..80ed2ca 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_mixin_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_super_fail_A01_t01.dart
index b23b1be..71468ec 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_class_member_super_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_global_variable_fail_A01_t01.dart
index 761b493..48d1742 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_global_variable_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_local_variable_fail_A01_t01.dart
index f28d8ef..70d5ac9 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_local_variable_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -34,9 +32,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_return_value_fail_A01_t01.dart
index 5e26735..d1fa8c0 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_fail_return_value_fail_A01_t01.dart
@@ -15,12 +15,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -33,9 +31,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_global_variable_A01_t01.dart
index 6635daf..9c3cca5 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_global_variable_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -32,9 +30,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_local_variable_A01_t01.dart
index 76733d6..087c0af 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_local_variable_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -32,9 +30,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_return_value_A01_t01.dart
index aab147a..3653da8 100644
--- a/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/left_type_variable_bound_return_value_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from left_type_variable_bound_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/left_type_variable_bound_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -32,9 +30,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -55,5 +50,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t01.dart
index a5d9417..bfc3434 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t01.dart
@@ -22,13 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -120,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
@@ -132,5 +125,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t02.dart
index 2f4e68a..67847c3 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t02.dart
@@ -22,13 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -136,8 +130,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
@@ -148,5 +140,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t03.dart
index 5056247..79e0581 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A01_t03.dart
@@ -22,13 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,10 +50,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -80,7 +74,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -108,12 +102,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t01.dart
index e4a47c5..849ad44 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -155,5 +150,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t02.dart
index 26361e6..0a8a64b 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -171,6 +166,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t03.dart
index f4e5df9..b2f0371 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A02_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,10 +86,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -115,7 +110,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -143,6 +138,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t01.dart
index 35ae470..1c2060b 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,15 +67,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -155,5 +154,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t02.dart
index 05bfd1a..4baa5d4 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,15 +67,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -171,6 +170,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t03.dart
index 23016df..7b4169c 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A03_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,15 +67,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -88,10 +90,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -115,7 +114,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -143,6 +142,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t01.dart
index 52484bf..123ed91 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,14 +67,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -155,5 +154,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t02.dart
index 42cc492..d4ab519 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,14 +67,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -171,6 +170,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t03.dart
index 0b5139e..90ae89d 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A04_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,14 +67,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -88,10 +90,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -115,7 +114,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -143,6 +142,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t01.dart
index 6d4053d..f233cfe 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -70,9 +68,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -137,5 +132,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t02.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t02.dart
index ef7164a..b81c7b8 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -70,9 +68,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -153,6 +148,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t03.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t03.dart
index 67abc35..99547ca 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_arguments_binding_A05_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -70,10 +68,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -97,7 +92,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -125,6 +120,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t01.dart
index 2c03584..62229ff 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t01.dart
@@ -22,13 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t02.dart
index 447ee63..b54aa17 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t02.dart
@@ -22,13 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t03.dart
index 666c0c7..d6dc606 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A01_t03.dart
@@ -22,13 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t01.dart
index 76d6374..7f2b2b7 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -148,4 +143,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t02.dart
index 6a2acfa..89d6bd7 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -129,4 +124,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t03.dart
index 27d6db9..9a29f57 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A02_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -110,4 +105,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t01.dart
index cb28a80..2110aa5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,15 +67,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -148,4 +147,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t02.dart
index fdf2d3f..ac82da1 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,15 +67,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -129,4 +128,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t03.dart
index 3e23217..6b573c0 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A03_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,15 +67,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -110,4 +109,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t01.dart
index fb1cddc..0a1f427 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,14 +67,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -148,4 +147,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t02.dart
index 87a5290..62efea1 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,14 +67,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -129,4 +128,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t03.dart
index 07e64ac..092b2eb 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A04_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,14 +67,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -110,4 +109,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t01.dart
index dc86e0c..f882674 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -70,9 +68,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -130,4 +125,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t02.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t02.dart
index 98ee56b..a93414b 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -70,9 +68,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -111,4 +106,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t03.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t03.dart
index a2c3da7..8844877 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_class_member_A05_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -70,9 +68,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -92,4 +87,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A11_t01.dart
index 832622a..2e52aae 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A11_t01.dart
@@ -23,12 +23,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A12_t01.dart
index 16abab3..a7826c6 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A12_t01.dart
@@ -23,48 +23,63 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -191,4 +206,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A21_t01.dart
index e853378..884b849 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A21_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -24,12 +24,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -183,4 +178,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A22_t01.dart
index 6e69a6b..1f1c9ea 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A22_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -24,12 +24,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,9 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -219,4 +214,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A23_t01.dart
index 2dda6ef..3b8fb9b 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A23_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -24,12 +24,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -201,4 +196,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A31_t01.dart
index 68a073a..1ebedd0 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A31_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -24,12 +24,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,10 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A32_t01.dart
index ad8da62..0f220d0 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A32_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -24,12 +24,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -71,14 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -90,9 +93,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -219,4 +219,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A33_t01.dart
index f90530a..4443cd5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A33_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -24,12 +24,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -53,14 +51,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -72,9 +75,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -201,4 +201,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A41_t01.dart
index 265f30e..bb8ab67 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A41_t01.dart
@@ -23,12 +23,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A42_t01.dart
index c45a3d4..62b3561 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A42_t01.dart
@@ -23,12 +23,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,9 +85,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -216,4 +211,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A43_t01.dart
index 2258fde..06d671b 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A43_t01.dart
@@ -23,12 +23,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -71,9 +69,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -200,4 +195,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A51_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A51_t01.dart
index 0d0107b..e5eb792 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A51_t01.dart
@@ -23,46 +23,58 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -189,4 +201,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A52_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A52_t01.dart
index b3060fd..914cacf 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A52_t01.dart
@@ -23,12 +23,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,9 +85,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -216,4 +211,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A53_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A53_t01.dart
index 8c59a77..e4e6f30 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_fail_A53_t01.dart
@@ -23,12 +23,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -71,9 +69,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -200,4 +195,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A11_t01.dart
index 4997e95..928904a 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A11_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,10 +52,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A12_t01.dart
index 6e88c28..7eed0f4e 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A12_t01.dart
@@ -24,49 +24,64 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -199,4 +214,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A21_t01.dart
index a9178c0..17006bd 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A21_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,10 +53,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -191,4 +186,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A22_t01.dart
index b11b09a..2d88d36 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A22_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,10 +89,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -227,4 +222,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A23_t01.dart
index a5a2c88..85b5ea3 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A23_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -73,10 +71,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -209,4 +204,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A31_t01.dart
index 04a1852..f5e4288 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A31_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,11 +53,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A32_t01.dart
index 54d2aac..e0568b5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A32_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,14 +70,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,10 +94,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -227,4 +227,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A33_t01.dart
index 98daf68..5e666ca 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A33_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -54,14 +52,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,10 +76,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -209,4 +209,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A41_t01.dart
index e5e05b6..1a9ec8e 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A41_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,10 +52,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A42_t01.dart
index f17795f..d62170d 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A42_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,10 +86,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -224,4 +219,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A43_t01.dart
index 089c28a..28181f8 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A43_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,10 +70,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -208,4 +203,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A51_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A51_t01.dart
index b63a813..9a31b35 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A51_t01.dart
@@ -24,47 +24,59 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -197,4 +209,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A52_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A52_t01.dart
index 1d7481b..2742dc5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A52_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,10 +86,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -224,4 +219,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A53_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A53_t01.dart
index 9723897..b9acbc0 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_mixin_fail_A53_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,10 +70,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -208,4 +203,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A11_t01.dart
index a17f9da..0b07ef5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A11_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A12_t01.dart
index 5e9e1eb..7e6abef 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A12_t01.dart
@@ -24,48 +24,63 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -232,4 +247,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A21_t01.dart
index 3c3cec2..e9e80cd 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A21_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -224,4 +219,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A22_t01.dart
index c0ffa80..f4613ae 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A22_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,9 +89,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -260,4 +255,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A23_t01.dart
index 68f166a..ee914a9 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A23_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -73,9 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -242,4 +237,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A31_t01.dart
index 1123ca3..994ace5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A31_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,10 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A32_t01.dart
index 9f74ac6..24e02ca 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A32_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,14 +70,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,9 +94,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -260,4 +260,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A33_t01.dart
index a40ead7..350a5bc 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A33_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -54,14 +52,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,9 +76,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -242,4 +242,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A41_t01.dart
index 8c2d10c..f133612 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A41_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A42_t01.dart
index 5178e77..ed2b20b 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A42_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -257,4 +252,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A43_t01.dart
index d336df5..7807b5d 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A43_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -241,4 +236,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A51_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A51_t01.dart
index 2977599..5385b88 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A51_t01.dart
@@ -24,46 +24,58 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -230,4 +242,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A52_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A52_t01.dart
index e495690..3b7caed 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A52_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -257,4 +252,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A53_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A53_t01.dart
index df5c7f5..dad56bd 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_arguments_binding_super_fail_A53_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -241,4 +236,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A11_t01.dart
index 5088134..a69c00e 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A11_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A12_t01.dart
index 4a81764..57d8ebd 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A12_t01.dart
@@ -24,48 +24,63 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -176,4 +191,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A21_t01.dart
index 2b62aae..bfb33c2 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A21_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -168,4 +163,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A22_t01.dart
index 65a51d9..4655fa8 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A22_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,9 +89,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -204,4 +199,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A23_t01.dart
index d82f772..3bf9860 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A23_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -73,9 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -186,4 +181,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A31_t01.dart
index 57e4090..b21c83c 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A31_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,10 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A32_t01.dart
index 6144af5..8db8d77 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A32_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,14 +70,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,9 +94,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -204,4 +204,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A33_t01.dart
index 23afc5e..fb03967 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A33_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then it cannot
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -54,14 +52,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,9 +76,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -186,4 +186,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A41_t01.dart
index d1f3272..5054a81 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A41_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A42_t01.dart
index d06cc89..552bbd3 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A42_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -201,4 +196,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A43_t01.dart
index 62c28e0..e0a96d2 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A43_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -185,4 +180,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A51_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A51_t01.dart
index aee17c8..36320ec 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A51_t01.dart
@@ -24,46 +24,58 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -174,4 +186,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A52_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A52_t01.dart
index bf1075c..0c82a3e 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A52_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -201,4 +196,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A53_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A53_t01.dart
index eec6d22..81751de 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_fail_A53_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -185,4 +180,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A11_t01.dart
index 0f77b63..ff904fd 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A11_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A12_t01.dart
index c5c27f2..39d5064 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A12_t01.dart
@@ -24,48 +24,63 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -96,4 +111,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A21_t01.dart
index c1cc808..2a2b13d 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A21_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -88,4 +83,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A22_t01.dart
index f5f1340..f55517c 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A22_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,9 +89,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -124,4 +119,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A23_t01.dart
index 4fc3e74..38968ed 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A23_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -73,9 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -106,4 +101,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A31_t01.dart
index ca55d15..2e47b36 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A31_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,10 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A32_t01.dart
index 59e68ca..95c6dcd 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A32_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,14 +70,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,9 +94,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -124,4 +124,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A33_t01.dart
index 1067660..0404a38 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A33_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -54,14 +52,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,9 +76,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -106,4 +106,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A41_t01.dart
index 70ae0de..e492e0c 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A41_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A42_t01.dart
index 4762b7d..e434e90 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A42_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -121,4 +116,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A43_t01.dart
index 25638e0..14c3444 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A43_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -105,4 +100,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A51_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A51_t01.dart
index bb7ceb0..8ba079f 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A51_t01.dart
@@ -24,46 +24,58 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -94,4 +106,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A52_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A52_t01.dart
index 200ad90..3d6f578 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A52_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -121,4 +116,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A53_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A53_t01.dart
index e06bbb3..645a9db 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_mixin_fail_A53_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -105,4 +100,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A11_t01.dart
index df6a65d..8743db8 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A11_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A12_t01.dart
index 52ca20d..c595963 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A12_t01.dart
@@ -24,48 +24,63 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -115,4 +130,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A21_t01.dart
index 8f82f2e..f944b5a 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A21_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -107,4 +102,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A22_t01.dart
index fa40511..23362f4 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A22_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,9 +89,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -143,4 +138,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A23_t01.dart
index f2fff38..a421026 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A23_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -73,9 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -125,4 +120,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A31_t01.dart
index d0565a2..962414d 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A31_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,10 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A32_t01.dart
index d4a6c02..5817ec5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A32_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,14 +70,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,9 +94,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -143,4 +143,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A33_t01.dart
index 2d5516d..2d82e63 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A33_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -54,14 +52,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,9 +76,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -125,4 +125,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A41_t01.dart
index 73e1d39..70cc4e5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A41_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A42_t01.dart
index 568f40d..76f9f44 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A42_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -140,4 +135,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A43_t01.dart
index b824a8e..640a0e6 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A43_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -124,4 +119,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A51_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A51_t01.dart
index 9a4ab19..1091f52 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A51_t01.dart
@@ -24,46 +24,58 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -113,4 +125,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A52_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A52_t01.dart
index 518d12f..7051177 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A52_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -140,4 +135,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A53_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A53_t01.dart
index e59f70f..7142048 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_class_member_super_fail_A53_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -124,4 +119,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A11_t01.dart
index 2943b34..d80b2a7 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A11_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A12_t01.dart
index 5983006..ae514b5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A12_t01.dart
@@ -24,48 +24,63 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -101,4 +116,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A21_t01.dart
index e9c11b4..357e625 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A21_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -93,4 +88,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A22_t01.dart
index dcd9090..68a2e78 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A22_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,9 +89,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -129,4 +124,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A23_t01.dart
index cb6f3bd..6b20533 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A23_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -73,9 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -111,4 +106,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A31_t01.dart
index a2a9a75..9e05391 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A31_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,10 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A32_t01.dart
index 9590020..7fd0b8e 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A32_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,14 +70,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,9 +94,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -129,4 +129,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A33_t01.dart
index f22395c..9ef77b0 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A33_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -54,14 +52,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,9 +76,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -111,4 +111,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A41_t01.dart
index a3dbd09..d368c62 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A41_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A42_t01.dart
index bcb76aa..c29266c 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A42_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -126,4 +121,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A43_t01.dart
index 0a42a2e..c4944f7 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A43_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -110,4 +105,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A51_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A51_t01.dart
index cc75a1b..64cdc41 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A51_t01.dart
@@ -24,46 +24,58 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -99,4 +111,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A52_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A52_t01.dart
index d1e41ac..09ad8eb 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A52_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -126,4 +121,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A53_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A53_t01.dart
index 404a038..f6db47d 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_global_variable_fail_A53_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -110,4 +105,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A11_t01.dart
index 667cb8a..fdd7311 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A11_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A12_t01.dart
index 36785cb..e854e33 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A12_t01.dart
@@ -24,48 +24,63 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -102,4 +117,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A21_t01.dart
index df783e0..abb7c58 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A21_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,9 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -94,4 +89,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A22_t01.dart
index 9785560..3170827 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A22_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,9 +89,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -130,4 +125,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A23_t01.dart
index 1ceb7ba..981d85b 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A23_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -73,9 +71,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -112,4 +107,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A31_t01.dart
index 0450c0e..d536ce5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A31_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -55,10 +53,6 @@
 
 const t1Default = t1Func;
 
-
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A32_t01.dart
index c72df63..fd4528d 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A32_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,14 +70,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -91,9 +94,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -130,4 +130,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A33_t01.dart
index cea4a22..d9b2b4b 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A33_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 is not a subtype of a type T1, then
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -54,14 +52,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -73,9 +76,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -112,4 +112,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A41_t01.dart
index ac84140..0b42fbc 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A41_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A42_t01.dart
index 5c2a253..0d41cb8 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A42_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -127,4 +122,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A43_t01.dart
index 8db6276..358891b 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A43_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -111,4 +106,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A51_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A51_t01.dart
index 98c37ea..e371c68 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A51_t01.dart
@@ -24,46 +24,58 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -100,4 +112,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A52_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A52_t01.dart
index eff846c..e667095 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A52_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -127,4 +122,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A53_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A53_t01.dart
index e887e6f..b06a438 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_local_variable_fail_A53_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -111,4 +106,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A11_t01.dart
index 1336da0..23bf461 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A11_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A11.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A11.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A12_t01.dart
index 6d537e5..3dfb793 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A12_t01.dart
@@ -23,48 +23,63 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A12.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A12.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -92,4 +107,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A21_t01.dart
index 35184ff..4f4e4cd 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A21_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A21.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A21.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,9 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -84,4 +79,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A22_t01.dart
index eaf9360..bc4653e 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A22_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A22.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A22.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,9 +88,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -120,4 +115,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A23_t01.dart
index 92e7265..91580e1 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A23_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A23.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A23.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -72,9 +70,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -102,4 +97,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A31_t01.dart
index e966924..ca0ae55 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A31_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A31.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A31.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,10 +52,6 @@
 
 const t1Default = t1Func;
 
-
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A32_t01.dart
index 45036c2..b2d2539 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A32_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A32.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A32.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -71,14 +69,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -90,9 +93,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -120,4 +120,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A33_t01.dart
index 6890d18..db33b95 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A33_t01.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 ///
 /// @description Check that if type T0 not a subtype of a type T1, then instance
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A33.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A33.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -53,14 +51,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -72,9 +75,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -102,4 +102,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A41_t01.dart
index fe9d4e4..68d1379 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A41_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A41.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A41.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A42_t01.dart
index 70e863d..51b6d9b 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A42_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A42.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A42.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,9 +85,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -117,4 +112,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A43_t01.dart
index 5e43344..f64100e 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A43_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A43.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A43.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -71,9 +69,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -101,4 +96,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A51_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A51_t01.dart
index 4802a47..40c65b3 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A51_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A51_t01.dart
@@ -23,46 +23,58 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A51.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A51.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -90,4 +102,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A52_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A52_t01.dart
index eeaaad5..dd38f38 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A52_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A52_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A52.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A52.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,9 +85,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -117,4 +112,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A53_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A53_t01.dart
index 188e025..451c7c0 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A53_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_fail_return_value_fail_A53_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from named_function_types_fail_A53.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_fail_A53.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -71,9 +69,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -101,4 +96,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A01_t01.dart
index d24ab3d..da8f0f7 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A01_t01.dart
@@ -22,13 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A02_t01.dart
index 2007edd..0f00ea5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A02_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -116,4 +111,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A03_t01.dart
index f4acfd2..23eb06c 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A03_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,15 +67,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -116,4 +115,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A04_t01.dart
index f326f26..f65eb00 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A04_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,14 +67,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -116,4 +115,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A05_t01.dart
index 3697485..11e0594 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_global_variable_A05_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -70,9 +68,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -98,4 +93,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A01_t01.dart
index 2432592..b9f3180 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A01_t01.dart
@@ -22,13 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A02_t01.dart
index 276fafb..b550921 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A02_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -122,4 +117,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A03_t01.dart
index 066cfcf..d7046b5 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A03_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,15 +67,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -122,4 +121,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A04_t01.dart
index 4c3afe6..bdd8958 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A04_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,14 +67,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -122,4 +121,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A05_t01.dart
index f5c76c6..931b930 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_local_variable_A05_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -70,9 +68,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -104,4 +99,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A01_t01.dart
index 16ad719..b299f0c 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A01_t01.dart
@@ -22,13 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/named_function_types_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -76,5 +70,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A02_t01.dart
index e7313d9..880d070 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A02_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -88,9 +86,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -111,6 +106,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A03_t01.dart
index d4044ef..7561e51 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A03_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,15 +67,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -111,6 +110,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A04_t01.dart
index 6db9464..4c8f621 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A04_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,14 +67,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -88,9 +90,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -111,6 +110,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A05_t01.dart
index f003362..9505edf 100644
--- a/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/named_function_types_return_value_A05_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from named_function_types_A05.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/named_function_types_A05.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -70,9 +68,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -93,6 +88,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t01.dart
index 778d6bd..a61d228 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -118,7 +113,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
@@ -130,5 +124,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t02.dart
index 506f606..d1c1246 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -134,8 +129,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
@@ -146,5 +139,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t03.dart
index 224d9ed..c253be3 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A01_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,10 +49,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -78,7 +73,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -106,12 +101,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t01.dart
index 76ad291..d4296d4 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -119,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
@@ -131,5 +125,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t02.dart
index 5d908d9..51c7b67 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -135,8 +130,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
@@ -147,5 +140,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t03.dart
index 047e4f1..a7b2718 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A02_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,10 +50,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -79,7 +74,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -107,12 +102,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t01.dart
index 80f9462..9ace405 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -119,7 +114,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
@@ -131,5 +125,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t02.dart
index d9dc495..98e544b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -135,8 +130,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
@@ -147,5 +140,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t03.dart
index 1471cdc..677503e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A03_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,10 +50,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -79,7 +74,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -107,12 +102,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t01.dart
index 4f73317..6bb4638 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -120,7 +115,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
@@ -132,5 +126,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t02.dart
index 7cbb21c..f635250 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -136,8 +131,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
@@ -148,5 +141,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t03.dart
index dd493f1..06b7a7b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A04_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,10 +51,7 @@
 
 const t1Default = t1Func;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -80,7 +75,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -108,12 +103,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t01.dart
index 73b37f5..3d03f46 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -85,8 +83,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -151,5 +147,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t02.dart
index 366f2fd..4b4ac6f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -85,8 +83,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -167,6 +163,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t03.dart
index fb5c9c6..7a1348b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A11_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -85,9 +83,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -111,7 +107,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -139,6 +135,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t01.dart
index 2519aae..249d0a7 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -153,5 +149,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t02.dart
index e36d591..610c997 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -169,6 +165,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t03.dart
index 3bfb796..376d54b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A12_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,9 +85,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -113,7 +109,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -141,6 +137,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t01.dart
index d25d049..90e5b46 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -153,5 +149,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t02.dart
index a7e2d26..492f1e3 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -169,6 +165,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t03.dart
index 7d11d7a..91d8ab5 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A13_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,9 +85,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -113,7 +109,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -141,6 +137,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t01.dart
index 405876e..d644113 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -153,5 +149,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t02.dart
index 94e1aac..ee7ad92 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -169,6 +165,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t03.dart
index aad5e12..b4c2faf 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A14_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,9 +85,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -113,7 +109,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -141,6 +137,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t01.dart
index c24c169..af852de 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,8 +88,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -156,5 +152,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t02.dart
index f5fd1ad..f8c7bc1 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t02.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,8 +88,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -172,6 +168,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t03.dart
index 9ab66ed..36d0ebb 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A21_t03.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,9 +88,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -116,7 +112,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -144,6 +140,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t01.dart
index 8930e34..13114db 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -93,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -159,5 +155,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t02.dart
index e34501f..cb47e35 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t02.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -93,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -175,6 +171,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t03.dart
index cea9078..d0fe7f4 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A22_t03.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -93,9 +91,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -119,7 +115,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -147,6 +143,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t01.dart
index bf41c81..8d30e66 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -92,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -158,5 +154,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t02.dart
index a4a5fbc..f6e611e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t02.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -92,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -174,6 +170,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t03.dart
index adcd7c9..8931ee7 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A23_t03.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -92,9 +90,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -118,7 +114,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -146,6 +142,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t01.dart
index 8c4724c..6efd123 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,8 +89,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -157,5 +153,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t02.dart
index 38448b9..bf8dca6 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t02.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,8 +89,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -173,6 +169,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t03.dart
index 21fe9d2..76de572 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A24_t03.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,9 +89,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -117,7 +113,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -145,6 +141,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t01.dart
index 746f4ef..b882279 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -153,5 +149,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t02.dart
index c89bea2..a8579db 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -169,6 +165,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t03.dart
index e2ff58b..5d3619f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A31_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,9 +85,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -113,7 +109,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -141,6 +137,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t01.dart
index 1a184e4..78386b6 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -153,5 +153,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t02.dart
index 1d08b83..315af67 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -169,6 +169,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t03.dart
index d92ab21..9dfaeb7 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A32_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,27 +67,29 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -113,7 +113,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -141,6 +141,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t01.dart
index 192b7a8..42efd58 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -153,5 +153,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t02.dart
index f3a635f..9af9180 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -169,6 +169,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t03.dart
index 8b83014..de1b01b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A33_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,27 +67,29 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -113,7 +113,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -141,6 +141,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t01.dart
index c9520a9..29b82aa 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -153,5 +149,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t02.dart
index d3e8425..58030f7 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -169,6 +165,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t03.dart
index b72f7cb..61f9253 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A34_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,9 +85,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -113,7 +109,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -141,6 +137,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t01.dart
index 6195a90..72c3f0e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -135,5 +131,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t02.dart
index 1d832fc..0cda130 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -151,6 +147,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t03.dart
index 94e6720..b48295e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A41_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,9 +67,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -95,7 +91,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -123,6 +119,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t01.dart
index b847785..172049c 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -135,5 +131,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t02.dart
index 76de486..f159622 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -151,6 +147,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t03.dart
index cdef16f..2244c9b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A42_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,9 +67,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -95,7 +91,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -123,6 +119,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t01.dart
index b3872f8..c22fae1 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -135,5 +131,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t02.dart
index 71fa4ff..97d4989 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -151,6 +147,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t03.dart
index 83fbaf3..22ebc6e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A43_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,9 +67,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -95,7 +91,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -123,6 +119,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t01.dart
index 5b2a943..2af5ee5 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -135,5 +131,15 @@
 
   // Test type parameters
 
-}
+  // test generic functions
+  namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
+  // test generic class constructors
+  ArgumentsBindingGen<T1> instance2 = new ArgumentsBindingGen<T1>(t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.fNamed(t0Instance, t2: t0Instance);
+  instance2 = new ArgumentsBindingGen<T1>.named(t0Instance, t2: t0Instance);
+
+  // test generic class methods and setters
+  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+  instance2.testSetter = t0Instance;
+}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t02.dart
index 053ed56..57d1677 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -151,6 +147,14 @@
   c1.superGetter;
 
   // Test type parameters
+  ArgumentsBinding2_t02<T1> c2 =
+    new ArgumentsBinding2_t02<T1>(t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
+  c2 = new ArgumentsBinding2_t02<T1>.c5(t0Instance);
 
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
+  c2.superGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t03.dart
index b7b0af2..7915f52 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_arguments_binding_A44_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,9 +67,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -95,7 +91,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -123,6 +119,9 @@
   c1.superGetter;
 
   // Test type parameters
-
+  ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
+  c2.test(t0Instance, t1Instance);
+  c2.superTest(t0Instance);
+  c2.superTestNamed(t1Instance, val2: t0Instance);
+  c2.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t01.dart
index 4c0dce2..cb07362 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t02.dart
index 4f9fe03..5d4c3ee 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t03.dart
index 46de1c3..bc0ba07 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A01_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t01.dart
index 7117f89..e2123ee 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t02.dart
index 63c78c8..698b8ec 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t03.dart
index f72d6af..08329fb 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A02_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t01.dart
index 7630be3..4950d76 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t02.dart
index 26cd017..c244cc2 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t03.dart
index f13af76..ae8ea00 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A03_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t01.dart
index 0d66df8..419b8cf 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t02.dart
index a476c53..f49b44b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t03.dart
index f572c81..74ff6d4 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A04_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t01.dart
index 9802ecc..395fa9a 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -85,8 +83,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -144,4 +140,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t02.dart
index 6173997..cd0ddc8 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -85,8 +83,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -125,4 +121,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t03.dart
index db39fbd..9e641d1 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A11_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -85,8 +83,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -106,4 +102,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t01.dart
index 6062efc..6e7cb68 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -146,4 +142,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t02.dart
index 4897bf7..7f5fe0b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -127,4 +123,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t03.dart
index 7ebccca..16000cd 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A12_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -108,4 +104,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t01.dart
index 420622a..65d41c6 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -146,4 +142,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t02.dart
index 3ce1d31..8b8e9c0 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -127,4 +123,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t03.dart
index 1ff4e44..c6274d1 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A13_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -108,4 +104,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t01.dart
index 103b4a1..c7e8b51 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -146,4 +142,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t02.dart
index 699491a..091b5db 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -127,4 +123,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t03.dart
index a88f03e..33fd36e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A14_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -108,4 +104,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t01.dart
index 0d834dc..3b6a285 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,8 +88,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -149,4 +145,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t02.dart
index b430df9..08d4cab 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t02.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,8 +88,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -130,4 +126,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t03.dart
index c229b4a..01697ea 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A21_t03.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,8 +88,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -111,4 +107,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t01.dart
index 015ab46..640b244 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -93,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -152,4 +148,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t02.dart
index c338780..acb7e2b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t02.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -93,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -133,4 +129,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t03.dart
index 480b9b9..a0b1eec 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A22_t03.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -93,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -114,4 +110,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t01.dart
index 4d8d6f3..c1ff5fe 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -92,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -151,4 +147,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t02.dart
index ae716f7..0330918 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t02.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -92,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -132,4 +128,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t03.dart
index b900ad1..5df46a1 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A23_t03.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -92,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -113,4 +109,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t01.dart
index 7c7bd9e..1a9e860 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,8 +89,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -150,4 +146,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t02.dart
index cb17aad..a747027 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t02.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,8 +89,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -131,4 +127,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t03.dart
index 3883a18..d5177a1 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A24_t03.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,8 +89,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -112,4 +108,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t01.dart
index ed56c9f..5aec517 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -146,4 +142,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t02.dart
index afc8641..c03909d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -127,4 +123,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t03.dart
index f0a39ff..0c478f1c 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A31_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -108,4 +104,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t01.dart
index f5a9aa8..ae13f7b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -146,4 +146,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t02.dart
index a20b638..5300778 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -127,4 +127,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t03.dart
index 4ad3fef..23a2115 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A32_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -108,4 +108,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t01.dart
index 1bcb7c6..507d334 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -146,4 +146,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t02.dart
index d1897e2..757917b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -127,4 +127,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t03.dart
index ccdb3a8..5e535b3 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A33_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -108,4 +108,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t01.dart
index 940cd92..ac09182 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -146,4 +142,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t02.dart
index d10b887..13f3e61 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -127,4 +123,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t03.dart
index ef163e7..a3ae5e5 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A34_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -108,4 +104,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t01.dart
index da8aead..f1eb789 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -128,4 +124,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t02.dart
index d57aa70..fb77924 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -109,4 +105,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t03.dart
index 3aa6f5c..ef7a3d9 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A41_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -90,4 +86,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t01.dart
index 9927740..afce669 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -128,4 +124,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t02.dart
index 9e6abd4..199a4b3 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -109,4 +105,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t03.dart
index 7a707fc..4314838 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A42_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -90,4 +86,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t01.dart
index 55d61e4..96381a4 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -128,4 +124,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t02.dart
index 57b7d87..342c568 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -109,4 +105,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t03.dart
index c80b60a..8f5fb48 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A43_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -90,4 +86,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t01.dart
index a1409d6..c218717 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
@@ -128,4 +124,3 @@
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t02.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t02.dart
index c05a2f3..5303074 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t02.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -109,4 +105,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t03.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t03.dart
index 1969d95..8f1ef0e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_class_member_A44_t03.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
@@ -90,4 +86,3 @@
   c1.test();
   c1.superSetter = t0Instance;
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A01_t01.dart
index 732ad8b..176aa30 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A01_t01.dart
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -50,8 +48,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A02_t01.dart
index e3b3abd..031788e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A02_t01.dart
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A03_t01.dart
index 89a9995..17d060d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A03_t01.dart
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -50,8 +48,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A04_t01.dart
index 30d4731..0975c4f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A04_t01.dart
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -50,8 +48,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A05_t01.dart
index 9ce8ffe..ed2fbca 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A05_t01.dart
@@ -25,12 +25,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -80,8 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -208,4 +204,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A06_t01.dart
index 78891e9..f47db44 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A06_t01.dart
@@ -25,12 +25,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -80,8 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -208,4 +204,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A07_t01.dart
index 8803394..0039cfc 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A07_t01.dart
@@ -25,12 +25,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -80,8 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -208,4 +204,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A08_t01.dart
index 7d59f2a..0dd1b24 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A08_t01.dart
@@ -25,12 +25,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -78,8 +76,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -206,4 +202,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A11_t01.dart
index f70420f..422d02d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A11_t01.dart
@@ -25,12 +25,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,8 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A12_t01.dart
index 743f43e..34826fd 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A12_t01.dart
@@ -26,12 +26,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -209,4 +205,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A21_t01.dart
index 9186ddd..0b73f2d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A21_t01.dart
@@ -25,12 +25,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -53,8 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A22_t01.dart
index 29afcc4..61bce56 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A22_t01.dart
@@ -25,12 +25,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -80,8 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -208,4 +204,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A31_t01.dart
index d1ecf4d..2add7ec 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A31_t01.dart
@@ -25,12 +25,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 
@@ -65,14 +63,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -199,4 +196,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A32_t01.dart
index 39731e1..063ead8 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_fail_A32_t01.dart
@@ -26,12 +26,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -209,4 +205,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A01_t01.dart
index 6e7f847..c6b1ead 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A02_t01.dart
index e71eff9..158cbd9 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A02_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A03_t01.dart
index 0907878..6f434ce 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A03_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A04_t01.dart
index b59968c..391285a 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A04_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A05_t01.dart
index 440c37c..8f06af9 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A05_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,9 +79,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -216,4 +212,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A06_t01.dart
index ab9853a..d29eea6 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A06_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,9 +79,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -216,4 +212,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A07_t01.dart
index 75842ca..bb98370 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A07_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,9 +79,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -216,4 +212,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A08_t01.dart
index 396e5b0..c394d06 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A08_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -79,9 +77,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -214,4 +210,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A11_t01.dart
index 4d829cb..40e8cec 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A11_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,9 +52,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A12_t01.dart
index f2b75e6..d3a6f4b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A12_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,9 +80,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -217,4 +213,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A21_t01.dart
index a135e01..fa242cd 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A21_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,9 +52,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A22_t01.dart
index f6d24f1..d1a52cf 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A22_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,9 +79,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -216,4 +212,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A31_t01.dart
index bc94e76..3a7d1e6 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A31_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 
@@ -66,15 +64,14 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -207,4 +204,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A32_t01.dart
index d36137c..c7fc085 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_mixin_fail_A32_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,9 +80,7 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
@@ -217,4 +213,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A01_t01.dart
index 92318f6..3462b79 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A02_t01.dart
index 461fc36..50f8b26 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A02_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,8 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A03_t01.dart
index 7357ec7..af72918 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A03_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A04_t01.dart
index 47a9829..673edbe 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A04_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A05_t01.dart
index fdecb86..24d83b0 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A05_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -249,4 +245,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A06_t01.dart
index d542b8b..8da5029 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A06_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -249,4 +245,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A07_t01.dart
index c5845f6..f943542 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A07_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -249,4 +245,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A08_t01.dart
index dda356a..6f2ef6b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A08_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -79,8 +77,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -247,4 +243,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A11_t01.dart
index 070d0aa..d462a08 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A11_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A12_t01.dart
index a4cf66a..c9bd1d4 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A12_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -250,4 +246,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A21_t01.dart
index bfa3daa..8a5ea53 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A21_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A22_t01.dart
index 8f48326..2dd8b4b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A22_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -249,4 +245,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A31_t01.dart
index b7a54e8..cbc0093 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A31_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 
@@ -66,14 +64,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -240,4 +237,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A32_t01.dart
index c31a3d1..8880f34 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_arguments_binding_super_fail_A32_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -250,4 +246,3 @@
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A01_t01.dart
index 4f8b9a4..206e733 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A02_t01.dart
index de5773f..2bf9ce1 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A02_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,8 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A03_t01.dart
index c6989c2..f96df26 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A03_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A04_t01.dart
index 1f1c522..b8f7e16 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A04_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A05_t01.dart
index 5bf19d5..fef446a 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A05_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -193,4 +189,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A06_t01.dart
index d627f3d..b008b10 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A06_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -193,4 +189,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A07_t01.dart
index 1ee0235..3bbaad2 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A07_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -193,4 +189,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A08_t01.dart
index 732d733..294af09 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A08_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -79,8 +77,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -191,4 +187,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A11_t01.dart
index 923cd0d..e34db54 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A11_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A12_t01.dart
index cbfc89f..a071071 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A12_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -194,4 +190,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A21_t01.dart
index da5b941..adeeb57 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A21_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A22_t01.dart
index a82ce9a..7d609dd 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A22_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -193,4 +189,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A31_t01.dart
index 2ad8085..9bc072c 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A31_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 
@@ -66,14 +64,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -184,4 +181,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A32_t01.dart
index d3a37cf..fba1f1f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_fail_A32_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
@@ -194,4 +190,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A01_t01.dart
index 433b695..e29e327 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A02_t01.dart
index 0a30de4..2f33015 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A02_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,8 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A03_t01.dart
index 50d2b05..7b4a87d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A03_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A04_t01.dart
index 82960e5..47944a5 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A04_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A05_t01.dart
index 7a2274a..b2b0429 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A05_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -113,4 +109,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A06_t01.dart
index a545704..27e62cc 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A06_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -113,4 +109,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A07_t01.dart
index d5c5ca9..ff8a5af 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A07_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -113,4 +109,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A08_t01.dart
index c909b90..6cc7867 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A08_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -79,8 +77,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -111,4 +107,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A11_t01.dart
index c17aa4f..45cf041 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A11_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A12_t01.dart
index f656ee5..71d2e61 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A12_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -114,4 +110,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A21_t01.dart
index 63e1314..7551560 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A21_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A22_t01.dart
index ecb62b2..78d329c 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A22_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -113,4 +109,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A31_t01.dart
index 265821f..1d0acad 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A31_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 
@@ -66,14 +64,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -104,4 +101,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A32_t01.dart
index 93d0124..432870a 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_mixin_fail_A32_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
@@ -114,4 +110,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A01_t01.dart
index 811a411..e39e533 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A02_t01.dart
index baa0584..f9d5347 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A02_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,8 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A03_t01.dart
index fb76704..87d476a 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A03_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A04_t01.dart
index 2c0a4e1..3dd8678 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A04_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A05_t01.dart
index f7ea966..1f5d835 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A05_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -132,4 +128,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A06_t01.dart
index 23e4d14..cf821df 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A06_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -132,4 +128,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A07_t01.dart
index b945150..218e59f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A07_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -132,4 +128,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A08_t01.dart
index fd252da..f66a100 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A08_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -79,8 +77,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -130,4 +126,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A11_t01.dart
index c597080..968f558 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A11_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A12_t01.dart
index e24eb07..aa137cd 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A12_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -133,4 +129,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A21_t01.dart
index 2741d58..9c01550 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A21_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A22_t01.dart
index 836c6b4..83f28d3 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A22_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -132,4 +128,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A31_t01.dart
index 4f79c18..15c560f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A31_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 
@@ -66,14 +64,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -123,4 +120,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A32_t01.dart
index c849fea..7ddc48b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_class_member_super_fail_A32_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
@@ -133,4 +129,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A01_t01.dart
index e6894e1..a18318c 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A02_t01.dart
index 892543c..79d7b33 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A02_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,8 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A03_t01.dart
index dfa9bcd..8bf9b37 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A03_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A04_t01.dart
index 0d62d13..21af337 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A04_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A05_t01.dart
index 1ccfa22..b62702e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A05_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -118,4 +114,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A06_t01.dart
index 4761083..4888862 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A06_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -118,4 +114,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A07_t01.dart
index 7378612..fe1c93f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A07_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -118,4 +114,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A08_t01.dart
index 61df4ac..b17c1ca 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A08_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -79,8 +77,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -116,4 +112,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A11_t01.dart
index 53defa2..c4db41d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A11_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A12_t01.dart
index 523f078..d632315 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A12_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -119,4 +115,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A21_t01.dart
index 77a1607..7649d99 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A21_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A22_t01.dart
index 818f76c..003f1f9 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A22_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -118,4 +114,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A31_t01.dart
index 5773972..6272141 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A31_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 
@@ -66,14 +64,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -109,4 +106,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A32_t01.dart
index d34697a..3885c72 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_global_variable_fail_A32_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -119,4 +115,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A01_t01.dart
index 1adb988..6ab0e6b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A02_t01.dart
index 757c770..0b4df13 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A02_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,8 +50,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A03_t01.dart
index f13d306..c9ef1ce 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A03_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A04_t01.dart
index 5076937..1cc3e4d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A04_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A05_t01.dart
index 555cca4..cbf5653 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A05_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -119,4 +115,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A06_t01.dart
index e10958a..995cd65 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A06_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -119,4 +115,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A07_t01.dart
index 590f80c..bf6e926 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A07_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -119,4 +115,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A08_t01.dart
index 5f2736b..6b5e75a 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A08_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -79,8 +77,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -117,4 +113,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A11_t01.dart
index 050de58..0f02250 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A11_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A12_t01.dart
index 64c240f5..f09eed9 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A12_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -120,4 +116,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A21_t01.dart
index cbc14da..1dabe9d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A21_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -54,8 +52,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A22_t01.dart
index 38be6d3..32de7fb 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A22_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -119,4 +115,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A31_t01.dart
index 7c2142d..2c2e988 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A31_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 
@@ -66,14 +64,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -110,4 +107,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A32_t01.dart
index 2f8ae63..310e52f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_local_variable_fail_A32_t01.dart
@@ -27,12 +27,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -82,8 +80,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
@@ -120,4 +116,3 @@
 // [cfe] unspecified
   }
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A01_t01.dart
index 5975256..0a267bb 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A01_t01.dart
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -50,8 +48,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A02_t01.dart
index 91fe020..5c20e12 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A02_t01.dart
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,8 +49,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A03_t01.dart
index 4d7547e..6e8ee90 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A03_t01.dart
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A03.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A03.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -50,8 +48,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A04_t01.dart
index c895b10..d0cd019 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A04_t01.dart
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A04.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A04.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -50,8 +48,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A05_t01.dart
index 6972dd3..de05cdf 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A05_t01.dart
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A05.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A05.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -80,8 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -109,4 +105,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A06_t01.dart
index 6a338f9..0ec34cd 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A06_t01.dart
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A06.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A06.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -80,8 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -109,4 +105,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A07_t01.dart
index bdb27c4..fca2694 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A07_t01.dart
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A07.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A07.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -80,8 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -109,4 +105,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A08_t01.dart
index 795aedc..7b1d36f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A08_t01.dart
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A08.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A08.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -78,8 +76,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -107,4 +103,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A11_t01.dart
index d0b86ed..70ddbe0 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A11_t01.dart
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A11.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A11.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,8 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A12_t01.dart
index 3ab454c..f53efe5 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A12_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A12.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A12.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -110,4 +106,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A21_t01.dart
index 6016e80..e491929 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A21_t01.dart
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A21.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A21.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 {} // U0 is not subtype of U1
 class U1 {}
@@ -53,8 +51,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A22_t01.dart
index e453c27..ba72673 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A22_t01.dart
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A22.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A22.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -80,8 +78,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -109,4 +105,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A31_t01.dart
index 1336c38..cebd191 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A31_t01.dart
@@ -25,12 +25,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A31.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A31.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 
@@ -65,14 +63,13 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -100,4 +97,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A32_t01.dart
index 2b1bf98..4a35380 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_fail_return_value_fail_A32_t01.dart
@@ -26,12 +26,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from positional_function_types_fail_A32.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_fail_A32.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -81,8 +79,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -110,4 +106,3 @@
 // [analyzer] unspecified
 // [cfe] unspecified
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A01_t01.dart
index 9992445..a9bdeb2 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A01_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A02_t01.dart
index ebe6346..a7ae3d7 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A02_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A03_t01.dart
index 12bcd4f..08f38ea 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A03_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A04_t01.dart
index 4f015e4..920480c 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A04_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A11_t01.dart
index 9d6417e..218d40a 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A11_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -85,8 +83,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -112,4 +108,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A12_t01.dart
index 109f839..1e0412d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A12_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -114,4 +110,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A13_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A13_t01.dart
index 8d19ed7..9ec7459 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A13_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -114,4 +110,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A14_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A14_t01.dart
index d439700..a611041 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A14_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -114,4 +110,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A21_t01.dart
index 21b8288..c26469e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A21_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,8 +88,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -117,4 +113,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A22_t01.dart
index d3044bd..c068d04 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A22_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -93,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -120,4 +116,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A23_t01.dart
index 4bb14f8..3216896 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A23_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -92,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -119,4 +115,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A24_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A24_t01.dart
index ae243e0..7ed7255 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A24_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A24_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,8 +89,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -118,4 +114,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A31_t01.dart
index 1ad3af5..bdb29b3 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A31_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -114,4 +110,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A32_t01.dart
index 6da87f2..fda77fa 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A32_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -114,4 +114,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A33_t01.dart
index b8452d1..8d0ce18 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A33_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -114,4 +114,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A34_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A34_t01.dart
index 2137886..86ef8fa 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A34_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A34_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -114,4 +110,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A41_t01.dart
index 5ae1045..eb7f4be 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A41_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -96,4 +92,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A42_t01.dart
index 328e37a..76bea1d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A42_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -96,4 +92,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A43_t01.dart
index a0a1c99..b2db468 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A43_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -96,4 +92,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A44_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A44_t01.dart
index 055ab42..ad55ce9 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A44_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_global_variable_A44_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -96,4 +92,3 @@
   t.foo();
   GlobalVariableTest.test();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A01_t01.dart
index e1106d0..bb6ef5c 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A01_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A02_t01.dart
index 5bd443a..3b8516e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A02_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A03_t01.dart
index fa09f3f..ded6c8f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A03_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A04_t01.dart
index e08b850..77fb02f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A04_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A11_t01.dart
index 1df8015..585c3e0 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A11_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -85,8 +83,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -118,4 +114,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A12_t01.dart
index d23b793..e71106f 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A12_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -120,4 +116,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A13_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A13_t01.dart
index 5abe68d..dd41251 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A13_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -120,4 +116,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A14_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A14_t01.dart
index 382db5d..638d080 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A14_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -120,4 +116,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A21_t01.dart
index d3d72e4..4d1fc72 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A21_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,8 +88,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -123,4 +119,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A22_t01.dart
index 1402ff5..9343618 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A22_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -93,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -126,4 +122,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A23_t01.dart
index a626be9..52aadac 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A23_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -92,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -125,4 +121,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A24_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A24_t01.dart
index 98f8d5a..1b5b973 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A24_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A24_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,8 +89,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -124,4 +120,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A31_t01.dart
index ae18fac..e5be823 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A31_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -120,4 +116,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A32_t01.dart
index 3fa5fd1..47b94ec 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A32_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -120,4 +120,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A33_t01.dart
index 8bb211b..a98cdb2 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A33_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -120,4 +120,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A34_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A34_t01.dart
index 83e83cd..8f506f6 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A34_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A34_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -120,4 +116,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A41_t01.dart
index 332650c..90366bc 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A41_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -102,4 +98,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A42_t01.dart
index 338c611..6cf5b8b 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A42_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -102,4 +98,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A43_t01.dart
index 70730fa..fca79e4 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A43_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -102,4 +98,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A44_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A44_t01.dart
index 8972f8a..ce3b28d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A44_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_local_variable_A44_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -102,4 +98,3 @@
   x.test();
   LocalVariableTest.staticTest();
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A01_t01.dart
index ae44e63..68b2cda 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A01_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -51,9 +49,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -74,5 +69,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A02_t01.dart
index 005e6e8..37523e4 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A02_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -75,5 +70,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A03_t01.dart
index 13ca931..4424729 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A03_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -52,9 +50,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -75,5 +70,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A04_t01.dart
index 7e4a402..722a209 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A04_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class U0 extends U1 {}
 class U1 {}
@@ -53,9 +51,6 @@
 
 const t1Default = t1Func;
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -76,5 +71,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A11_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A11_t01.dart
index a6a889c..11e9464 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A11_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A11_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A11.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A11.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -85,8 +83,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -107,6 +103,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A12_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A12_t01.dart
index f8fdd3d..c86f774 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A12_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A12_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A12.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A12.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -109,6 +105,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A13_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A13_t01.dart
index db627d8..37b803e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A13_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A13_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A13.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A13.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -109,6 +105,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A14_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A14_t01.dart
index 5a6d1fd..961428e 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A14_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A14_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A14.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A14.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -109,6 +105,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A21_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A21_t01.dart
index dff454e..d87aa72 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A21_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A21_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A21.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A21.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -90,8 +88,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -112,6 +108,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A22_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A22_t01.dart
index 454be92..d14b5a0 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A22_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A22_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A22.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A22.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -93,8 +91,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -115,6 +111,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A23_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A23_t01.dart
index 1cfc254..c0208ae 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A23_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A23_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A23.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A23.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -92,8 +90,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -114,6 +110,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A24_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A24_t01.dart
index a23d639..50a17f1 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A24_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A24_t01.dart
@@ -23,12 +23,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A24.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A24.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -91,8 +89,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -113,6 +109,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A31_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A31_t01.dart
index 33480c1..a62fc27 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A31_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A31_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A31.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A31.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -109,6 +105,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A32_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A32_t01.dart
index 54bcc62..b53f4c6 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A32_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A32_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A32.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A32.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -109,6 +109,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A33_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A33_t01.dart
index cc5225b..c1108d9 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A33_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A33_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A33.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A33.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,26 +67,28 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -109,6 +109,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A34_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A34_t01.dart
index 81a393a..56faade 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A34_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A34_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A34.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A34.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -87,8 +85,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -109,6 +105,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A41_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A41_t01.dart
index b9ce96c..7e46dee 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A41_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A41_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A41.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A41.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -91,6 +87,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A42_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A42_t01.dart
index 6988b48..6ca2f95 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A42_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A42_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A42.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A42.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -91,6 +87,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A43_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A43_t01.dart
index 0004811..4871a3d 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A43_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A43_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A43.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A43.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -91,6 +87,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A44_t01.dart b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A44_t01.dart
index d43a445..d38ec35 100644
--- a/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A44_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/positional_function_types_return_value_A44_t01.dart
@@ -22,12 +22,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from positional_function_types_A44.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/positional_function_types_A44.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class A {}
 
@@ -69,8 +67,6 @@
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
 
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -91,6 +87,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
-
diff --git a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t01.dart
index 2ce7dc6..c58b85b 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 namedArgumentsFunc1((num, num, String?) t1, {(num, num, String?) t2 = t1Default}) {}
 positionalArgumentsFunc1((num, num, String?) t1, [(num, num, String?) t2 = t1Default]) {}
 
@@ -98,7 +93,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<(num, num, String?)>(t0Instance, t2: t0Instance);
 
@@ -110,5 +104,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t02.dart
index 2d33da9..98597e9 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (num, num, String?) m = t1Default;
 
@@ -114,8 +109,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<(num, num, String?)> c2 =
     new ArgumentsBinding2_t02<(num, num, String?)>(t0Instance);
   c2 = new ArgumentsBinding2_t02<(num, num, String?)>.c2(t1Instance, t0Instance);
@@ -126,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t03.dart
index b0fecf3..71bb8dc 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,10 +29,7 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   (num, num, String?) m = t1Default;
 
   void superTest((num, num, String?) val) {}
@@ -58,7 +53,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +81,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<(num, num, String?)> c2 = new ArgumentsBinding2_t03<(num, num, String?)>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t01.dart
index 774d797..bbc8f94 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -33,9 +31,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 namedArgumentsFunc1((num, num, String?, {num n1, String? n2}) t1, {(num, num, String?, {num n1, String? n2}) t2 = t1Default}) {}
 positionalArgumentsFunc1((num, num, String?, {num n1, String? n2}) t1, [(num, num, String?, {num n1, String? n2}) t2 = t1Default]) {}
 
@@ -100,7 +95,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<(num, num, String?, {num n1, String? n2})>(t0Instance, t2: t0Instance);
 
@@ -112,5 +106,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t02.dart
index fa86097..26e46c4 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -33,9 +31,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (num, num, String?, {num n1, String? n2}) m = t1Default;
 
@@ -116,8 +111,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<(num, num, String?, {num n1, String? n2})> c2 =
     new ArgumentsBinding2_t02<(num, num, String?, {num n1, String? n2})>(t0Instance);
   c2 = new ArgumentsBinding2_t02<(num, num, String?, {num n1, String? n2})>.c2(t1Instance, t0Instance);
@@ -128,5 +121,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t03.dart
index 70ee43f..7aea7ad 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -33,10 +31,7 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   (num, num, String?, {num n1, String? n2}) m = t1Default;
 
   void superTest((num, num, String?, {num n1, String? n2}) val) {}
@@ -60,7 +55,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -88,12 +83,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<(num, num, String?, {num n1, String? n2})> c2 = new ArgumentsBinding2_t03<(num, num, String?, {num n1, String? n2})>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t01.dart
index 196943d..8135809 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 namedArgumentsFunc1(({String? z, num y, num x}) t1, {({String? z, num y, num x}) t2 = t1Default}) {}
 positionalArgumentsFunc1(({String? z, num y, num x}) t1, [({String? z, num y, num x}) t2 = t1Default]) {}
 
@@ -98,7 +93,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<({String? z, num y, num x})>(t0Instance, t2: t0Instance);
 
@@ -110,5 +104,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t02.dart
index 651eba9..dfc0855 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   ({String? z, num y, num x}) m = t1Default;
 
@@ -114,8 +109,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<({String? z, num y, num x})> c2 =
     new ArgumentsBinding2_t02<({String? z, num y, num x})>(t0Instance);
   c2 = new ArgumentsBinding2_t02<({String? z, num y, num x})>.c2(t1Instance, t0Instance);
@@ -126,5 +119,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t03.dart
index bada3a2..d48e737 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_arguments_binding_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,10 +29,7 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   ({String? z, num y, num x}) m = t1Default;
 
   void superTest(({String? z, num y, num x}) val) {}
@@ -58,7 +53,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -86,12 +81,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<({String? z, num y, num x})> c2 = new ArgumentsBinding2_t03<({String? z, num y, num x})>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t01.dart
index df32c45..f9ff40c 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class ClassMember1_t01 {
   static (num, num, String?) s = t0Instance;
   (num, num, String?) m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t02.dart
index 27a1469..1a6a258 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class ClassMemberSuper1_t02 {
   (num, num, String?) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t03.dart
index 2c12b53..e565558 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class ClassMemberMixin1_t03 {
   (num, num, String?) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t01.dart
index d805c3d..3be5007 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -33,9 +31,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class ClassMember1_t01 {
   static (num, num, String?, {num n1, String? n2}) s = t0Instance;
   (num, num, String?, {num n1, String? n2}) m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t02.dart
index ff920b2..528a1b8 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -33,9 +31,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class ClassMemberSuper1_t02 {
   (num, num, String?, {num n1, String? n2}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t03.dart
index 4623e0b..66a70b9 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_class_member_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -33,9 +31,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class ClassMemberMixin1_t03 {
   (num, num, String?, {num n1, String? n2}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t01.dart
index 7339f5f..f0964ea 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class ClassMember1_t01 {
   static ({String? z, num y, num x}) s = t0Instance;
   ({String? z, num y, num x}) m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t02.dart
index b877e79..5aa26c9 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class ClassMemberSuper1_t02 {
   ({String? z, num y, num x}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t03.dart
index bf44a00..51d1ef4 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_class_member_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class ClassMemberMixin1_t03 {
   ({String? z, num y, num x}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A01_t01.dart
index 3a4da14..b8ecfad 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 namedArgumentsFunc1((int, String) t1, {(int, String) t2 = t1Default}) {}
 positionalArgumentsFunc1((int, String) t1, [(int, String) t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A02_t01.dart
index e94bb23..0930abe 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
-
 namedArgumentsFunc1((int, String, bool) t1, {(int, String, bool) t2 = t1Default}) {}
 positionalArgumentsFunc1((int, String, bool) t1, [(int, String, bool) t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A03_t01.dart
index d8e1475..53f2dc5 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 namedArgumentsFunc1((int i, String s) t1, {(int i, String s) t2 = t1Default}) {}
 positionalArgumentsFunc1((int i, String s) t1, [(int i, String s) t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A04_t01.dart
index a839afa..5ece202 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 namedArgumentsFunc1((int i, String s, {bool b}) t1, {(int i, String s, {bool b}) t2 = t1Default}) {}
 positionalArgumentsFunc1((int i, String s, {bool b}) t1, [(int i, String s, {bool b}) t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A05_t01.dart
index 128ac34..a6618aa 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
-
 namedArgumentsFunc1((int i, String s, {bool b1}) t1, {(int i, String s, {bool b1}) t2 = t1Default}) {}
 positionalArgumentsFunc1((int i, String s, {bool b1}) t1, [(int i, String s, {bool b1}) t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A06_t01.dart
index 3fab6cf..1d96b96 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 namedArgumentsFunc1((int i, String, {bool b}) t1, {(int i, String, {bool b}) t2 = t1Default}) {}
 positionalArgumentsFunc1((int i, String, {bool b}) t1, [(int i, String, {bool b}) t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A07_t01.dart
index 6d6c241..03a5f66 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,18 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
-
 namedArgumentsFunc1((int i, String, {List<num> b}) t1, {(int i, String, {List<num> b}) t2 = t1Default}) {}
 positionalArgumentsFunc1((int i, String, {List<num> b}) t1, [(int i, String, {List<num> b}) t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A01_t01.dart
index 013c859..32e4f47 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,10 +30,7 @@
 
 const t1Default = const (5, "6");
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest((int, String) val) {}
   void superTestPositioned((int, String) val, [(int, String) val2 = t1Default]) {}
   void superTestNamed((int, String) val, {(int, String) val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A02_t01.dart
index 3c17a2e..1ea4c1d 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,10 +30,7 @@
 
 const t1Default = const (5, "6", false);
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest((int, String, bool) val) {}
   void superTestPositioned((int, String, bool) val, [(int, String, bool) val2 = t1Default]) {}
   void superTestNamed((int, String, bool) val, {(int, String, bool) val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A03_t01.dart
index b4af13d..79d0f4e 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,10 +30,7 @@
 
 const t1Default = const (5, "6");
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest((int i, String s) val) {}
   void superTestPositioned((int i, String s) val, [(int i, String s) val2 = t1Default]) {}
   void superTestNamed((int i, String s) val, {(int i, String s) val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A04_t01.dart
index c888642..6ce4b1c 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,10 +30,7 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest((int i, String s, {bool b}) val) {}
   void superTestPositioned((int i, String s, {bool b}) val, [(int i, String s, {bool b}) val2 = t1Default]) {}
   void superTestNamed((int i, String s, {bool b}) val, {(int i, String s, {bool b}) val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A05_t01.dart
index 5a2648b..b37fa13 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,10 +30,7 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest((int i, String s, {bool b1}) val) {}
   void superTestPositioned((int i, String s, {bool b1}) val, [(int i, String s, {bool b1}) val2 = t1Default]) {}
   void superTestNamed((int i, String s, {bool b1}) val, {(int i, String s, {bool b1}) val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A06_t01.dart
index 510e360..6bb08f0 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,10 +30,7 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest((int i, String, {bool b}) val) {}
   void superTestPositioned((int i, String, {bool b}) val, [(int i, String, {bool b}) val2 = t1Default]) {}
   void superTestNamed((int i, String, {bool b}) val, {(int i, String, {bool b}) val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A07_t01.dart
index 18e6413..454bf50 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_mixin_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,24 +18,19 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest((int i, String, {List<num> b}) val) {}
   void superTestPositioned((int i, String, {List<num> b}) val, [(int i, String, {List<num> b}) val2 = t1Default]) {}
   void superTestNamed((int i, String, {List<num> b}) val, {(int i, String, {List<num> b}) val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A01_t01.dart
index cfc9f43..b2bc80b 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (int, String) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A02_t01.dart
index a3067e4..ae9a5f5 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (int, String, bool) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A03_t01.dart
index e353325..4a1b905 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (int i, String s) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A04_t01.dart
index 8d8bc41..270aca3 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (int i, String s, {bool b}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A05_t01.dart
index 33473d8..d423469 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (int i, String s, {bool b1}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A06_t01.dart
index bd3707b..adfe61e 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (int i, String, {bool b}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A07_t01.dart
index 5967f94..bf86897 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_arguments_binding_super_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,23 +18,18 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   (int i, String, {List<num> b}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A01_t01.dart
index 567a284..82a29bd 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class ClassMemberTestStatic {
   static (int, String) s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A02_t01.dart
index 0d7766b..d7ac6d7 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
-
 class ClassMemberTestStatic {
   static (int, String, bool) s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A03_t01.dart
index 4a5ff8d..b3c2a98 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class ClassMemberTestStatic {
   static (int i, String s) s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A04_t01.dart
index 8643249..4b4ab73 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class ClassMemberTestStatic {
   static (int i, String s, {bool b}) s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A05_t01.dart
index 8833428..bda883e 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
-
 class ClassMemberTestStatic {
   static (int i, String s, {bool b1}) s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A06_t01.dart
index a944197..6ed5a73 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class ClassMemberTestStatic {
   static (int i, String, {bool b}) s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A07_t01.dart
index b06972d..9646453 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,23 +18,18 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
-
 class ClassMemberTestStatic {
   static (int i, String, {List<num> b}) s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A01_t01.dart
index f1bf246..93f7cd2 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class ClassMemberSuper1_t03 {
   (int, String) m = t1Default;
   void set superSetter((int, String) val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A02_t01.dart
index 2ef1f4b..ac8abab 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
-
 class ClassMemberSuper1_t03 {
   (int, String, bool) m = t1Default;
   void set superSetter((int, String, bool) val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A03_t01.dart
index acb5147..b99cbc1 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class ClassMemberSuper1_t03 {
   (int i, String s) m = t1Default;
   void set superSetter((int i, String s) val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A04_t01.dart
index 7bdd667..2e038ce 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class ClassMemberSuper1_t03 {
   (int i, String s, {bool b}) m = t1Default;
   void set superSetter((int i, String s, {bool b}) val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A05_t01.dart
index 8240db7..180f418 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
-
 class ClassMemberSuper1_t03 {
   (int i, String s, {bool b1}) m = t1Default;
   void set superSetter((int i, String s, {bool b1}) val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A06_t01.dart
index 5101e1e..7c047c4 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class ClassMemberSuper1_t03 {
   (int i, String, {bool b}) m = t1Default;
   void set superSetter((int i, String, {bool b}) val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A07_t01.dart
index a3608a9..eaa77c7 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_mixin_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,23 +18,18 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
-
 class ClassMemberSuper1_t03 {
   (int i, String, {List<num> b}) m = t1Default;
   void set superSetter((int i, String, {List<num> b}) val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A01_t01.dart
index 7979240..30a13e9 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class ClassMemberSuper1_t02 {
   (int, String) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A02_t01.dart
index 4381ac6..bedb6bd 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
-
 class ClassMemberSuper1_t02 {
   (int, String, bool) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A03_t01.dart
index ef375c4..1e7b2b8 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class ClassMemberSuper1_t02 {
   (int i, String s) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A04_t01.dart
index 9c4340a..226df38 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class ClassMemberSuper1_t02 {
   (int i, String s, {bool b}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A05_t01.dart
index 56edf2e..5902aa3 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
-
 class ClassMemberSuper1_t02 {
   (int i, String s, {bool b1}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A06_t01.dart
index c54421b..2d89787 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class ClassMemberSuper1_t02 {
   (int i, String, {bool b}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A07_t01.dart
index 965d3a2..39809ed 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_class_member_super_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,23 +18,18 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
-
 class ClassMemberSuper1_t02 {
   (int i, String, {List<num> b}) m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A01_t01.dart
index 7a7747a..68461fc 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A02_t01.dart
index 651cbdd..96c64e6 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A03_t01.dart
index f0130a9..efccac0 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A04_t01.dart
index 4a7045b..7b828a2 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A05_t01.dart
index f7a5b25..ec296eb 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A06_t01.dart
index ce2d210..6d5eedc 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A07_t01.dart
index 2abe369..5de84c4 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_global_variable_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,23 +18,18 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A01_t01.dart
index c9b47d0..31db1c6 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     (int, String) t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A02_t01.dart
index 52d6eee..1825b80 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     (int, String, bool) t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A03_t01.dart
index d1c8dda..ec8b82c 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     (int i, String s) t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A04_t01.dart
index 58d685e..f0a64ba 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     (int i, String s, {bool b}) t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A05_t01.dart
index e00c1cd..6a52a0c 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     (int i, String s, {bool b1}) t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A06_t01.dart
index bd1641c..2a279b6 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,12 +18,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -32,9 +30,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     (int i, String, {bool b}) t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A07_t01.dart
index 90b46dc..26ea186 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_local_variable_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,23 +18,18 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     (int i, String, {List<num> b}) t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A01_t01.dart
index cd16b1f..9f13ee4 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 (int, String) returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A02_t01.dart
index b791d25..ec29364 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6", false);
 
-
-
-
 (int, String, bool) returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A03_t01.dart
index 361e236..dc63e42 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A03.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A03.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6");
 
-
-
-
 (int i, String s) returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A04_t01.dart
index d75a556..4ae687f 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A04.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A04.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 (int i, String s, {bool b}) returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A05_t01.dart
index 844db66..494b1f8 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A05.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A05.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6", b1: false);
 
-
-
-
 (int i, String s, {bool b1}) returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A06_t01.dart
index 973f2f4..d018585 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,12 +17,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A06.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A06.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = const (5, "6", b: false);
 
-
-
-
 (int i, String, {bool b}) returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A07_t01.dart
index c052ab5..57652ec 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_fail_return_value_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -17,23 +17,18 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from records_fail_A07.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_fail_A07.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
-
-
-
 (int i, String, {List<num> b}) returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/records_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_global_variable_A01_t01.dart
index 757e348..23c8018 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_global_variable_A02_t01.dart
index 415e232..a72ff73 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_global_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -33,9 +31,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_global_variable_A03_t01.dart
index 6a5a7d0..13ef599 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_global_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/records_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_local_variable_A01_t01.dart
index 19e6395..0f83bb7 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/records_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_local_variable_A02_t01.dart
index 412130e..59475ea 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_local_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -33,9 +31,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/records_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_local_variable_A03_t01.dart
index d66263a..c23be85 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_local_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/records_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_return_value_A01_t01.dart
index f79e301..9a3fa9d 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional fields only
@@ -17,12 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (0, 0, null);
 
-
-
-
 (num, num, String?) returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +49,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_return_value_A02_t01.dart
index a40cf9d..1a0bb49 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_return_value_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check positional and named fields
@@ -17,12 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -33,9 +31,6 @@
 
 const t1Default = (0, 0, null, n1: 0.1, n2: "");
 
-
-
-
 (num, num, String?, {num n1, String? n2}) returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -56,5 +51,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/records_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/records_return_value_A03_t01.dart
index 4d44eed..48943e0 100644
--- a/LanguageFeatures/Subtyping/static/generated/records_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/records_return_value_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,7 +7,7 @@
 /// A record type A is a subtype of record type B iff they have same shape and
 /// the types of all fields of A are subtypes of the corresponding field types
 /// of B
-/// 
+///
 /// @description Check that if type T0 is a record with the same shape as T1
 /// and the type of each field of T0 is a subtype of the corresponding field
 /// types of T1 then T0 is a subtype of T1. Check named fields only
@@ -17,12 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from records_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/records_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // SharedOptions=--enable-experiment=records
 
@@ -31,9 +29,6 @@
 
 const t1Default = (y: 1, z: null, x: 0.1);
 
-
-
-
 ({String? z, num y, num x}) returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -54,5 +49,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t01.dart
index 56c02dd..4038a25 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T {
   const T();
@@ -29,9 +27,6 @@
 
 const t1Default = const T();
 
-
-
-
 namedArgumentsFunc1(T t1, {T t2 = t1Default}) {}
 positionalArgumentsFunc1(T t1, [T t2 = t1Default]) {}
 
@@ -96,7 +91,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T>(t0Instance, t2: t0Instance);
 
@@ -108,5 +102,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t02.dart
index 31236a4..6fc9997 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T {
   const T();
@@ -29,9 +27,6 @@
 
 const t1Default = const T();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T m = t1Default;
 
@@ -112,8 +107,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T> c2 =
     new ArgumentsBinding2_t02<T>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T>.c2(t1Instance, t0Instance);
@@ -124,5 +117,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t03.dart
index 1f64e15..d2b3a12 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A01_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T {
   const T();
@@ -29,10 +27,7 @@
 
 const t1Default = const T();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T m = t1Default;
 
   void superTest(T val) {}
@@ -56,7 +51,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -84,12 +79,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T> c2 = new ArgumentsBinding2_t03<T>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t01.dart
index aa458fd..52a3418 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = 3.14;
 dynamic t1Instance = "";
 
 const t1Default = "";
 
-
-
-
 namedArgumentsFunc1(dynamic t1, {dynamic t2 = t1Default}) {}
 positionalArgumentsFunc1(dynamic t1, [dynamic t2 = t1Default]) {}
 
@@ -92,7 +87,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<dynamic>(t0Instance, t2: t0Instance);
 
@@ -104,5 +98,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t02.dart
index 0435bd6..ec14799 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t02.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = 3.14;
 dynamic t1Instance = "";
 
 const t1Default = "";
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   dynamic m = t1Default;
 
@@ -108,8 +103,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<dynamic> c2 =
     new ArgumentsBinding2_t02<dynamic>(t0Instance);
   c2 = new ArgumentsBinding2_t02<dynamic>.c2(t1Instance, t0Instance);
@@ -120,5 +113,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t03.dart
index 6eadbdd..3857e73 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A02_t03.dart
@@ -13,22 +13,17 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = 3.14;
 dynamic t1Instance = "";
 
 const t1Default = "";
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   dynamic m = t1Default;
 
   void superTest(dynamic val) {}
@@ -52,7 +47,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -80,12 +75,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<dynamic> c2 = new ArgumentsBinding2_t03<dynamic>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t01.dart
index 89c52dd..9adfe6b 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -92,7 +87,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object>(t0Instance, t2: t0Instance);
 
@@ -104,5 +98,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t02.dart
index 29cd05d..861ae09 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t02.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
@@ -108,8 +103,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object> c2 =
     new ArgumentsBinding2_t02<Object>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, t0Instance);
@@ -120,5 +113,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t03.dart
index 0db7ec1..0905d8e 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A03_t03.dart
@@ -13,22 +13,17 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
   void superTest(Object val) {}
@@ -52,7 +47,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -80,12 +75,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t01.dart
index c27eade..070e738 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(Null t1, {Null t2 = t1Default}) {}
 positionalArgumentsFunc1(Null t1, [Null t2 = t1Default]) {}
 
@@ -92,7 +87,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Null>(t0Instance, t2: t0Instance);
 
@@ -104,5 +98,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t02.dart
index d86536a..6937e19 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t02.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Null m = t1Default;
 
@@ -108,8 +103,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Null> c2 =
     new ArgumentsBinding2_t02<Null>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Null>.c2(t1Instance, t0Instance);
@@ -120,5 +113,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t03.dart
index 5ad1860..ee35106 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_arguments_binding_A04_t03.dart
@@ -13,22 +13,17 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null t1Instance = null;
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Null m = t1Default;
 
   void superTest(Null val) {}
@@ -52,7 +47,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -80,12 +75,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Null> c2 = new ArgumentsBinding2_t03<Null>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t01.dart
index 006375c..3544fbe 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T {
   const T();
@@ -29,9 +27,6 @@
 
 const t1Default = const T();
 
-
-
-
 class ClassMember1_t01 {
   static T s = t0Instance;
   T m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t02.dart
index 6882a21..81580c5 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T {
   const T();
@@ -29,9 +27,6 @@
 
 const t1Default = const T();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t03.dart
index 75ae1d0..7466537 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A01_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T {
   const T();
@@ -29,9 +27,6 @@
 
 const t1Default = const T();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t01.dart
index 7ee7ae8..023e709 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = 3.14;
 dynamic t1Instance = "";
 
 const t1Default = "";
 
-
-
-
 class ClassMember1_t01 {
   static dynamic s = t0Instance;
   dynamic m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t02.dart
index a910d6c..6bc0179 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t02.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = 3.14;
 dynamic t1Instance = "";
 
 const t1Default = "";
 
-
-
-
 class ClassMemberSuper1_t02 {
   dynamic m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t03.dart
index 8943963..de6d750 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A02_t03.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = 3.14;
 dynamic t1Instance = "";
 
 const t1Default = "";
 
-
-
-
 class ClassMemberMixin1_t03 {
   dynamic m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t01.dart
index 122267b..4f9ffce 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static Object s = t0Instance;
   Object m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t02.dart
index e53b42d..1c06b84 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t02.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t03.dart
index 003be5b..011e71c 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A03_t03.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t01.dart
index 5edb46e..3542ebf 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static Null s = t0Instance;
   Null m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t02.dart
index c0ffe07..4abb6a7 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t02.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Null m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t03.dart
index 36319bc..2c248fa 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_class_member_A04_t03.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Null m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A01_t01.dart
index e40df6d..d539e03 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T {
   const T();
@@ -29,9 +27,6 @@
 
 const t1Default = const T();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A02_t01.dart
index dd86498..e23aff8 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A02_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = 3.14;
 dynamic t1Instance = "";
 
 const t1Default = "";
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A03_t01.dart
index 62086e2..0c29d0f 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A03_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A04_t01.dart
index 29d9ad7..9d029bc 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_global_variable_A04_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A01_t01.dart
index 6ca1f7a..0bdf69c 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T {
   const T();
@@ -29,9 +27,6 @@
 
 const t1Default = const T();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A02_t01.dart
index c53e88d..8a798dc 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A02_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = 3.14;
 dynamic t1Instance = "";
 
 const t1Default = "";
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A03_t01.dart
index 36f6384..12ce9ab 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A03_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A04_t01.dart
index c61e7ab..fbf452e 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_local_variable_A04_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A01_t01.dart
index 798c568..a5f81c2 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T {
   const T();
@@ -29,9 +27,6 @@
 
 const t1Default = const T();
 
-
-
-
 T returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -52,5 +47,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A02_t01.dart
index 3d1f450..3d96dd3 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A02_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = 3.14;
 dynamic t1Instance = "";
 
 const t1Default = "";
 
-
-
-
 dynamic returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -48,5 +43,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A03_t01.dart
index bcf58d0..0af2358 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A03_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 Object t1Instance = new Object();
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -48,5 +43,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A04_t01.dart
index d7ce99b..9fbf766 100644
--- a/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/reflexivity_return_value_A04_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from reflexivity_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/reflexivity_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Null t0Instance = null;
 Null t1Instance = null;
 
 const t1Default = null;
 
-
-
-
 Null returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -48,5 +43,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t01.dart
index 5ef14a2..5ffee8d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -52,9 +53,6 @@
 
 const t1Default = const S1();
 
-
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
@@ -119,7 +117,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<S1>>(t0Instance, t2: t0Instance);
 
@@ -131,5 +128,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t02.dart
index 60294f5..7efda86 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t02.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -52,9 +53,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
@@ -135,8 +133,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<S1>> c2 =
     new ArgumentsBinding2_t02<FutureOr<S1>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<FutureOr<S1>>.c2(t1Instance, t0Instance);
@@ -147,5 +143,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t03.dart
index 6bd7bc4..28779ce 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A01_t03.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -52,10 +53,7 @@
 
 const t1Default = const S1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
   void superTest(FutureOr<S1> val) {}
@@ -79,7 +77,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -107,12 +105,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<S1>> c2 = new ArgumentsBinding2_t03<FutureOr<S1>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t01.dart
index ca7d36c..434979f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
@@ -103,7 +98,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<S1>>(t0Instance, t2: t0Instance);
 
@@ -115,5 +109,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t02.dart
index 5bf11bb..8850aa4 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t02.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
@@ -119,8 +114,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<S1>> c2 =
     new ArgumentsBinding2_t02<FutureOr<S1>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<FutureOr<S1>>.c2(t1Instance, t0Instance);
@@ -131,5 +124,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t03.dart
index 929903a..4cdd0ec 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A02_t03.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,10 +34,7 @@
 
 const t1Default = const S1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
   void superTest(FutureOr<S1> val) {}
@@ -63,7 +58,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -91,12 +86,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<S1>> c2 = new ArgumentsBinding2_t03<FutureOr<S1>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t01.dart
index 09cd883..70e9453 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t01.dart
@@ -17,27 +17,29 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -46,17 +48,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
@@ -121,7 +119,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<S1>>(t0Instance, t2: t0Instance);
 
@@ -133,5 +130,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t02.dart
index 4aab265..bd78635 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t02.dart
@@ -17,27 +17,29 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -46,17 +48,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
@@ -137,8 +135,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<S1>> c2 =
     new ArgumentsBinding2_t02<FutureOr<S1>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<FutureOr<S1>>.c2(t1Instance, t0Instance);
@@ -149,5 +145,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t03.dart
index 2894989..cf47be9 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A03_t03.dart
@@ -17,27 +17,29 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -46,18 +48,14 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
   void superTest(FutureOr<S1> val) {}
@@ -81,7 +79,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -109,12 +107,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<S1>> c2 = new ArgumentsBinding2_t03<FutureOr<S1>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t01.dart
index 1cb622c..a69ac7f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
@@ -106,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<FutureOr<S1>>(t0Instance, t2: t0Instance);
 
@@ -118,5 +112,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t02.dart
index 5e64b7a..145f02a 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t02.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
@@ -122,8 +117,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<FutureOr<S1>> c2 =
     new ArgumentsBinding2_t02<FutureOr<S1>>(t0Instance);
   c2 = new ArgumentsBinding2_t02<FutureOr<S1>>.c2(t1Instance, t0Instance);
@@ -134,5 +127,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t03.dart
index 9122999..0f88749 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_arguments_binding_A04_t03.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,10 +37,7 @@
 
 const t1Default = const S1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
   void superTest(FutureOr<S1> val) {}
@@ -66,7 +61,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -94,12 +89,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<FutureOr<S1>> c2 = new ArgumentsBinding2_t03<FutureOr<S1>>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t01.dart
index 005ab88..20368b5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -52,9 +53,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<S1> s = t0Instance;
   FutureOr<S1> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t02.dart
index 5a26d7e..b61d608 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t02.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -52,9 +53,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t03.dart
index dbf3c79..2465d8d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A01_t03.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -52,9 +53,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t01.dart
index 5761064..9d10bc5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<S1> s = t0Instance;
   FutureOr<S1> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t02.dart
index a8d58f3..d7e1f66 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t02.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t03.dart
index 5e646e9..ad49638 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A02_t03.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t01.dart
index 4635174..fa80d99 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t01.dart
@@ -17,27 +17,29 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -46,17 +48,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<S1> s = t0Instance;
   FutureOr<S1> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t02.dart
index 854f80a..9e7a82f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t02.dart
@@ -17,27 +17,29 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -46,17 +48,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t03.dart
index f507e23..61b0fdd 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A03_t03.dart
@@ -17,27 +17,29 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -46,17 +48,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t01.dart
index c16bfd2..1960f8c 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static FutureOr<S1> s = t0Instance;
   FutureOr<S1> m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t02.dart
index 952cbe0..7077528 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t02.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t03.dart
index 7e8a6bd..4138492 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_class_member_A04_t03.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_fail_A01_t01.dart
index da7926e..03051c6 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_fail_A01_t01.dart
@@ -19,12 +19,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_fail_A02_t01.dart
index 73684bf..f758b43 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_fail_A02_t01.dart
@@ -19,12 +19,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -40,9 +38,6 @@
 
 const t1Default = const S1();
 
-
-
-
 namedArgumentsFunc1(FutureOr<S1> t1, {FutureOr<S1> t2 = t1Default}) {}
 positionalArgumentsFunc1(FutureOr<S1> t1, [FutureOr<S1> t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_mixin_fail_A01_t01.dart
index adbc3ac..682cf9d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,10 +37,7 @@
 
 const t1Default = const S1();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(FutureOr<S1> val) {}
   void superTestPositioned(FutureOr<S1> val, [FutureOr<S1> val2 = t1Default]) {}
   void superTestNamed(FutureOr<S1> val, {FutureOr<S1> val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_mixin_fail_A02_t01.dart
index 606cbb5..2000180 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_mixin_fail_A02_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -41,10 +39,7 @@
 
 const t1Default = const S1();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(FutureOr<S1> val) {}
   void superTestPositioned(FutureOr<S1> val, [FutureOr<S1> val2 = t1Default]) {}
   void superTestNamed(FutureOr<S1> val, {FutureOr<S1> val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_super_fail_A01_t01.dart
index 73270de..2df3d38 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_super_fail_A01_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_super_fail_A02_t01.dart
index cbffdc1..9023502 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_arguments_binding_super_fail_A02_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -41,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_fail_A01_t01.dart
index b26531b..33f235c 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_fail_A01_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberTestStatic {
   static FutureOr<S1> s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_fail_A02_t01.dart
index 0214d67..9af8e51 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_fail_A02_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -41,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberTestStatic {
   static FutureOr<S1> s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_mixin_fail_A01_t01.dart
index f72d4bc..3aed945 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_mixin_fail_A01_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t03 {
   FutureOr<S1> m = t1Default;
   void set superSetter(FutureOr<S1> val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_mixin_fail_A02_t01.dart
index b57c0ae..36864b4 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_mixin_fail_A02_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -41,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t03 {
   FutureOr<S1> m = t1Default;
   void set superSetter(FutureOr<S1> val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_super_fail_A01_t01.dart
index bc544e6..18c6c87 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_super_fail_A01_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_super_fail_A02_t01.dart
index 80d5baf..250323d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_class_member_super_fail_A02_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -41,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   FutureOr<S1> m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_global_variable_fail_A01_t01.dart
index 77ba5ec..c06d08c 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_global_variable_fail_A01_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_global_variable_fail_A02_t01.dart
index 9aefd7a..f956441 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_global_variable_fail_A02_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -41,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_local_variable_fail_A01_t01.dart
index 5670396..15d7391 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_local_variable_fail_A01_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     FutureOr<S1> t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_local_variable_fail_A02_t01.dart
index 4aacd86..94b1cea 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_local_variable_fail_A02_t01.dart
@@ -20,12 +20,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -41,9 +39,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     FutureOr<S1> t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_return_value_fail_A01_t01.dart
index a81d7f0..b4dc22f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_return_value_fail_A01_t01.dart
@@ -19,12 +19,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const S1();
 
-
-
-
 FutureOr<S1> returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_return_value_fail_A02_t01.dart
index a3b2f65..aebed87 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_fail_return_value_fail_A02_t01.dart
@@ -19,12 +19,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_FutureOr_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -40,9 +38,6 @@
 
 const t1Default = const S1();
 
-
-
-
 FutureOr<S1> returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A01_t01.dart
index 9bcfb46..2633587 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A01_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -52,9 +53,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A02_t01.dart
index 31d0369..7f38eab 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A02_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A03_t01.dart
index 0d5cc42..40f29de 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A03_t01.dart
@@ -17,27 +17,29 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -46,17 +48,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A04_t01.dart
index 2c7734a..09308be 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_global_variable_A04_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A01_t01.dart
index 3d98f58..c937ce0 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A01_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -52,9 +53,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A02_t01.dart
index 95ddf84..032ba79 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A02_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A03_t01.dart
index dac65b3..899c6e1 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A03_t01.dart
@@ -17,27 +17,29 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -46,17 +48,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A04_t01.dart
index 5fdc7a5..a06daaf 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_local_variable_A04_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A01_t01.dart
index f2378c0..2fadac2 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A01_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -52,9 +53,6 @@
 
 const t1Default = const S1();
 
-
-
-
 FutureOr<S1> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -75,5 +73,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A02_t01.dart
index 18cff5d..ee2eef2 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A02_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
 FutureOr<S1> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -59,5 +54,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A03_t01.dart
index 82785fc..8cdc273 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A03_t01.dart
@@ -17,27 +17,29 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -46,17 +48,13 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
 
 const t1Default = const S1();
 
-
-
-
 FutureOr<S1> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -77,5 +75,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A04_t01.dart
index 8c7c89e..c2655d7 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_FutureOr_return_value_A04_t01.dart
@@ -17,12 +17,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_FutureOr_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_FutureOr_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const S1();
 
-
-
-
 FutureOr<S1> returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -62,5 +57,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t01.dart
index 7f5781c..0b4d25a 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -36,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 namedArgumentsFunc1(S1? t1, {S1? t2 = t1Default}) {}
 positionalArgumentsFunc1(S1? t1, [S1? t2 = t1Default]) {}
 
@@ -103,7 +97,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<S1?>(t0Instance, t2: t0Instance);
 
@@ -115,5 +108,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t02.dart
index adc29c2..fb13091 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -36,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   S1? m = t1Default;
 
@@ -119,8 +113,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<S1?> c2 =
     new ArgumentsBinding2_t02<S1?>(t0Instance);
   c2 = new ArgumentsBinding2_t02<S1?>.c2(t1Instance, t0Instance);
@@ -131,5 +123,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t03.dart
index 677cf00..f1f05fc 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -36,10 +33,7 @@
 
 const t1Default = const S1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   S1? m = t1Default;
 
   void superTest(S1? val) {}
@@ -63,7 +57,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -91,12 +85,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<S1?> c2 = new ArgumentsBinding2_t03<S1?>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t01.dart
index 5dba630..a4a7ca7 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -35,9 +32,6 @@
 
 const t1Default = const S1();
 
-
-
-
 namedArgumentsFunc1(S1? t1, {S1? t2 = t1Default}) {}
 positionalArgumentsFunc1(S1? t1, [S1? t2 = t1Default]) {}
 
@@ -102,7 +96,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<S1?>(t0Instance, t2: t0Instance);
 
@@ -114,5 +107,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t02.dart
index 0c8f3d3..63cc7fd 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -35,9 +32,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   S1? m = t1Default;
 
@@ -118,8 +112,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<S1?> c2 =
     new ArgumentsBinding2_t02<S1?>(t0Instance);
   c2 = new ArgumentsBinding2_t02<S1?>.c2(t1Instance, t0Instance);
@@ -130,5 +122,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t03.dart
index 20bee3f..7efc088 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -35,10 +32,7 @@
 
 const t1Default = const S1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   S1? m = t1Default;
 
   void superTest(S1? val) {}
@@ -62,7 +56,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -90,12 +84,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<S1?> c2 = new ArgumentsBinding2_t03<S1?>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t01.dart
index ad18b2e..b763796 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -37,10 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 namedArgumentsFunc1(S1? t1, {S1? t2 = t1Default}) {}
 positionalArgumentsFunc1(S1? t1, [S1? t2 = t1Default]) {}
 
@@ -82,10 +75,7 @@
   set testSetter(X val) {}
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   // test functions
   namedArgumentsFunc1(t0Instance, t2: t0Instance);
   positionalArgumentsFunc1(t0Instance, t0Instance);
@@ -108,7 +98,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<S1?>(t0Instance, t2: t0Instance);
 
@@ -120,8 +109,6 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t02.dart
index 1d71f50..d370c51 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -37,10 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   S1? m = t1Default;
 
@@ -103,10 +96,7 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
   c1 = new ArgumentsBinding1_t02.c1(t0Instance);
   c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
@@ -124,8 +114,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<S1?> c2 =
     new ArgumentsBinding2_t02<S1?>(t0Instance);
   c2 = new ArgumentsBinding2_t02<S1?>.c2(t1Instance, t0Instance);
@@ -136,8 +124,6 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t03.dart
index 78f1c16..8aab253 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_arguments_binding_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -37,11 +34,7 @@
 
 const t1Default = const S1();
 
-
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   S1? m = t1Default;
 
   void superTest(S1? val) {}
@@ -65,7 +58,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -80,10 +73,7 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
   c1.test(t0Instance, t1Instance);
@@ -96,15 +86,11 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<S1?> c2 = new ArgumentsBinding2_t03<S1?>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t01.dart
index 804f21f..80625d2 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -36,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static S1? s = t0Instance;
   S1? m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t02.dart
index 4ef57a0..ae4ddc4 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -36,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   S1? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t03.dart
index dd5a323..0ff6da2 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -36,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   S1? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t01.dart
index 94af2f9..d2b2c03 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -35,9 +32,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static S1? s = t0Instance;
   S1? m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t02.dart
index 40852c0..6846979 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -35,9 +32,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   S1? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t03.dart
index 18c5511..311d9a5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -35,9 +32,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   S1? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t01.dart
index 58206e4..aa01b98 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -37,10 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class ClassMember1_t01 {
   static S1? s = t0Instance;
   S1? m = t0Instance;
@@ -83,10 +76,7 @@
   static S1? get staticGetter => t0Instance;
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   ClassMember1_t01 c1 = new ClassMember1_t01();
   c1 = new ClassMember1_t01.short(t0Instance,
       t0Instance);
@@ -100,7 +90,6 @@
   ClassMember1_t01.staticTest();
   ClassMember1_t01.staticSetter = t0Instance;
   ClassMember1_t01.staticGetter;
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t02.dart
index c47037e..4ed6690 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -37,10 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   S1? m = t1Default;
 
@@ -71,17 +64,13 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   ClassMember1_t02 c1 = new ClassMember1_t02();
   c1 = new ClassMember1_t02.short();
   c1 = new ClassMember1_t02.named();
   c1.m = t0Instance;
   c1.test();
   c1.superSetter = t0Instance;
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t03.dart
index 5755f19..c40702e 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_class_member_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -37,10 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class ClassMemberMixin1_t03 {
   S1? m = t1Default;
 
@@ -54,15 +47,11 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   ClassMember1_t03 c1 = new ClassMember1_t03();
   c1.m = t0Instance;
   c1.test();
   c1.superSetter = t0Instance;
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A01_t01.dart
index bcc6423..5721b48 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -36,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A02_t01.dart
index 13d1f1e..ff258c1 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -35,9 +32,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A03_t01.dart
index 50696c9..f9d7e92 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_global_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -37,10 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -55,10 +48,7 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   bar () {
     t1Instance = t0Instance;
   }
@@ -68,7 +58,6 @@
   GlobalVariableTest t = new GlobalVariableTest();
   t.foo();
   GlobalVariableTest.test();
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A01_t01.dart
index b7612f6..e563707 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -36,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A02_t01.dart
index 58dd00b..2e1a06d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -35,9 +32,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A03_t01.dart
index ef1a30f..b1d655b 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_local_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -37,10 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -59,10 +52,7 @@
   }
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   foo() {
     S1? t1 = t0Instance;
     t1 = t0Instance;
@@ -74,7 +64,6 @@
   LocalVariableTest x = new LocalVariableTest();
   x.test();
   LocalVariableTest.staticTest();
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A01_t01.dart
index beffe36..875c9da 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -36,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 S1? returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -59,5 +53,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A02_t01.dart
index 7745826..a119f45 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -35,9 +32,6 @@
 
 const t1Default = const S1();
 
-
-
-
 S1? returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -58,5 +52,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A03_t01.dart
index 68d0290..f48eebb 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_nullable_return_value_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -18,13 +18,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_nullable_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
-
+/// This test is generated from test_types/right_nullable_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class S1 {
   const S1();
@@ -37,10 +34,6 @@
 
 const t1Default = const S1();
 
-
-
-
-
 S1? returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -51,10 +44,7 @@
   S1? get testGetter => t0Instance;
 }
 
-
-
 test<T extends S1>(T t0Instance) {
-
   S1? returnValueLocalFunc() => t0Instance;
 
   returnValueFunc();
@@ -64,8 +54,6 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t01.dart
index f134697..397baf6 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -81,46 +75,40 @@
   set testSetter(X val) {}
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  // test functions
-  namedArgumentsFunc1(t0Instance, t2: t0Instance);
-  positionalArgumentsFunc1(t0Instance, t0Instance);
+    // test functions
+    namedArgumentsFunc1(t0Instance, t2: t0Instance);
+    positionalArgumentsFunc1(t0Instance, t0Instance);
 
-  // test class constructors
-  ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
-  instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
-  instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
+    // test class constructors
+    ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
+    instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
+    instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
 
-  // tests methods and setters
-  instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance1.positionalArgumentsMethod(t0Instance, t0Instance);
-  instance1.testSetter = t0Instance;
+    // tests methods and setters
+    instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance1.positionalArgumentsMethod(t0Instance, t0Instance);
+    instance1.testSetter = t0Instance;
 
-  // test static methods
-  ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
+    // test static methods
+    ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  // test generic functions
-  namedArgumentsFunc2<Object>(t0Instance, t2: t0Instance);
+    // test generic functions
+    namedArgumentsFunc2<Object>(t0Instance, t2: t0Instance);
 
-  // test generic class constructors
-  ArgumentsBindingGen<Object> instance2 = new ArgumentsBindingGen<Object>(t0Instance);
-  instance2 = new ArgumentsBindingGen<Object>.fNamed(t0Instance, t2: t0Instance);
-  instance2 = new ArgumentsBindingGen<Object>.named(t0Instance, t2: t0Instance);
+    // test generic class constructors
+    ArgumentsBindingGen<Object> instance2 = new ArgumentsBindingGen<Object>(t0Instance);
+    instance2 = new ArgumentsBindingGen<Object>.fNamed(t0Instance, t2: t0Instance);
+    instance2 = new ArgumentsBindingGen<Object>.named(t0Instance, t2: t0Instance);
 
-  // test generic class methods and setters
-  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance2.testSetter = t0Instance;
-  //# -->
-
+    // test generic class methods and setters
+    instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance2.testSetter = t0Instance;
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t02.dart
index 33e4811..d7f9239 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
@@ -102,41 +96,34 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c1(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c3(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c5(t0Instance);
+    ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c1(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c3(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c5(t0Instance);
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
+    // Test type parameters
+    ArgumentsBinding2_t02<Object> c2 =
+      new ArgumentsBinding2_t02<Object>(t0Instance);
+    c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, t0Instance);
+    c2 = new ArgumentsBinding2_t02<Object>.c5(t0Instance);
 
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t02<Object> c2 =
-    new ArgumentsBinding2_t02<Object>(t0Instance);
-  c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, t0Instance);
-  c2 = new ArgumentsBinding2_t02<Object>.c5(t0Instance);
-
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  c2.superGetter;
-  //# -->
-
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
+    c2.superGetter;
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t03.dart
index 5195184..5dbf350 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -36,11 +34,7 @@
 
 const t1Default = const Object();
 
-
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
   void superTest(Object val) {}
@@ -64,7 +58,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -79,31 +73,24 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
+    ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
-
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  //# -->
-
+    // Test type parameters
+    ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t01.dart
index 86845c7..a2e5636 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -81,47 +75,41 @@
   set testSetter(X val) {}
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  // test functions
-  namedArgumentsFunc1(t0Instance, t2: t0Instance);
-  positionalArgumentsFunc1(t0Instance, t0Instance);
+    // test functions
+    namedArgumentsFunc1(t0Instance, t2: t0Instance);
+    positionalArgumentsFunc1(t0Instance, t0Instance);
 
-  // test class constructors
-  ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
-  instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
-  instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
+    // test class constructors
+    ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
+    instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
+    instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
 
-  // tests methods and setters
-  instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance1.positionalArgumentsMethod(t0Instance, t0Instance);
-  instance1.testSetter = t0Instance;
+    // tests methods and setters
+    instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance1.positionalArgumentsMethod(t0Instance, t0Instance);
+    instance1.testSetter = t0Instance;
 
-  // test static methods
-  ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
+    // test static methods
+    ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  // test generic functions
-  namedArgumentsFunc2<Object>(t0Instance, t2: t0Instance);
+    // test generic functions
+    namedArgumentsFunc2<Object>(t0Instance, t2: t0Instance);
 
-  // test generic class constructors
-  ArgumentsBindingGen<Object> instance2 = new ArgumentsBindingGen<Object>(t0Instance);
-  instance2 = new ArgumentsBindingGen<Object>.fNamed(t0Instance, t2: t0Instance);
-  instance2 = new ArgumentsBindingGen<Object>.named(t0Instance, t2: t0Instance);
+    // test generic class constructors
+    ArgumentsBindingGen<Object> instance2 = new ArgumentsBindingGen<Object>(t0Instance);
+    instance2 = new ArgumentsBindingGen<Object>.fNamed(t0Instance, t2: t0Instance);
+    instance2 = new ArgumentsBindingGen<Object>.named(t0Instance, t2: t0Instance);
 
-  // test generic class methods and setters
-  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance2.testSetter = t0Instance;
-  //# -->
-
+    // test generic class methods and setters
+    instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance2.testSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t02.dart
index 6b5aac3..8c44f4b 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
@@ -102,42 +96,35 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c1(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c3(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c5(t0Instance);
+    ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c1(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c3(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c5(t0Instance);
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
+    // Test type parameters
+    ArgumentsBinding2_t02<Object> c2 =
+      new ArgumentsBinding2_t02<Object>(t0Instance);
+    c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, t0Instance);
+    c2 = new ArgumentsBinding2_t02<Object>.c5(t0Instance);
 
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t02<Object> c2 =
-    new ArgumentsBinding2_t02<Object>(t0Instance);
-  c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, t0Instance);
-  c2 = new ArgumentsBinding2_t02<Object>.c5(t0Instance);
-
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  c2.superGetter;
-  //# -->
-
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
+    c2.superGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t03.dart
index 4cd4342..99b1874 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -36,11 +34,7 @@
 
 const t1Default = const Object();
 
-
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
   void superTest(Object val) {}
@@ -64,7 +58,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -79,32 +73,25 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
+    ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
-
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  //# -->
-
+    // Test type parameters
+    ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t01.dart
index d7e8414..872fac9 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -37,10 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -82,47 +76,41 @@
   set testSetter(X val) {}
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  // test functions
-  namedArgumentsFunc1(t0Instance, t2: t0Instance);
-  positionalArgumentsFunc1(t0Instance, t0Instance);
+    // test functions
+    namedArgumentsFunc1(t0Instance, t2: t0Instance);
+    positionalArgumentsFunc1(t0Instance, t0Instance);
 
-  // test class constructors
-  ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
-  instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
-  instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
+    // test class constructors
+    ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
+    instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
+    instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
 
-  // tests methods and setters
-  instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance1.positionalArgumentsMethod(t0Instance, t0Instance);
-  instance1.testSetter = t0Instance;
+    // tests methods and setters
+    instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance1.positionalArgumentsMethod(t0Instance, t0Instance);
+    instance1.testSetter = t0Instance;
 
-  // test static methods
-  ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
+    // test static methods
+    ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  // test generic functions
-  namedArgumentsFunc2<Object>(t0Instance, t2: t0Instance);
+    // test generic functions
+    namedArgumentsFunc2<Object>(t0Instance, t2: t0Instance);
 
-  // test generic class constructors
-  ArgumentsBindingGen<Object> instance2 = new ArgumentsBindingGen<Object>(t0Instance);
-  instance2 = new ArgumentsBindingGen<Object>.fNamed(t0Instance, t2: t0Instance);
-  instance2 = new ArgumentsBindingGen<Object>.named(t0Instance, t2: t0Instance);
+    // test generic class constructors
+    ArgumentsBindingGen<Object> instance2 = new ArgumentsBindingGen<Object>(t0Instance);
+    instance2 = new ArgumentsBindingGen<Object>.fNamed(t0Instance, t2: t0Instance);
+    instance2 = new ArgumentsBindingGen<Object>.named(t0Instance, t2: t0Instance);
 
-  // test generic class methods and setters
-  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance2.testSetter = t0Instance;
-  //# -->
-
+    // test generic class methods and setters
+    instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance2.testSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t02.dart
index 4bca319..ce235fe 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -37,10 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
@@ -103,42 +97,35 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c1(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c3(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c5(t0Instance);
+    ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c1(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c3(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c5(t0Instance);
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
+    // Test type parameters
+    ArgumentsBinding2_t02<Object> c2 =
+      new ArgumentsBinding2_t02<Object>(t0Instance);
+    c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, t0Instance);
+    c2 = new ArgumentsBinding2_t02<Object>.c5(t0Instance);
 
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t02<Object> c2 =
-    new ArgumentsBinding2_t02<Object>(t0Instance);
-  c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, t0Instance);
-  c2 = new ArgumentsBinding2_t02<Object>.c5(t0Instance);
-
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  c2.superGetter;
-  //# -->
-
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
+    c2.superGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t03.dart
index 9f40cb7..cd230b9 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -37,11 +35,7 @@
 
 const t1Default = const Object();
 
-
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
   void superTest(Object val) {}
@@ -65,7 +59,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -80,32 +74,25 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
+    ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
-
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  //# -->
-
+    // Test type parameters
+    ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t01.dart
index bcb692b..2292dbd 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -104,7 +99,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object>(t0Instance, t2: t0Instance);
 
@@ -116,5 +110,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t02.dart
index 88bd3a5..a1c5cb3 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
@@ -120,8 +115,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object> c2 =
     new ArgumentsBinding2_t02<Object>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, t0Instance);
@@ -132,5 +125,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t03.dart
index 46b40a9..5714a70 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A04_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,10 +35,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
   void superTest(Object val) {}
@@ -64,7 +59,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -92,12 +87,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t01.dart
index 478e06c..8375804 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -104,7 +99,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object>(t0Instance, t2: t0Instance);
 
@@ -116,5 +110,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t02.dart
index 757bb9a..f3b307f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
@@ -120,8 +115,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object> c2 =
     new ArgumentsBinding2_t02<Object>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Object>.c2(t1Instance, t0Instance);
@@ -132,5 +125,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t03.dart
index d33c736..9ae1114 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_arguments_binding_A05_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,10 +35,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Object m = t1Default;
 
   void superTest(Object val) {}
@@ -64,7 +59,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -92,12 +87,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object> c2 = new ArgumentsBinding2_t03<Object>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t01.dart
index f31c670..cdd2ac5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMember1_t01 {
   static Object s = t0Instance;
   Object m = t0Instance;
@@ -82,24 +76,20 @@
   static Object get staticGetter => t0Instance;
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  ClassMember1_t01 c1 = new ClassMember1_t01();
-  c1 = new ClassMember1_t01.short(t0Instance,
-      t0Instance);
-  c1 = new ClassMember1_t01.named(t0Instance);
-  c1.m = t0Instance;
-  c1.test();
-  c1.setter = t0Instance;
-  c1.getter;
+    ClassMember1_t01 c1 = new ClassMember1_t01();
+    c1 = new ClassMember1_t01.short(t0Instance,
+        t0Instance);
+    c1 = new ClassMember1_t01.named(t0Instance);
+    c1.m = t0Instance;
+    c1.test();
+    c1.setter = t0Instance;
+    c1.getter;
 
-  ClassMember1_t01.s = t0Instance;
-  ClassMember1_t01.staticTest();
-  ClassMember1_t01.staticSetter = t0Instance;
-  ClassMember1_t01.staticGetter;
-
+    ClassMember1_t01.s = t0Instance;
+    ClassMember1_t01.staticTest();
+    ClassMember1_t01.staticSetter = t0Instance;
+    ClassMember1_t01.staticGetter;
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t02.dart
index 3d8a39a..e421424 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
@@ -70,17 +64,13 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  ClassMember1_t02 c1 = new ClassMember1_t02();
-  c1 = new ClassMember1_t02.short();
-  c1 = new ClassMember1_t02.named();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t02 c1 = new ClassMember1_t02();
+    c1 = new ClassMember1_t02.short();
+    c1 = new ClassMember1_t02.named();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t03.dart
index 41c5f78..586eb6d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
@@ -53,15 +47,11 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  ClassMember1_t03 c1 = new ClassMember1_t03();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t03 c1 = new ClassMember1_t03();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t01.dart
index 3ef23c0..bf93cc9 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMember1_t01 {
   static Object s = t0Instance;
   Object m = t0Instance;
@@ -82,25 +76,21 @@
   static Object get staticGetter => t0Instance;
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  ClassMember1_t01 c1 = new ClassMember1_t01();
-  c1 = new ClassMember1_t01.short(t0Instance,
-      t0Instance);
-  c1 = new ClassMember1_t01.named(t0Instance);
-  c1.m = t0Instance;
-  c1.test();
-  c1.setter = t0Instance;
-  c1.getter;
+    ClassMember1_t01 c1 = new ClassMember1_t01();
+    c1 = new ClassMember1_t01.short(t0Instance,
+        t0Instance);
+    c1 = new ClassMember1_t01.named(t0Instance);
+    c1.m = t0Instance;
+    c1.test();
+    c1.setter = t0Instance;
+    c1.getter;
 
-  ClassMember1_t01.s = t0Instance;
-  ClassMember1_t01.staticTest();
-  ClassMember1_t01.staticSetter = t0Instance;
-  ClassMember1_t01.staticGetter;
-
+    ClassMember1_t01.s = t0Instance;
+    ClassMember1_t01.staticTest();
+    ClassMember1_t01.staticSetter = t0Instance;
+    ClassMember1_t01.staticGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t02.dart
index d1a7ea7..e20f105 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
@@ -70,18 +64,14 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  ClassMember1_t02 c1 = new ClassMember1_t02();
-  c1 = new ClassMember1_t02.short();
-  c1 = new ClassMember1_t02.named();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t02 c1 = new ClassMember1_t02();
+    c1 = new ClassMember1_t02.short();
+    c1 = new ClassMember1_t02.named();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t03.dart
index e474fd1..45c347e 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A02_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
@@ -53,16 +47,12 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  ClassMember1_t03 c1 = new ClassMember1_t03();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t03 c1 = new ClassMember1_t03();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t01.dart
index 617034f..c9848b1 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -37,10 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMember1_t01 {
   static Object s = t0Instance;
   Object m = t0Instance;
@@ -83,25 +77,21 @@
   static Object get staticGetter => t0Instance;
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  ClassMember1_t01 c1 = new ClassMember1_t01();
-  c1 = new ClassMember1_t01.short(t0Instance,
-      t0Instance);
-  c1 = new ClassMember1_t01.named(t0Instance);
-  c1.m = t0Instance;
-  c1.test();
-  c1.setter = t0Instance;
-  c1.getter;
+    ClassMember1_t01 c1 = new ClassMember1_t01();
+    c1 = new ClassMember1_t01.short(t0Instance,
+        t0Instance);
+    c1 = new ClassMember1_t01.named(t0Instance);
+    c1.m = t0Instance;
+    c1.test();
+    c1.setter = t0Instance;
+    c1.getter;
 
-  ClassMember1_t01.s = t0Instance;
-  ClassMember1_t01.staticTest();
-  ClassMember1_t01.staticSetter = t0Instance;
-  ClassMember1_t01.staticGetter;
-
+    ClassMember1_t01.s = t0Instance;
+    ClassMember1_t01.staticTest();
+    ClassMember1_t01.staticSetter = t0Instance;
+    ClassMember1_t01.staticGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t02.dart
index 611b640..d81a41d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -37,10 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
@@ -71,18 +65,14 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  ClassMember1_t02 c1 = new ClassMember1_t02();
-  c1 = new ClassMember1_t02.short();
-  c1 = new ClassMember1_t02.named();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t02 c1 = new ClassMember1_t02();
+    c1 = new ClassMember1_t02.short();
+    c1 = new ClassMember1_t02.named();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t03.dart
index 58e81cc..81e9ba1 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A03_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -37,10 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
@@ -54,16 +48,12 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  ClassMember1_t03 c1 = new ClassMember1_t03();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t03 c1 = new ClassMember1_t03();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t01.dart
index 25d137e..162db19 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static Object s = t0Instance;
   Object m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t02.dart
index e176a13..98a75a8 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t03.dart
index 46ba194..b15fd8d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A04_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t01.dart
index b78861d..e6fbb2d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMember1_t01 {
   static Object s = t0Instance;
   Object m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t02.dart
index 6cfbbb3..4b19993 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t03.dart
index 85334c2..15d52dc 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_class_member_A05_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A01_t01.dart
index c3c341a..3dd7c92 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A01_t01.dart
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -37,10 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -77,10 +71,7 @@
 // [cfe] unspecified
 }
 
-
-
 test<T extends B?>(T t0Instance) {
-  
   namedArgumentsFunc1(t0Instance);
 //                    ^^^^^^^^^^
 // [analyzer] unspecified
@@ -169,7 +160,6 @@
 //                                                  ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A02_t01.dart
index 82bb7ce..86589ab 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A02_t01.dart
@@ -23,12 +23,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A02.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A02.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -38,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
@@ -78,100 +72,96 @@
 // [cfe] unspecified
 }
 
-
-
 test<T>(T? t0Instance) {
   if (t0Instance is S?) {
-    
-  namedArgumentsFunc1(t0Instance);
-//                    ^^^^^^^^^^
+    namedArgumentsFunc1(t0Instance);
+//                      ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  namedArgumentsFunc1(t1Instance, t2: t0Instance);
-//                                    ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  positionalArgumentsFunc1(t0Instance);
-//                         ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  positionalArgumentsFunc1(t1Instance, t0Instance);
-//                                     ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass(t0Instance);
-//                          ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass(t1Instance).namedArgumentsMethod(t0Instance);
-//                                                           ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass(t1Instance).namedArgumentsMethod(t1Instance, t2: t0Instance);
-//                                                                           ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass(t1Instance).positionalArgumentsMethod(t0Instance);
-//                                                                ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass(t1Instance).positionalArgumentsMethod(t1Instance, t0Instance);
-//                                                                            ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass(t1Instance).testSetter = t0Instance;
-//                                                   ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance);
-//                                                 ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  ArgumentsBindingClass.namedArgumentsStaticMethod(t1Instance, t2: t0Instance);
-//                                                                 ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance);
-//                                                      ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(t1Instance, t0Instance);
-//                                                                  ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass.named(t0Instance);
-//                                ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass.named(t1Instance, t2: t0Instance);
-//                                                ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass.positional(t0Instance);
-//                                     ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass.positional(t1Instance, t0Instance);
-//                                                 ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass.fNamed(t0Instance);
-//                                 ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass.fNamed(t1Instance, t2: t0Instance);
-//                                                 ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-  new ArgumentsBindingClass.fPositional(t0Instance);
+    namedArgumentsFunc1(t1Instance, t2: t0Instance);
 //                                      ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBindingClass.fPositional(t1Instance, t0Instance);
+    positionalArgumentsFunc1(t0Instance);
+//                           ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    positionalArgumentsFunc1(t1Instance, t0Instance);
+//                                       ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass(t0Instance);
+//                            ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass(t1Instance).namedArgumentsMethod(t0Instance);
+//                                                             ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass(t1Instance).namedArgumentsMethod(t1Instance, t2: t0Instance);
+//                                                                             ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass(t1Instance).positionalArgumentsMethod(t0Instance);
+//                                                                  ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass(t1Instance).positionalArgumentsMethod(t1Instance, t0Instance);
+//                                                                              ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass(t1Instance).testSetter = t0Instance;
+//                                                     ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance);
+//                                                   ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    ArgumentsBindingClass.namedArgumentsStaticMethod(t1Instance, t2: t0Instance);
+//                                                                   ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance);
+//                                                        ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(t1Instance, t0Instance);
+//                                                                    ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass.named(t0Instance);
+//                                  ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass.named(t1Instance, t2: t0Instance);
 //                                                  ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-
+    new ArgumentsBindingClass.positional(t0Instance);
+//                                       ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass.positional(t1Instance, t0Instance);
+//                                                   ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass.fNamed(t0Instance);
+//                                   ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass.fNamed(t1Instance, t2: t0Instance);
+//                                                   ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass.fPositional(t0Instance);
+//                                        ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    new ArgumentsBindingClass.fPositional(t1Instance, t0Instance);
+//                                                    ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A03_t01.dart
index d08e301..b9d7079 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A03.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A03.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A04_t01.dart
index 8495472..383fdd4 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A04.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A04.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A05_t01.dart
index 0d880ca..c8c5dd9 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A05.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A05.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -38,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A06_t01.dart
index ab25c7b..65ce864 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A06.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A06.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -38,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A07_t01.dart
index ddd720f..02ad2ce 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A08_t01.dart
index 4ac1f40..31669ce 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
 namedArgumentsFunc1(Object t1, {Object t2 = t1Default}) {}
 positionalArgumentsFunc1(Object t1, [Object t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A01_t01.dart
index 0d3ed3d..6b421bf 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -38,11 +36,7 @@
 
 const t1Default = const Object();
 
-
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
   void superTestNamed(Object val, {Object val2 = t1Default}) {}
@@ -148,10 +142,7 @@
   }
 }
 
-
-
 test<T extends B?>(T t0Instance) {
-  
   new ArgumentsBinding1_t03().superTest(t0Instance);
 //                                      ^^^^^^^^^^
 // [analyzer] unspecified
@@ -177,7 +168,6 @@
 // [analyzer] unspecified
 // [cfe] unspecified
   new ArgumentsBinding1_t03().test();
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A02_t01.dart
index d635921..6871ec9 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A02_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A02.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A02.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -39,11 +37,7 @@
 
 const t1Default = const Object();
 
-
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
   void superTestNamed(Object val, {Object val2 = t1Default}) {}
@@ -149,37 +143,33 @@
   }
 }
 
-
-
 test<T>(T? t0Instance) {
   if (t0Instance is S?) {
-    
-  new ArgumentsBinding1_t03().superTest(t0Instance);
-//                                      ^^^^^^^^^^
+    new ArgumentsBinding1_t03().superTest(t0Instance);
+//                                        ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t03().superTestPositioned(t0Instance);
-//                                                ^^^^^^^^^^
+    new ArgumentsBinding1_t03().superTestPositioned(t0Instance);
+//                                                  ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t03().superTestPositioned(t1Instance, t0Instance);
-//                                                            ^^^^^^^^^^
+    new ArgumentsBinding1_t03().superTestPositioned(t1Instance, t0Instance);
+//                                                              ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t03().superTestNamed(t0Instance);
-//                                           ^^^^^^^^^^
+    new ArgumentsBinding1_t03().superTestNamed(t0Instance);
+//                                             ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t03().superTestNamed(t1Instance, val2: t0Instance);
-//                                                             ^^^^^^^^^^
+    new ArgumentsBinding1_t03().superTestNamed(t1Instance, val2: t0Instance);
+//                                                               ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t03().superSetter = t0Instance;
-//                                          ^^^^^^^^^^
+    new ArgumentsBinding1_t03().superSetter = t0Instance;
+//                                            ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t03().test();
-
+    new ArgumentsBinding1_t03().test();
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A03_t01.dart
index 6983216..aa6f66f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A03.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A03.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,10 +37,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
   void superTestNamed(Object val, {Object val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A04_t01.dart
index e7ae1be..3dae11c 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A04.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A04.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,10 +37,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
   void superTestNamed(Object val, {Object val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A05_t01.dart
index 583bd09..b520aed 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A05.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A05.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,10 +37,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
   void superTestNamed(Object val, {Object val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A06_t01.dart
index fc4786f..c8409f5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A06.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A06.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,10 +37,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
   void superTestNamed(Object val, {Object val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A07_t01.dart
index 0455053..c17ee9b 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,10 +37,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
   void superTestNamed(Object val, {Object val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A08_t01.dart
index 0117044..cc9212d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_mixin_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,10 +35,7 @@
 
 const t1Default = const Object();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(Object val) {}
   void superTestPositioned(Object val, [Object val2 = t1Default]) {}
   void superTestNamed(Object val, {Object val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A01_t01.dart
index 4a0129c..e4dd79c 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -38,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
@@ -181,10 +175,7 @@
   }
 }
 
-
-
 test<T extends B?>(T t0Instance) {
-  
   new ArgumentsBinding1_t02.valid().superTest(t0Instance);
 //                                            ^^^^^^^^^^
 // [analyzer] unspecified
@@ -210,7 +201,6 @@
 // [analyzer] unspecified
 // [cfe] unspecified
   new ArgumentsBinding1_t02.valid().test();
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A02_t01.dart
index 4d70b7e..0dcfe22 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A02_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A02.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A02.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -39,10 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
@@ -182,37 +176,33 @@
   }
 }
 
-
-
 test<T>(T? t0Instance) {
   if (t0Instance is S?) {
-    
-  new ArgumentsBinding1_t02.valid().superTest(t0Instance);
-//                                            ^^^^^^^^^^
+    new ArgumentsBinding1_t02.valid().superTest(t0Instance);
+//                                              ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t02.valid().superTestPositioned(t0Instance);
-//                                                      ^^^^^^^^^^
+    new ArgumentsBinding1_t02.valid().superTestPositioned(t0Instance);
+//                                                        ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t02.valid().superTestPositioned(t1Instance, t0Instance);
-//                                                                  ^^^^^^^^^^
+    new ArgumentsBinding1_t02.valid().superTestPositioned(t1Instance, t0Instance);
+//                                                                    ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t02.valid().superTestNamed(t0Instance);
-//                                                 ^^^^^^^^^^
+    new ArgumentsBinding1_t02.valid().superTestNamed(t0Instance);
+//                                                   ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t02.valid().superTestNamed(t1Instance, val2: t0Instance);
-//                                                                   ^^^^^^^^^^
+    new ArgumentsBinding1_t02.valid().superTestNamed(t1Instance, val2: t0Instance);
+//                                                                     ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t02.valid().superSetter = t0Instance;
-//                                                ^^^^^^^^^^
+    new ArgumentsBinding1_t02.valid().superSetter = t0Instance;
+//                                                  ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ArgumentsBinding1_t02.valid().test();
-
+    new ArgumentsBinding1_t02.valid().test();
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A03_t01.dart
index 7ef1b6b..9c02b58 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A03.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A03.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A04_t01.dart
index 1b1127e..9f83c2c 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A04.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A04.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A05_t01.dart
index 829801a..bd9acca 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A05.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A05.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A06_t01.dart
index 43b13ea..651bd95 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A06.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A06.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A07_t01.dart
index e19300f..efdc720 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A08_t01.dart
index 9b605eb..8efc67f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_arguments_binding_super_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A01_t01.dart
index 8259c1a..68c6795 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -38,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
@@ -146,15 +140,11 @@
 // [cfe] unspecified
 }
 
-
-
 test<T extends B?>(T t0Instance) {
-  
   new ClassMemberTestPublic.validConstructor().m = t0Instance;
 //                                                 ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A02_t01.dart
index 457a630..36b6d1f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A02_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A02.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A02.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -39,10 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
@@ -147,16 +141,12 @@
 // [cfe] unspecified
 }
 
-
-
 test<T>(T? t0Instance) {
   if (t0Instance is S?) {
-    
-  new ClassMemberTestPublic.validConstructor().m = t0Instance;
-//                                                 ^^^^^^^^^^
+    new ClassMemberTestPublic.validConstructor().m = t0Instance;
+//                                                   ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A03_t01.dart
index bb36810..53713cc 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A03.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A03.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A04_t01.dart
index fa47471..461c385 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A04.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A04.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A05_t01.dart
index 8c08b93..d02ed00 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A05.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A05.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A06_t01.dart
index ffd2cb7..12247a1 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A06.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A06.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A07_t01.dart
index fa1f19d..8e319c4 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A08_t01.dart
index 922da18..660f6fc 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberTestStatic {
   static Object s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A01_t01.dart
index 6f535b0..12f5ecb 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -38,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
   void set superSetter(Object val) {}
@@ -62,10 +56,7 @@
   }
 }
 
-
-
 test<T extends B?>(T t0Instance) {
-  
   new ClassMember1_t03().m = t0Instance;
 //                           ^^^^^^^^^^
 // [analyzer] unspecified
@@ -74,7 +65,6 @@
 //                                     ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A02_t01.dart
index a03319a..60a6f1d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A02_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A02.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A02.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -39,10 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
   void set superSetter(Object val) {}
@@ -63,20 +57,16 @@
   }
 }
 
-
-
 test<T>(T? t0Instance) {
   if (t0Instance is S?) {
-    
-  new ClassMember1_t03().m = t0Instance;
-//                           ^^^^^^^^^^
+    new ClassMember1_t03().m = t0Instance;
+//                             ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ClassMember1_t03().superSetter = t0Instance;
-//                                     ^^^^^^^^^^
+    new ClassMember1_t03().superSetter = t0Instance;
+//                                       ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A03_t01.dart
index b77d78f..74764bf 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A03.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A03.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
   void set superSetter(Object val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A04_t01.dart
index f04622d..4707aa2 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A04.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A04.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
   void set superSetter(Object val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A05_t01.dart
index 0014389..7565650 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A05.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A05.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
   void set superSetter(Object val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A06_t01.dart
index cfa994e..8e517ed 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A06.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A06.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
   void set superSetter(Object val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A07_t01.dart
index 82398bd..9dae650 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
   void set superSetter(Object val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A08_t01.dart
index 51df97c..3edc50f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_mixin_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t03 {
   Object m = t1Default;
   void set superSetter(Object val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A01_t01.dart
index ead81d3..d415aaf 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -38,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
@@ -81,10 +75,7 @@
   }
 }
 
-
-
 test<T extends B?>(T t0Instance) {
-  
   new ClassMember1_t02.valid().m = t0Instance;
 //                                 ^^^^^^^^^^
 // [analyzer] unspecified
@@ -93,7 +84,6 @@
 //                                           ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A02_t01.dart
index 63fabd0..cd2bf27 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A02_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A02.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A02.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -39,10 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
@@ -82,20 +76,16 @@
   }
 }
 
-
-
 test<T>(T? t0Instance) {
   if (t0Instance is S?) {
-    
-  new ClassMember1_t02.valid().m = t0Instance;
-//                                 ^^^^^^^^^^
+    new ClassMember1_t02.valid().m = t0Instance;
+//                                   ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  new ClassMember1_t02.valid().superSetter = t0Instance;
-//                                           ^^^^^^^^^^
+    new ClassMember1_t02.valid().superSetter = t0Instance;
+//                                             ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A03_t01.dart
index 92c3483..4e4c992 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A03.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A03.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A04_t01.dart
index 28fde48..696eb75 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A04.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A04.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A05_t01.dart
index 79d7bc8..491118f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A05.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A05.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A06_t01.dart
index ca10c49..db015e1 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A06.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A06.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A07_t01.dart
index 52aae75..4255b9f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A08_t01.dart
index c328792..f61fac5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_class_member_super_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A01_t01.dart
index 2e87f47..b554fb9 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -38,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -64,10 +58,7 @@
   }
 }
 
-
-
 test<T extends B?>(T t0Instance) {
-  
   t1Instance = t0Instance;
 //             ^^^^^^^^^^
 // [analyzer] unspecified
@@ -79,7 +70,6 @@
 // [analyzer] unspecified
 // [cfe] unspecified
   }
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A02_t01.dart
index 1256c30..4ebf444 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A02_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A02.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A02.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -39,10 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -65,23 +59,19 @@
   }
 }
 
-
-
 test<T>(T? t0Instance) {
   if (t0Instance is S?) {
-    
-  t1Instance = t0Instance;
-//             ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  bar () {
     t1Instance = t0Instance;
 //               ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  }
 
+    bar () {
+      t1Instance = t0Instance;
+//                 ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    }
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A03_t01.dart
index 842c975..938260e 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A03.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A03.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A04_t01.dart
index 0a02d9c..3509aa6 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A04.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A04.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A05_t01.dart
index e3162cf..71df29a 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A05.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A05.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A06_t01.dart
index 6070315..ef1effb 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A06.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A06.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A07_t01.dart
index 8fd898c..35fe4f2 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A08_t01.dart
index 2c91bd6..65c824c 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_global_variable_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A01_t01.dart
index c23d661..fd6652e 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A01_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -38,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Object t1 = t0Instance;
@@ -65,10 +59,7 @@
   }
 }
 
-
-
 test<T extends B?>(T t0Instance) {
-  
   Object t1 = t0Instance;
 //         ^^^^^^^^^^
 // [analyzer] unspecified
@@ -80,7 +71,6 @@
 // [analyzer] unspecified
 // [cfe] unspecified
   }
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A02_t01.dart
index 5d08817..f2100be 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A02_t01.dart
@@ -24,12 +24,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A02.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A02.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -39,10 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Object t1 = t0Instance;
@@ -66,23 +60,19 @@
   }
 }
 
-
-
 test<T>(T? t0Instance) {
   if (t0Instance is S?) {
-    
-  Object t1 = t0Instance;
-//         ^^^^^^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
-
-  bar () {
     Object t1 = t0Instance;
 //           ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-  }
 
+    bar () {
+      Object t1 = t0Instance;
+//             ^^^^^^^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+    }
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A03_t01.dart
index 5f9ab20..3bebac6 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A03.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A03.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Object t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A04_t01.dart
index 5c0bf4a..4b659f3 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A04.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A04.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Object t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A05_t01.dart
index 45fb845..577fe68 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A05.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A05.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Object t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A06_t01.dart
index c83c26e..cc71cb5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A06.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A06.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Object t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A07_t01.dart
index 06dd3ec..bfa8c0e 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -39,9 +37,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Object t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A08_t01.dart
index 8fb6920..b380cf7 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_local_variable_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     Object t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A01_t01.dart
index 65935f5..0ebcee3 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A01_t01.dart
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -37,10 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 Object returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -62,15 +56,11 @@
 // [cfe] unspecified
 }
 
-
-
 test<T extends B?>(T t0Instance) {
-  
   Object returnValueLocalFunc() => t0Instance;
 //                              ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A02_t01.dart
index 61b75a5..56f5ee3 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A02_t01.dart
@@ -23,12 +23,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A02.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A02.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -38,10 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 Object returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
@@ -63,16 +57,12 @@
 // [cfe] unspecified
 }
 
-
-
 test<T>(T? t0Instance) {
   if (t0Instance is S?) {
-    
-  Object returnValueLocalFunc() => t0Instance;
-//                              ^^^^^^^^^^
+    Object returnValueLocalFunc() => t0Instance;
+//                                ^^^^^^^^^^
 // [analyzer] unspecified
 // [cfe] unspecified
-
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A03_t01.dart
index 6774ea7..8713872 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A03.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A03.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A04_t01.dart
index 96b1900..4a24019 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A04.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A04.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A05_t01.dart
index 224171e..3360204 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A05.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A05.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -38,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A06_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A06_t01.dart
index 161a051..f10baa2 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A06_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A06_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A06.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A06.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "dart:async";
@@ -38,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A07_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A07_t01.dart
index a126cb6..b679302 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A07_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A07_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A07.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A07.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -38,9 +36,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A08_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A08_t01.dart
index 0e7bc3b..461f2ec 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A08_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_fail_return_value_fail_A08_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -22,12 +22,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from right_object_fail_A08.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_fail_A08.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -36,9 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A01_t01.dart
index 793cc16..77bf859 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -54,20 +48,16 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  bar () {
+    bar () {
+      t1Instance = t0Instance;
+    }
+
     t1Instance = t0Instance;
-  }
-
-  t1Instance = t0Instance;
-  bar();
-  GlobalVariableTest t = new GlobalVariableTest();
-  t.foo();
-  GlobalVariableTest.test();
-
+    bar();
+    GlobalVariableTest t = new GlobalVariableTest();
+    t.foo();
+    GlobalVariableTest.test();
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A02_t01.dart
index c20f703..32abda8 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -54,21 +48,17 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  bar () {
+    bar () {
+      t1Instance = t0Instance;
+    }
+
     t1Instance = t0Instance;
-  }
-
-  t1Instance = t0Instance;
-  bar();
-  GlobalVariableTest t = new GlobalVariableTest();
-  t.foo();
-  GlobalVariableTest.test();
-
+    bar();
+    GlobalVariableTest t = new GlobalVariableTest();
+    t.foo();
+    GlobalVariableTest.test();
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A03_t01.dart
index 3fc7219..3a1f4e7 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -37,10 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -55,21 +49,17 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  bar () {
+    bar () {
+      t1Instance = t0Instance;
+    }
+
     t1Instance = t0Instance;
-  }
-
-  t1Instance = t0Instance;
-  bar();
-  GlobalVariableTest t = new GlobalVariableTest();
-  t.foo();
-  GlobalVariableTest.test();
-
+    bar();
+    GlobalVariableTest t = new GlobalVariableTest();
+    t.foo();
+    GlobalVariableTest.test();
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A04_t01.dart
index f55cfd0..b87260f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A05_t01.dart
index d64beeb..d46799c 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_global_variable_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A01_t01.dart
index 3cb13d4..14ce9c8 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -58,22 +52,18 @@
   }
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  foo() {
+    foo() {
+      Object t1 = t0Instance;
+      t1 = t0Instance;
+    }
+
     Object t1 = t0Instance;
     t1 = t0Instance;
-  }
-
-  Object t1 = t0Instance;
-  t1 = t0Instance;
-  foo();
-  LocalVariableTest x = new LocalVariableTest();
-  x.test();
-  LocalVariableTest.staticTest();
-
+    foo();
+    LocalVariableTest x = new LocalVariableTest();
+    x.test();
+    LocalVariableTest.staticTest();
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A02_t01.dart
index e955042..5451c4d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -58,23 +52,19 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  foo() {
+    foo() {
+      Object t1 = t0Instance;
+      t1 = t0Instance;
+    }
+
     Object t1 = t0Instance;
     t1 = t0Instance;
-  }
-
-  Object t1 = t0Instance;
-  t1 = t0Instance;
-  foo();
-  LocalVariableTest x = new LocalVariableTest();
-  x.test();
-  LocalVariableTest.staticTest();
-
+    foo();
+    LocalVariableTest x = new LocalVariableTest();
+    x.test();
+    LocalVariableTest.staticTest();
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A03_t01.dart
index 43e7f69..ea893b5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -37,10 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -59,23 +53,19 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  foo() {
+    foo() {
+      Object t1 = t0Instance;
+      t1 = t0Instance;
+    }
+
     Object t1 = t0Instance;
     t1 = t0Instance;
-  }
-
-  Object t1 = t0Instance;
-  t1 = t0Instance;
-  foo();
-  LocalVariableTest x = new LocalVariableTest();
-  x.test();
-  LocalVariableTest.staticTest();
-
+    foo();
+    LocalVariableTest x = new LocalVariableTest();
+    x.test();
+    LocalVariableTest.staticTest();
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A04_t01.dart
index ebfd0b3..c18e664 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A05_t01.dart
index c2de010..a1a26a4 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_local_variable_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A01_t01.dart
index a2f3581..a256d11 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class B {}
 class T0 extends B {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 Object returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -50,21 +44,16 @@
   Object get testGetter => t0Instance;
 }
 
-
-
 test<T extends B>(T t0Instance) {
-    
-  Object returnValueLocalFunc() => t0Instance;
+    Object returnValueLocalFunc() => t0Instance;
 
-  returnValueFunc();
-  returnValueLocalFunc();
+    returnValueFunc();
+    returnValueLocalFunc();
 
-  ReturnValueTest.staticTestMethod();
+    ReturnValueTest.staticTestMethod();
 
-  new ReturnValueTest().testMethod();
-  new ReturnValueTest().testGetter;
-
-
+    new ReturnValueTest().testMethod();
+    new ReturnValueTest().testGetter;
 }
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A02_t01.dart
index 65bbc7a..197c520 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A02_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X {}
 class S extends X {}
@@ -36,10 +34,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 Object returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -50,22 +44,17 @@
   Object get testGetter => t0Instance;
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  Object returnValueLocalFunc() => t0Instance;
+    Object returnValueLocalFunc() => t0Instance;
 
-  returnValueFunc();
-  returnValueLocalFunc();
+    returnValueFunc();
+    returnValueLocalFunc();
 
-  ReturnValueTest.staticTestMethod();
+    ReturnValueTest.staticTestMethod();
 
-  new ReturnValueTest().testMethod();
-  new ReturnValueTest().testGetter;
-
-
+    new ReturnValueTest().testMethod();
+    new ReturnValueTest().testGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A03_t01.dart
index a7d43c3..f4f9e7f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A03_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -21,12 +21,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 // Requirements=nnbd-weak
 import "../../utils/legacy_lib.dart";
@@ -37,10 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
-
 Object returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -51,22 +45,17 @@
   Object get testGetter => t0Instance;
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S) {
-    
-  Object returnValueLocalFunc() => t0Instance;
+    Object returnValueLocalFunc() => t0Instance;
 
-  returnValueFunc();
-  returnValueLocalFunc();
+    returnValueFunc();
+    returnValueLocalFunc();
 
-  ReturnValueTest.staticTestMethod();
+    ReturnValueTest.staticTestMethod();
 
-  new ReturnValueTest().testMethod();
-  new ReturnValueTest().testGetter;
-
-
+    new ReturnValueTest().testMethod();
+    new ReturnValueTest().testGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A04_t01.dart
index 87afd6c..bf2739a 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A04_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -60,5 +55,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A05_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A05_t01.dart
index 7524df3..5559cbd 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A05_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_object_return_value_A05_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
@@ -21,12 +21,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_object_A05.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_object_A05.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 import "dart:async";
 
@@ -37,9 +35,6 @@
 
 const t1Default = const Object();
 
-
-
-
 Object returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -60,5 +55,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t01.dart
index 0d9541f..05e8d3a 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_promoted_variable_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_promoted_variable_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X1 {
   const X1();
@@ -35,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 namedArgumentsFunc1(S1 t1, {S1 t2 = t1Default}) {}
 positionalArgumentsFunc1(S1 t1, [S1 t2 = t1Default]) {}
 
@@ -79,47 +74,41 @@
   set testSetter(X val) {}
 }
 
-
-
 main() {
   X1 t1Instance = new S1();
   if (t1Instance is S1) {
-    
-  // test functions
-  namedArgumentsFunc1(t0Instance, t2: t0Instance);
-  positionalArgumentsFunc1(t0Instance, t0Instance);
+    // test functions
+    namedArgumentsFunc1(t0Instance, t2: t0Instance);
+    positionalArgumentsFunc1(t0Instance, t0Instance);
 
-  // test class constructors
-  ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
-  instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
-  instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
+    // test class constructors
+    ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
+    instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
+    instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
 
-  // tests methods and setters
-  instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance1.positionalArgumentsMethod(t0Instance, t0Instance);
-  instance1.testSetter = t0Instance;
+    // tests methods and setters
+    instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance1.positionalArgumentsMethod(t0Instance, t0Instance);
+    instance1.testSetter = t0Instance;
 
-  // test static methods
-  ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
+    // test static methods
+    ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  // test generic functions
-  namedArgumentsFunc2<S1>(t0Instance, t2: t0Instance);
+    // test generic functions
+    namedArgumentsFunc2<S1>(t0Instance, t2: t0Instance);
 
-  // test generic class constructors
-  ArgumentsBindingGen<S1> instance2 = new ArgumentsBindingGen<S1>(t0Instance);
-  instance2 = new ArgumentsBindingGen<S1>.fNamed(t0Instance, t2: t0Instance);
-  instance2 = new ArgumentsBindingGen<S1>.named(t0Instance, t2: t0Instance);
+    // test generic class constructors
+    ArgumentsBindingGen<S1> instance2 = new ArgumentsBindingGen<S1>(t0Instance);
+    instance2 = new ArgumentsBindingGen<S1>.fNamed(t0Instance, t2: t0Instance);
+    instance2 = new ArgumentsBindingGen<S1>.named(t0Instance, t2: t0Instance);
 
-  // test generic class methods and setters
-  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance2.testSetter = t0Instance;
-  //# -->
-
+    // test generic class methods and setters
+    instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance2.testSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t02.dart
index 5241d12..a0f665e 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_promoted_variable_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_promoted_variable_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X1 {
   const X1();
@@ -35,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   S1 m = t1Default;
 
@@ -100,42 +95,35 @@
   }
 }
 
-
-
 main() {
   X1 t1Instance = new S1();
   if (t1Instance is S1) {
-    
-  ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c1(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c3(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c5(t0Instance);
+    ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c1(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c3(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c5(t0Instance);
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
+    // Test type parameters
+    ArgumentsBinding2_t02<S1> c2 =
+      new ArgumentsBinding2_t02<S1>(t0Instance);
+    c2 = new ArgumentsBinding2_t02<S1>.c2(t1Instance, t0Instance);
+    c2 = new ArgumentsBinding2_t02<S1>.c5(t0Instance);
 
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t02<S1> c2 =
-    new ArgumentsBinding2_t02<S1>(t0Instance);
-  c2 = new ArgumentsBinding2_t02<S1>.c2(t1Instance, t0Instance);
-  c2 = new ArgumentsBinding2_t02<S1>.c5(t0Instance);
-
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  c2.superGetter;
-  //# -->
-
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
+    c2.superGetter;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t03.dart
index 17a4521..298267d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_arguments_binding_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_promoted_variable_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_promoted_variable_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X1 {
   const X1();
@@ -35,10 +33,7 @@
 
 const t1Default = const S1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   S1 m = t1Default;
 
   void superTest(S1 val) {}
@@ -62,7 +57,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -77,32 +72,25 @@
   }
 }
 
-
-
 main() {
   X1 t1Instance = new S1();
   if (t1Instance is S1) {
-    
-  ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
+    ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
-
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t03<S1> c2 = new ArgumentsBinding2_t03<S1>();
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  //# -->
-
+    // Test type parameters
+    ArgumentsBinding2_t03<S1> c2 = new ArgumentsBinding2_t03<S1>();
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t01.dart
index 7bed816..3f26c73 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_promoted_variable_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_promoted_variable_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X1 {
   const X1();
@@ -35,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMember1_t01 {
   static S1 s = t0Instance;
   S1 m = t0Instance;
@@ -80,25 +75,21 @@
   static S1 get staticGetter => t0Instance;
 }
 
-
-
 main() {
   X1 t1Instance = new S1();
   if (t1Instance is S1) {
-    
-  ClassMember1_t01 c1 = new ClassMember1_t01();
-  c1 = new ClassMember1_t01.short(t0Instance,
-      t0Instance);
-  c1 = new ClassMember1_t01.named(t0Instance);
-  c1.m = t0Instance;
-  c1.test();
-  c1.setter = t0Instance;
-  c1.getter;
+    ClassMember1_t01 c1 = new ClassMember1_t01();
+    c1 = new ClassMember1_t01.short(t0Instance,
+        t0Instance);
+    c1 = new ClassMember1_t01.named(t0Instance);
+    c1.m = t0Instance;
+    c1.test();
+    c1.setter = t0Instance;
+    c1.getter;
 
-  ClassMember1_t01.s = t0Instance;
-  ClassMember1_t01.staticTest();
-  ClassMember1_t01.staticSetter = t0Instance;
-  ClassMember1_t01.staticGetter;
-
+    ClassMember1_t01.s = t0Instance;
+    ClassMember1_t01.staticTest();
+    ClassMember1_t01.staticSetter = t0Instance;
+    ClassMember1_t01.staticGetter;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t02.dart
index 89bcc76..4685c53 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t02.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_promoted_variable_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_promoted_variable_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X1 {
   const X1();
@@ -35,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   S1 m = t1Default;
 
@@ -68,18 +63,14 @@
   }
 }
 
-
-
 main() {
   X1 t1Instance = new S1();
   if (t1Instance is S1) {
-    
-  ClassMember1_t02 c1 = new ClassMember1_t02();
-  c1 = new ClassMember1_t02.short();
-  c1 = new ClassMember1_t02.named();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t02 c1 = new ClassMember1_t02();
+    c1 = new ClassMember1_t02.short();
+    c1 = new ClassMember1_t02.named();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t03.dart
index ad9e2f9..8f43bc0 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_class_member_A01_t03.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_promoted_variable_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_promoted_variable_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X1 {
   const X1();
@@ -35,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   S1 m = t1Default;
 
@@ -51,16 +46,12 @@
   }
 }
 
-
-
 main() {
   X1 t1Instance = new S1();
   if (t1Instance is S1) {
-    
-  ClassMember1_t03 c1 = new ClassMember1_t03();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t03 c1 = new ClassMember1_t03();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_global_variable_A01_t01.dart
index 8402ee0..2a220b2 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_global_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_promoted_variable_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_promoted_variable_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X1 {
   const X1();
@@ -35,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -52,21 +47,17 @@
   }
 }
 
-
-
 main() {
   X1 t1Instance = new S1();
   if (t1Instance is S1) {
-    
-  bar () {
+    bar () {
+      t1Instance = t0Instance;
+    }
+
     t1Instance = t0Instance;
-  }
-
-  t1Instance = t0Instance;
-  bar();
-  GlobalVariableTest t = new GlobalVariableTest();
-  t.foo();
-  GlobalVariableTest.test();
-
+    bar();
+    GlobalVariableTest t = new GlobalVariableTest();
+    t.foo();
+    GlobalVariableTest.test();
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_local_variable_A01_t01.dart
index 35f4a70..a98cf09 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_local_variable_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_promoted_variable_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_promoted_variable_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X1 {
   const X1();
@@ -35,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -56,23 +51,19 @@
   }
 }
 
-
-
 main() {
   X1 t1Instance = new S1();
   if (t1Instance is S1) {
-    
-  foo() {
+    foo() {
+      S1 t1 = t0Instance;
+      t1 = t0Instance;
+    }
+
     S1 t1 = t0Instance;
     t1 = t0Instance;
-  }
-
-  S1 t1 = t0Instance;
-  t1 = t0Instance;
-  foo();
-  LocalVariableTest x = new LocalVariableTest();
-  x.test();
-  LocalVariableTest.staticTest();
-
+    foo();
+    LocalVariableTest x = new LocalVariableTest();
+    x.test();
+    LocalVariableTest.staticTest();
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_return_value_A01_t01.dart
index b7b235f..8fc729d 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_promoted_variable_return_value_A01_t01.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_promoted_variable_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_promoted_variable_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X1 {
   const X1();
@@ -35,9 +33,6 @@
 
 const t1Default = const S1();
 
-
-
-
 S1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -48,22 +43,17 @@
   S1 get testGetter => t0Instance;
 }
 
-
-
 main() {
   X1 t1Instance = new S1();
   if (t1Instance is S1) {
-    
-  S1 returnValueLocalFunc() => t0Instance;
+    S1 returnValueLocalFunc() => t0Instance;
 
-  returnValueFunc();
-  returnValueLocalFunc();
+    returnValueFunc();
+    returnValueLocalFunc();
 
-  ReturnValueTest.staticTestMethod();
+    ReturnValueTest.staticTestMethod();
 
-  new ReturnValueTest().testMethod();
-  new ReturnValueTest().testGetter;
-
-
+    new ReturnValueTest().testMethod();
+    new ReturnValueTest().testGetter;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t01.dart
index 274aea6..47cf3df 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(Object? t1, {Object? t2 = t1Default}) {}
 positionalArgumentsFunc1(Object? t1, [Object? t2 = t1Default]) {}
 
@@ -94,7 +89,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object?>(t0Instance, t2: t0Instance);
 
@@ -106,5 +100,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t02.dart
index 2bc7b1d..e70dde9 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object? m = t1Default;
 
@@ -110,8 +105,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object?> c2 =
     new ArgumentsBinding2_t02<Object?>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Object?>.c2(t1Instance, t0Instance);
@@ -122,5 +115,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t03.dart
index ae1bed5..a6831d3 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A01_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,10 +25,7 @@
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Object? m = t1Default;
 
   void superTest(Object? val) {}
@@ -54,7 +49,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -82,12 +77,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object?> c2 = new ArgumentsBinding2_t03<Object?>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t01.dart
index 87a7259..67fa1c0 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(dynamic t1, {dynamic t2 = t1Default}) {}
 positionalArgumentsFunc1(dynamic t1, [dynamic t2 = t1Default]) {}
 
@@ -94,7 +89,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<dynamic>(t0Instance, t2: t0Instance);
 
@@ -106,5 +100,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t02.dart
index 204b1e4..c18fd43 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   dynamic m = t1Default;
 
@@ -110,8 +105,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<dynamic> c2 =
     new ArgumentsBinding2_t02<dynamic>(t0Instance);
   c2 = new ArgumentsBinding2_t02<dynamic>.c2(t1Instance, t0Instance);
@@ -122,5 +115,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t03.dart
index e8c765a..d5e4c01 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A02_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,10 +25,7 @@
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   dynamic m = t1Default;
 
   void superTest(dynamic val) {}
@@ -54,7 +49,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -82,12 +77,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<dynamic> c2 = new ArgumentsBinding2_t03<dynamic>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t01.dart
index a1992c5..01a979e 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "";
 Object? t1Instance = new Object();
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(Object? t1, {Object? t2 = t1Default}) {}
 positionalArgumentsFunc1(Object? t1, [Object? t2 = t1Default]) {}
 
@@ -92,7 +87,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<Object?>(t0Instance, t2: t0Instance);
 
@@ -104,5 +98,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t02.dart
index aef0520..ca118ab 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t02.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "";
 Object? t1Instance = new Object();
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   Object? m = t1Default;
 
@@ -108,8 +103,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<Object?> c2 =
     new ArgumentsBinding2_t02<Object?>(t0Instance);
   c2 = new ArgumentsBinding2_t02<Object?>.c2(t1Instance, t0Instance);
@@ -120,5 +113,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t03.dart
index 3b08047..7801b8c 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A03_t03.dart
@@ -13,22 +13,17 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "";
 Object? t1Instance = new Object();
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   Object? m = t1Default;
 
   void superTest(Object? val) {}
@@ -52,7 +47,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -80,12 +75,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<Object?> c2 = new ArgumentsBinding2_t03<Object?>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t01.dart
index c433511..87e3dc2 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 dynamic t1Instance = 2018;
 
 const t1Default = null;
 
-
-
-
 namedArgumentsFunc1(dynamic t1, {dynamic t2 = t1Default}) {}
 positionalArgumentsFunc1(dynamic t1, [dynamic t2 = t1Default]) {}
 
@@ -92,7 +87,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<dynamic>(t0Instance, t2: t0Instance);
 
@@ -104,5 +98,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t02.dart
index fc1d45f..a13d161 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t02.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 dynamic t1Instance = 2018;
 
 const t1Default = null;
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   dynamic m = t1Default;
 
@@ -108,8 +103,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<dynamic> c2 =
     new ArgumentsBinding2_t02<dynamic>(t0Instance);
   c2 = new ArgumentsBinding2_t02<dynamic>.c2(t1Instance, t0Instance);
@@ -120,5 +113,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t03.dart
index 2385944..9c15d12 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_arguments_binding_A04_t03.dart
@@ -13,22 +13,17 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 dynamic t1Instance = 2018;
 
 const t1Default = null;
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   dynamic m = t1Default;
 
   void superTest(dynamic val) {}
@@ -52,7 +47,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -80,12 +75,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<dynamic> c2 = new ArgumentsBinding2_t03<dynamic>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t01.dart
index eedd5d5..29145c5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static Object? s = t0Instance;
   Object? m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t02.dart
index 361a58f..4ce0f32 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t03.dart
index c9a48bc..a840378 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A01_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t01.dart
index b5a9de0..77f90d1 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static dynamic s = t0Instance;
   dynamic m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t02.dart
index d84bc18..8c1d8a3 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t02.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   dynamic m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t03.dart
index f790c58..155afe5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A02_t03.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   dynamic m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t01.dart
index 709f505..a98058f 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "";
 Object? t1Instance = new Object();
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static Object? s = t0Instance;
   Object? m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t02.dart
index d1f09de..da3504b 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t02.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "";
 Object? t1Instance = new Object();
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   Object? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t03.dart
index 76b7ae1..cf79c24 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A03_t03.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "";
 Object? t1Instance = new Object();
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   Object? m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t01.dart
index 82ff083..4cf2cb7 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 dynamic t1Instance = 2018;
 
 const t1Default = null;
 
-
-
-
 class ClassMember1_t01 {
   static dynamic s = t0Instance;
   dynamic m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t02.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t02.dart
index 67da10a..36e9de3 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t02.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 dynamic t1Instance = 2018;
 
 const t1Default = null;
 
-
-
-
 class ClassMemberSuper1_t02 {
   dynamic m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t03.dart b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t03.dart
index 3c3eafc..edebf95 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_class_member_A04_t03.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 dynamic t1Instance = 2018;
 
 const t1Default = null;
 
-
-
-
 class ClassMemberMixin1_t03 {
   dynamic m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A01_t01.dart
index e60f2bb..db421ee 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A02_t01.dart
index 0a579be..7ac384b 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A02_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A03_t01.dart
index e210a69..45442f7 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A03_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "";
 Object? t1Instance = new Object();
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A04_t01.dart
index 7a589fe..46a43e7 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_global_variable_A04_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 dynamic t1Instance = 2018;
 
 const t1Default = null;
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A01_t01.dart
index 2f5b961..716a60c 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A02_t01.dart
index 21c536c..5c2e276 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A02_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A03_t01.dart
index 08b5d8f..ce7d926 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A03_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "";
 Object? t1Instance = new Object();
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A04_t01.dart
index a33dd78..f0fa8f4 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_local_variable_A04_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 dynamic t1Instance = 2018;
 
 const t1Default = null;
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A01_t01.dart
index 7623fa7..a40b158 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A01_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 Object? returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -50,5 +45,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A02_t01.dart
index 4dbaf50..04ae7a5 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A02_t01.dart
@@ -13,12 +13,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T0 {}
 
@@ -27,9 +25,6 @@
 
 const t1Default = null;
 
-
-
-
 dynamic returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -50,5 +45,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A03_t01.dart
index dc08b42..d54235a 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A03_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 dynamic t0Instance = "";
 Object? t1Instance = new Object();
 
 const t1Default = null;
 
-
-
-
 Object? returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -48,5 +43,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A04_t01.dart b/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A04_t01.dart
index da9984c..652470e 100644
--- a/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A04_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/right_top_return_value_A04_t01.dart
@@ -13,21 +13,16 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from right_top_A04.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/right_top_A04.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 Object t0Instance = new Object();
 dynamic t1Instance = 2018;
 
 const t1Default = null;
 
-
-
-
 dynamic returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -48,5 +43,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t01.dart
index a99c8a0..83e8c0c 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -38,9 +36,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -105,7 +100,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
@@ -117,5 +111,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t02.dart
index 191399e..0c777bb 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -38,9 +36,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -121,8 +116,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
@@ -133,5 +126,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t03.dart
index 876b16a..a77053f 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A01_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -38,10 +36,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -65,7 +60,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -93,12 +88,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t01.dart
index 4e0f721..68b7f77 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -39,9 +37,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -106,7 +101,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
@@ -118,5 +112,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t02.dart
index e575132..c4c7404 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t02.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -39,9 +37,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -122,8 +117,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
@@ -134,5 +127,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t03.dart
index eff1978..ff787c0 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A02_t03.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -39,10 +37,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -66,7 +61,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -94,12 +89,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t01.dart
index 1fd0726..472ca15 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
@@ -108,7 +103,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<T1>(t0Instance, t2: t0Instance);
 
@@ -120,5 +114,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t02.dart
index 8873fb1..d82c412 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t02.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
@@ -124,8 +119,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<T1> c2 =
     new ArgumentsBinding2_t02<T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<T1>.c2(t1Instance, t0Instance);
@@ -136,5 +129,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t03.dart
index 08f73ee..8dd0d39 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_arguments_binding_A03_t03.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,10 +39,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   T1 m = t1Default;
 
   void superTest(T1 val) {}
@@ -68,7 +63,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -96,12 +91,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<T1> c2 = new ArgumentsBinding2_t03<T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t01.dart
index 11eec01..9bcdf1a 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -38,9 +36,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t02.dart
index e5d66cb..62d4be2 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -38,9 +36,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t03.dart
index 83d67d7..c7f5242 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A01_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -38,9 +36,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t01.dart
index ddfc6fa..ac877e9 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -39,9 +37,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t02.dart
index f103174..f8b3a83 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t02.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -39,9 +37,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t03.dart
index 98d5171..d61d0cb 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A02_t03.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -39,9 +37,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t01.dart
index e6f61e6..df53ad7 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMember1_t01 {
   static T1 s = t0Instance;
   T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t02.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t02.dart
index 36c1060..e9e71bc 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t02.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t03.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t03.dart
index 0af076b..b230adc 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_class_member_A03_t03.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberMixin1_t03 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_fail_A01_t01.dart
index e718655..257d31f 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_fail_A01_t01.dart
@@ -15,12 +15,10 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// arguments_binding_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/arguments_binding_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -40,9 +38,6 @@
 
 const t1Default = const T1();
 
-
-
-
 namedArgumentsFunc1(T1 t1, {T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(T1 t1, [T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_mixin_fail_A01_t01.dart
index c1c2fbf..240da5e 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_mixin_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// arguments_binding_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/arguments_binding_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,10 +39,7 @@
 
 const t1Default = const T1();
 
-
-
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(T1 val) {}
   void superTestPositioned(T1 val, [T1 val2 = t1Default]) {}
   void superTestNamed(T1 val, {T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_super_fail_A01_t01.dart
index 6ce7e31..749450d 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_arguments_binding_super_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// arguments_binding_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/arguments_binding_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_fail_A01_t01.dart
index d9ad619..54986ac 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// class_member_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/class_member_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberTestStatic {
   static T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_mixin_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_mixin_fail_A01_t01.dart
index b87581f..34a1d1f 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_mixin_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_mixin_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// class_member_mixin_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/class_member_mixin_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t03 {
   T1 m = t1Default;
   void set superSetter(T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_super_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_super_fail_A01_t01.dart
index 1789c36..9aa2503 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_super_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_class_member_super_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// class_member_super_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/class_member_super_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class ClassMemberSuper1_t02 {
   T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_global_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_global_variable_fail_A01_t01.dart
index 1d732e5..a4a7540 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_global_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_global_variable_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// global_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/global_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_local_variable_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_local_variable_fail_A01_t01.dart
index 1bcfb73..04df1b6 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_local_variable_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_local_variable_fail_A01_t01.dart
@@ -16,12 +16,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// local_variable_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/local_variable_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
   LocalVariableTest() {
     T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_return_value_fail_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_return_value_fail_A01_t01.dart
index a00547f..93d84f8 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_fail_return_value_fail_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_fail_return_value_fail_A01_t01.dart
@@ -15,12 +15,10 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 ///
-/// This test is generated from super_interface_fail_A01.dart and 
-/// return_value_fail_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_fail_A01.dart and 
+/// test_cases/return_value_fail_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -40,9 +38,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A01_t01.dart
index 69bab2a..65cfece 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -38,9 +36,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A02_t01.dart
index 09dbebf..c6bfbd6 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A02_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -39,9 +37,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A03_t01.dart
index 568aa58..22058ab 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_global_variable_A03_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A01_t01.dart
index 6e24d7f..24437a7 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -38,9 +36,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A02_t01.dart
index ae36351..2c42ed9 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A02_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -39,9 +37,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A03_t01.dart
index b7b1057..463b076 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_local_variable_A03_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A01_t01.dart
index c762501..27c9c96 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -38,9 +36,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -61,5 +56,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A02_t01.dart
index 35734bc..7f3ee71 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A02_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -39,9 +37,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -62,5 +57,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A03_t01.dart b/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A03_t01.dart
index d24bd06..8cdcc15 100644
--- a/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A03_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/super_interface_return_value_A03_t01.dart
@@ -15,12 +15,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from super_interface_A03.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/super_interface_A03.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class T1 {
   const T1();
@@ -41,9 +39,6 @@
 
 const t1Default = const T1();
 
-
-
-
 T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -64,5 +59,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t01.dart
index be47157..d748100 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A01.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A01.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -32,9 +30,6 @@
 
 const t1Default = const X0();
 
-
-
-
 namedArgumentsFunc1(X0 t1, {X0 t2 = t1Default}) {}
 positionalArgumentsFunc1(X0 t1, [X0 t2 = t1Default]) {}
 
@@ -76,47 +71,41 @@
   set testSetter(X val) {}
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
   if (t0Instance is S0) {
-    
-  // test functions
-  namedArgumentsFunc1(t0Instance, t2: t0Instance);
-  positionalArgumentsFunc1(t0Instance, t0Instance);
+    // test functions
+    namedArgumentsFunc1(t0Instance, t2: t0Instance);
+    positionalArgumentsFunc1(t0Instance, t0Instance);
 
-  // test class constructors
-  ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
-  instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
-  instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
+    // test class constructors
+    ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
+    instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
+    instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
 
-  // tests methods and setters
-  instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance1.positionalArgumentsMethod(t0Instance, t0Instance);
-  instance1.testSetter = t0Instance;
+    // tests methods and setters
+    instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance1.positionalArgumentsMethod(t0Instance, t0Instance);
+    instance1.testSetter = t0Instance;
 
-  // test static methods
-  ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
+    // test static methods
+    ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  // test generic functions
-  namedArgumentsFunc2<X0>(t0Instance, t2: t0Instance);
+    // test generic functions
+    namedArgumentsFunc2<X0>(t0Instance, t2: t0Instance);
 
-  // test generic class constructors
-  ArgumentsBindingGen<X0> instance2 = new ArgumentsBindingGen<X0>(t0Instance);
-  instance2 = new ArgumentsBindingGen<X0>.fNamed(t0Instance, t2: t0Instance);
-  instance2 = new ArgumentsBindingGen<X0>.named(t0Instance, t2: t0Instance);
+    // test generic class constructors
+    ArgumentsBindingGen<X0> instance2 = new ArgumentsBindingGen<X0>(t0Instance);
+    instance2 = new ArgumentsBindingGen<X0>.fNamed(t0Instance, t2: t0Instance);
+    instance2 = new ArgumentsBindingGen<X0>.named(t0Instance, t2: t0Instance);
 
-  // test generic class methods and setters
-  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance2.testSetter = t0Instance;
-  //# -->
-
+    // test generic class methods and setters
+    instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance2.testSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t02.dart
index a5458a8..baf7fcd 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A01.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A01.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -32,9 +30,6 @@
 
 const t1Default = const X0();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   X0 m = t1Default;
 
@@ -97,42 +92,35 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
   if (t0Instance is S0) {
-    
-  ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c1(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c3(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c5(t0Instance);
+    ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c1(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c3(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c5(t0Instance);
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
+    // Test type parameters
+    ArgumentsBinding2_t02<X0> c2 =
+      new ArgumentsBinding2_t02<X0>(t0Instance);
+    c2 = new ArgumentsBinding2_t02<X0>.c2(t1Instance, t0Instance);
+    c2 = new ArgumentsBinding2_t02<X0>.c5(t0Instance);
 
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t02<X0> c2 =
-    new ArgumentsBinding2_t02<X0>(t0Instance);
-  c2 = new ArgumentsBinding2_t02<X0>.c2(t1Instance, t0Instance);
-  c2 = new ArgumentsBinding2_t02<X0>.c5(t0Instance);
-
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  c2.superGetter;
-  //# -->
-
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
+    c2.superGetter;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t03.dart
index 0c7a917..f0d6f67 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A01_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A01.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A01.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -32,10 +30,7 @@
 
 const t1Default = const X0();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   X0 m = t1Default;
 
   void superTest(X0 val) {}
@@ -59,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -74,32 +69,25 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
   if (t0Instance is S0) {
-    
-  ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
+    ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
-
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t03<X0> c2 = new ArgumentsBinding2_t03<X0>();
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  //# -->
-
+    // Test type parameters
+    ArgumentsBinding2_t03<X0> c2 = new ArgumentsBinding2_t03<X0>();
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t01.dart
index 7e34512..0eb3faa 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A02.dart and 
-/// arguments_binding_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A02.dart and 
+/// test_cases/arguments_binding_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -27,15 +25,11 @@
 class S0 extends X0 {
 }
 
-
 S0 t0Instance = new S0();
 X0 t1Instance = new X0();
 
 const t1Default = const X0();
 
-
-
-
 namedArgumentsFunc1(X0 t1, {X0 t2 = t1Default}) {}
 positionalArgumentsFunc1(X0 t1, [X0 t2 = t1Default]) {}
 
@@ -77,47 +71,41 @@
   set testSetter(X val) {}
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  // test functions
-  namedArgumentsFunc1(t0Instance, t2: t0Instance);
-  positionalArgumentsFunc1(t0Instance, t0Instance);
+    // test functions
+    namedArgumentsFunc1(t0Instance, t2: t0Instance);
+    positionalArgumentsFunc1(t0Instance, t0Instance);
 
-  // test class constructors
-  ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
-  instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
-  instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
-  instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
+    // test class constructors
+    ArgumentsBindingClass instance1 = new ArgumentsBindingClass(t0Instance);
+    instance1 = new ArgumentsBindingClass.fNamed(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.fPositional(t0Instance, t0Instance);
+    instance1 = new ArgumentsBindingClass.named(t0Instance, t2: t0Instance);
+    instance1 = new ArgumentsBindingClass.positional(t0Instance, t0Instance);
 
-  // tests methods and setters
-  instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance1.positionalArgumentsMethod(t0Instance, t0Instance);
-  instance1.testSetter = t0Instance;
+    // tests methods and setters
+    instance1.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance1.positionalArgumentsMethod(t0Instance, t0Instance);
+    instance1.testSetter = t0Instance;
 
-  // test static methods
-  ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
-  ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
+    // test static methods
+    ArgumentsBindingClass.namedArgumentsStaticMethod(t0Instance, t2: t0Instance);
+    ArgumentsBindingClass.positionalArgumentsStaticMethod(t0Instance, t0Instance);
 
-  // Test type parameters
+    // Test type parameters
 
-  //# <-- NotGenericFunctionType
-  // test generic functions
-  namedArgumentsFunc2<X0>(t0Instance, t2: t0Instance);
+    // test generic functions
+    namedArgumentsFunc2<X0>(t0Instance, t2: t0Instance);
 
-  // test generic class constructors
-  ArgumentsBindingGen<X0> instance2 = new ArgumentsBindingGen<X0>(t0Instance);
-  instance2 = new ArgumentsBindingGen<X0>.fNamed(t0Instance, t2: t0Instance);
-  instance2 = new ArgumentsBindingGen<X0>.named(t0Instance, t2: t0Instance);
+    // test generic class constructors
+    ArgumentsBindingGen<X0> instance2 = new ArgumentsBindingGen<X0>(t0Instance);
+    instance2 = new ArgumentsBindingGen<X0>.fNamed(t0Instance, t2: t0Instance);
+    instance2 = new ArgumentsBindingGen<X0>.named(t0Instance, t2: t0Instance);
 
-  // test generic class methods and setters
-  instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
-  instance2.testSetter = t0Instance;
-  //# -->
-
+    // test generic class methods and setters
+    instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
+    instance2.testSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t02.dart
index a969d01..e9ec80d 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A02.dart and 
-/// arguments_binding_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A02.dart and 
+/// test_cases/arguments_binding_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -27,15 +25,11 @@
 class S0 extends X0 {
 }
 
-
 S0 t0Instance = new S0();
 X0 t1Instance = new X0();
 
 const t1Default = const X0();
 
-
-
-
 class ArgumentsBindingSuper1_t02 {
   X0 m = t1Default;
 
@@ -98,42 +92,35 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c1(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c3(t0Instance);
-  c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
-  c1 = new ArgumentsBinding1_t02.c5(t0Instance);
+    ArgumentsBinding1_t02 c1 = new ArgumentsBinding1_t02(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c1(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c2(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c3(t0Instance);
+    c1 = new ArgumentsBinding1_t02.c4(t1Instance, t0Instance);
+    c1 = new ArgumentsBinding1_t02.c5(t0Instance);
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
+    // Test type parameters
+    ArgumentsBinding2_t02<X0> c2 =
+      new ArgumentsBinding2_t02<X0>(t0Instance);
+    c2 = new ArgumentsBinding2_t02<X0>.c2(t1Instance, t0Instance);
+    c2 = new ArgumentsBinding2_t02<X0>.c5(t0Instance);
 
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t02<X0> c2 =
-    new ArgumentsBinding2_t02<X0>(t0Instance);
-  c2 = new ArgumentsBinding2_t02<X0>.c2(t1Instance, t0Instance);
-  c2 = new ArgumentsBinding2_t02<X0>.c5(t0Instance);
-
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  c2.superGetter;
-  //# -->
-
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
+    c2.superGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t03.dart
index 8b354ba..454e8b6 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_arguments_binding_A02_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A02.dart and 
-/// arguments_binding_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A02.dart and 
+/// test_cases/arguments_binding_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -27,16 +25,12 @@
 class S0 extends X0 {
 }
 
-
 S0 t0Instance = new S0();
 X0 t1Instance = new X0();
 
 const t1Default = const X0();
 
-
-
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   X0 m = t1Default;
 
   void superTest(X0 val) {}
@@ -60,7 +54,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -75,32 +69,25 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
+    ArgumentsBinding1_t03 c1 = new ArgumentsBinding1_t03();
 
-  c1.test(t0Instance, t1Instance);
-  c1.superTest(t0Instance);
-  c1.superTestPositioned(t0Instance);
-  c1.superTestPositioned(t1Instance, t0Instance);
-  c1.superTestNamed(t0Instance);
-  c1.superTestNamed(t1Instance, val2: t0Instance);
-  c1.superSetter = t0Instance;
-  c1.superGetter;
+    c1.test(t0Instance, t1Instance);
+    c1.superTest(t0Instance);
+    c1.superTestPositioned(t0Instance);
+    c1.superTestPositioned(t1Instance, t0Instance);
+    c1.superTestNamed(t0Instance);
+    c1.superTestNamed(t1Instance, val2: t0Instance);
+    c1.superSetter = t0Instance;
+    c1.superGetter;
 
-  // Test type parameters
-
-  //# <-- NotGenericFunctionType
-  ArgumentsBinding2_t03<X0> c2 = new ArgumentsBinding2_t03<X0>();
-  c2.test(t0Instance, t1Instance);
-  c2.superTest(t0Instance);
-  c2.superTestNamed(t1Instance, val2: t0Instance);
-  c2.superSetter = t0Instance;
-  //# -->
-
+    // Test type parameters
+    ArgumentsBinding2_t03<X0> c2 = new ArgumentsBinding2_t03<X0>();
+    c2.test(t0Instance, t1Instance);
+    c2.superTest(t0Instance);
+    c2.superTestNamed(t1Instance, val2: t0Instance);
+    c2.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t01.dart
index 69d9bac..0fd81be 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A01.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A01.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -32,9 +30,6 @@
 
 const t1Default = const X0();
 
-
-
-
 class ClassMember1_t01 {
   static X0 s = t0Instance;
   X0 m = t0Instance;
@@ -77,25 +72,21 @@
   static X0 get staticGetter => t0Instance;
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
   if (t0Instance is S0) {
-    
-  ClassMember1_t01 c1 = new ClassMember1_t01();
-  c1 = new ClassMember1_t01.short(t0Instance,
-      t0Instance);
-  c1 = new ClassMember1_t01.named(t0Instance);
-  c1.m = t0Instance;
-  c1.test();
-  c1.setter = t0Instance;
-  c1.getter;
+    ClassMember1_t01 c1 = new ClassMember1_t01();
+    c1 = new ClassMember1_t01.short(t0Instance,
+        t0Instance);
+    c1 = new ClassMember1_t01.named(t0Instance);
+    c1.m = t0Instance;
+    c1.test();
+    c1.setter = t0Instance;
+    c1.getter;
 
-  ClassMember1_t01.s = t0Instance;
-  ClassMember1_t01.staticTest();
-  ClassMember1_t01.staticSetter = t0Instance;
-  ClassMember1_t01.staticGetter;
-
+    ClassMember1_t01.s = t0Instance;
+    ClassMember1_t01.staticTest();
+    ClassMember1_t01.staticSetter = t0Instance;
+    ClassMember1_t01.staticGetter;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t02.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t02.dart
index 9895cb3..1a41247 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A01.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A01.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -32,9 +30,6 @@
 
 const t1Default = const X0();
 
-
-
-
 class ClassMemberSuper1_t02 {
   X0 m = t1Default;
 
@@ -65,18 +60,14 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
   if (t0Instance is S0) {
-    
-  ClassMember1_t02 c1 = new ClassMember1_t02();
-  c1 = new ClassMember1_t02.short();
-  c1 = new ClassMember1_t02.named();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t02 c1 = new ClassMember1_t02();
+    c1 = new ClassMember1_t02.short();
+    c1 = new ClassMember1_t02.named();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t03.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t03.dart
index 9311e2f..a7c61ab 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A01_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A01.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A01.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -32,9 +30,6 @@
 
 const t1Default = const X0();
 
-
-
-
 class ClassMemberMixin1_t03 {
   X0 m = t1Default;
 
@@ -48,16 +43,12 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
   if (t0Instance is S0) {
-    
-  ClassMember1_t03 c1 = new ClassMember1_t03();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t03 c1 = new ClassMember1_t03();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t01.dart
index 7de16c6..ac4b4e9 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A02.dart and 
-/// class_member_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A02.dart and 
+/// test_cases/class_member_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -27,15 +25,11 @@
 class S0 extends X0 {
 }
 
-
 S0 t0Instance = new S0();
 X0 t1Instance = new X0();
 
 const t1Default = const X0();
 
-
-
-
 class ClassMember1_t01 {
   static X0 s = t0Instance;
   X0 m = t0Instance;
@@ -78,25 +72,21 @@
   static X0 get staticGetter => t0Instance;
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  ClassMember1_t01 c1 = new ClassMember1_t01();
-  c1 = new ClassMember1_t01.short(t0Instance,
-      t0Instance);
-  c1 = new ClassMember1_t01.named(t0Instance);
-  c1.m = t0Instance;
-  c1.test();
-  c1.setter = t0Instance;
-  c1.getter;
+    ClassMember1_t01 c1 = new ClassMember1_t01();
+    c1 = new ClassMember1_t01.short(t0Instance,
+        t0Instance);
+    c1 = new ClassMember1_t01.named(t0Instance);
+    c1.m = t0Instance;
+    c1.test();
+    c1.setter = t0Instance;
+    c1.getter;
 
-  ClassMember1_t01.s = t0Instance;
-  ClassMember1_t01.staticTest();
-  ClassMember1_t01.staticSetter = t0Instance;
-  ClassMember1_t01.staticGetter;
-
+    ClassMember1_t01.s = t0Instance;
+    ClassMember1_t01.staticTest();
+    ClassMember1_t01.staticSetter = t0Instance;
+    ClassMember1_t01.staticGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t02.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t02.dart
index 6ae14ff..2f6e082 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t02.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A02.dart and 
-/// class_member_x02.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A02.dart and 
+/// test_cases/class_member_x02.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -27,15 +25,11 @@
 class S0 extends X0 {
 }
 
-
 S0 t0Instance = new S0();
 X0 t1Instance = new X0();
 
 const t1Default = const X0();
 
-
-
-
 class ClassMemberSuper1_t02 {
   X0 m = t1Default;
 
@@ -66,18 +60,14 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  ClassMember1_t02 c1 = new ClassMember1_t02();
-  c1 = new ClassMember1_t02.short();
-  c1 = new ClassMember1_t02.named();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t02 c1 = new ClassMember1_t02();
+    c1 = new ClassMember1_t02.short();
+    c1 = new ClassMember1_t02.named();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t03.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t03.dart
index ad4f353..8caefcd 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_class_member_A02_t03.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A02.dart and 
-/// class_member_x03.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A02.dart and 
+/// test_cases/class_member_x03.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -27,15 +25,11 @@
 class S0 extends X0 {
 }
 
-
 S0 t0Instance = new S0();
 X0 t1Instance = new X0();
 
 const t1Default = const X0();
 
-
-
-
 class ClassMemberMixin1_t03 {
   X0 m = t1Default;
 
@@ -49,16 +43,12 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  ClassMember1_t03 c1 = new ClassMember1_t03();
-  c1.m = t0Instance;
-  c1.test();
-  c1.superSetter = t0Instance;
-
+    ClassMember1_t03 c1 = new ClassMember1_t03();
+    c1.m = t0Instance;
+    c1.test();
+    c1.superSetter = t0Instance;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_global_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_global_variable_A01_t01.dart
index ce06cdc..4b87e11 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_global_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_global_variable_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A01.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A01.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -32,9 +30,6 @@
 
 const t1Default = const X0();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -49,21 +44,17 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
   if (t0Instance is S0) {
-    
-  bar () {
+    bar () {
+      t1Instance = t0Instance;
+    }
+
     t1Instance = t0Instance;
-  }
-
-  t1Instance = t0Instance;
-  bar();
-  GlobalVariableTest t = new GlobalVariableTest();
-  t.foo();
-  GlobalVariableTest.test();
-
+    bar();
+    GlobalVariableTest t = new GlobalVariableTest();
+    t.foo();
+    GlobalVariableTest.test();
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_global_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_global_variable_A02_t01.dart
index d905778..8728155 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_global_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_global_variable_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A02.dart and 
-/// global_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A02.dart and 
+/// test_cases/global_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -27,15 +25,11 @@
 class S0 extends X0 {
 }
 
-
 S0 t0Instance = new S0();
 X0 t1Instance = new X0();
 
 const t1Default = const X0();
 
-
-
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
@@ -50,21 +44,17 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  bar () {
+    bar () {
+      t1Instance = t0Instance;
+    }
+
     t1Instance = t0Instance;
-  }
-
-  t1Instance = t0Instance;
-  bar();
-  GlobalVariableTest t = new GlobalVariableTest();
-  t.foo();
-  GlobalVariableTest.test();
-
+    bar();
+    GlobalVariableTest t = new GlobalVariableTest();
+    t.foo();
+    GlobalVariableTest.test();
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_local_variable_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_local_variable_A01_t01.dart
index 0aaac64..202ad49 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_local_variable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_local_variable_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A01.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A01.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -32,9 +30,6 @@
 
 const t1Default = const X0();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -53,23 +48,19 @@
   }
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
   if (t0Instance is S0) {
-    
-  foo() {
+    foo() {
+      X0 t1 = t0Instance;
+      t1 = t0Instance;
+    }
+
     X0 t1 = t0Instance;
     t1 = t0Instance;
-  }
-
-  X0 t1 = t0Instance;
-  t1 = t0Instance;
-  foo();
-  LocalVariableTest x = new LocalVariableTest();
-  x.test();
-  LocalVariableTest.staticTest();
-
+    foo();
+    LocalVariableTest x = new LocalVariableTest();
+    x.test();
+    LocalVariableTest.staticTest();
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_local_variable_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_local_variable_A02_t01.dart
index 9924ef5..098f9d0 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_local_variable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_local_variable_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A02.dart and 
-/// local_variable_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A02.dart and 
+/// test_cases/local_variable_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -27,15 +25,11 @@
 class S0 extends X0 {
 }
 
-
 S0 t0Instance = new S0();
 X0 t1Instance = new X0();
 
 const t1Default = const X0();
 
-
-
-
 class LocalVariableTest {
 
   LocalVariableTest() {
@@ -54,23 +48,19 @@
   }
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  foo() {
+    foo() {
+      X0 t1 = t0Instance;
+      t1 = t0Instance;
+    }
+
     X0 t1 = t0Instance;
     t1 = t0Instance;
-  }
-
-  X0 t1 = t0Instance;
-  t1 = t0Instance;
-  foo();
-  LocalVariableTest x = new LocalVariableTest();
-  x.test();
-  LocalVariableTest.staticTest();
-
+    foo();
+    LocalVariableTest x = new LocalVariableTest();
+    x.test();
+    LocalVariableTest.staticTest();
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_return_value_A01_t01.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_return_value_A01_t01.dart
index c6703a8..2f5fcc9 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_return_value_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_return_value_A01_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A01.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A01.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -32,9 +30,6 @@
 
 const t1Default = const X0();
 
-
-
-
 X0 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -45,22 +40,17 @@
   X0 get testGetter => t0Instance;
 }
 
-
-
 main() {
   X0 t0Instance = new S0();
   if (t0Instance is S0) {
-    
-  X0 returnValueLocalFunc() => t0Instance;
+    X0 returnValueLocalFunc() => t0Instance;
 
-  returnValueFunc();
-  returnValueLocalFunc();
+    returnValueFunc();
+    returnValueLocalFunc();
 
-  ReturnValueTest.staticTestMethod();
+    ReturnValueTest.staticTestMethod();
 
-  new ReturnValueTest().testMethod();
-  new ReturnValueTest().testGetter;
-
-
+    new ReturnValueTest().testMethod();
+    new ReturnValueTest().testGetter;
   }
 }
diff --git a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_return_value_A02_t01.dart b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_return_value_A02_t01.dart
index c7d5d1b..ed0d5e8 100644
--- a/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_return_value_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/generated/type_variable_reflexivity_1_return_value_A02_t01.dart
@@ -14,12 +14,10 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 ///
-/// This test is generated from type_variable_reflexivity_1_A02.dart and 
-/// return_value_x01.dart.
-/// Don't modify it. If you want to change this test, change one of the files 
-/// above and then run generator.dart to regenerate the tests.
-
-
+/// This test is generated from test_types/type_variable_reflexivity_1_A02.dart and 
+/// test_cases/return_value_x01.dart. Don't modify it! 
+/// If you need to change this test, then change one of the files above and then 
+/// run generator/generator.dart to regenerate the tests.
 
 class X0 {
   const X0();
@@ -27,15 +25,11 @@
 class S0 extends X0 {
 }
 
-
 S0 t0Instance = new S0();
 X0 t1Instance = new X0();
 
 const t1Default = const X0();
 
-
-
-
 X0 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -46,22 +40,17 @@
   X0 get testGetter => t0Instance;
 }
 
-
-
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  
-  X0 returnValueLocalFunc() => t0Instance;
+    X0 returnValueLocalFunc() => t0Instance;
 
-  returnValueFunc();
-  returnValueLocalFunc();
+    returnValueFunc();
+    returnValueLocalFunc();
 
-  ReturnValueTest.staticTestMethod();
+    ReturnValueTest.staticTestMethod();
 
-  new ReturnValueTest().testMethod();
-  new ReturnValueTest().testGetter;
-
-
+    new ReturnValueTest().testMethod();
+    new ReturnValueTest().testGetter;
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_fail_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_fail_x01.dart
index 7e1cd33..f73e019 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_fail_x01.dart
@@ -7,7 +7,6 @@
 /// tested.
 /// @author sgrekhov@unipro.ru
 
-
 namedArgumentsFunc1(@T1 t1, {@T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(@T1 t1, [@T1 t2 = t1Default]) {}
 
diff --git a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_mixin_fail_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_mixin_fail_x01.dart
index 85adfdc..9dc79db 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_mixin_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_mixin_fail_x01.dart
@@ -8,8 +8,7 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 
-
-class ArgumentsBindingSuper1_t03 {
+mixin ArgumentsBindingSuper1_t03 {
   void superTest(@T1 val) {}
   void superTestPositioned(@T1 val, [@T1 val2 = t1Default]) {}
   void superTestNamed(@T1 val, {@T1 val2 = t1Default}) {}
diff --git a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_super_fail_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_super_fail_x01.dart
index 4e494f2..126bc08 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_super_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_super_fail_x01.dart
@@ -8,7 +8,6 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 
-
 class ArgumentsBindingSuper1_t02 {
   @T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x01.dart
index 46503e6..14d8e38 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x01.dart
@@ -6,7 +6,6 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 
-
 namedArgumentsFunc1(@T1 t1, {@T1 t2 = t1Default}) {}
 positionalArgumentsFunc1(@T1 t1, [@T1 t2 = t1Default]) {}
 
@@ -71,7 +70,6 @@
 
   // Test type parameters
 
-  //# <-- NotGenericFunctionType
   // test generic functions
   namedArgumentsFunc2<@T1>(t0Instance, t2: t0Instance);
 
@@ -83,5 +81,4 @@
   // test generic class methods and setters
   instance2.namedArgumentsMethod(t0Instance, t2: t0Instance);
   instance2.testSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x02.dart b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x02.dart
index 1366ae0..5302c64 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x02.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x02.dart
@@ -6,7 +6,6 @@
 /// of T0 can be used as an argument of type T1. Test superclass members
 /// @author sgrekhov@unipro.ru
 
-
 class ArgumentsBindingSuper1_t02 {
   @T1 m = t1Default;
 
@@ -87,8 +86,6 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t02<@T1> c2 =
     new ArgumentsBinding2_t02<@T1>(t0Instance);
   c2 = new ArgumentsBinding2_t02<@T1>.c2(t1Instance, t0Instance);
@@ -99,5 +96,4 @@
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
   c2.superGetter;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x03.dart b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x03.dart
index 048aeff..23ac83c 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x03.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/arguments_binding_x03.dart
@@ -6,8 +6,7 @@
 /// of T0 can be used as an argument of type T1. Test mixin members
 /// @author sgrekhov@unipro.ru
 
-
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   @T1 m = t1Default;
 
   void superTest(@T1 val) {}
@@ -31,7 +30,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
@@ -59,12 +58,9 @@
   c1.superGetter;
 
   // Test type parameters
-
-  //# <-- NotGenericFunctionType
   ArgumentsBinding2_t03<@T1> c2 = new ArgumentsBinding2_t03<@T1>();
   c2.test(t0Instance, t1Instance);
   c2.superTest(t0Instance);
   c2.superTestNamed(t1Instance, val2: t0Instance);
   c2.superSetter = t0Instance;
-  //# -->
 }
diff --git a/LanguageFeatures/Subtyping/static/test_cases/class_member_fail_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/class_member_fail_x01.dart
index 12be375..ff3d9f5 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/class_member_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/class_member_fail_x01.dart
@@ -8,7 +8,6 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 
-
 class ClassMemberTestStatic {
   static @T1 s = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/test_cases/class_member_mixin_fail_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/class_member_mixin_fail_x01.dart
index 896f6f9..8d9af92 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/class_member_mixin_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/class_member_mixin_fail_x01.dart
@@ -8,7 +8,6 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 
-
 class ClassMemberSuper1_t03 {
   @T1 m = t1Default;
   void set superSetter(@T1 val) {}
diff --git a/LanguageFeatures/Subtyping/static/test_cases/class_member_super_fail_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/class_member_super_fail_x01.dart
index fcbcfc8..99a7fea 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/class_member_super_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/class_member_super_fail_x01.dart
@@ -8,7 +8,6 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 
-
 class ClassMemberSuper1_t02 {
   @T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/test_cases/class_member_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/class_member_x01.dart
index 9c7ae51..8931509 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/class_member_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/class_member_x01.dart
@@ -6,7 +6,6 @@
 /// of T0 can be assigned to the class member of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class ClassMember1_t01 {
   static @T1 s = t0Instance;
   @T1 m = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/test_cases/class_member_x02.dart b/LanguageFeatures/Subtyping/static/test_cases/class_member_x02.dart
index 6d829a1..8411321 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/class_member_x02.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/class_member_x02.dart
@@ -6,7 +6,6 @@
 /// of T0 can be assigned to the superclass member of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class ClassMemberSuper1_t02 {
   @T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/test_cases/class_member_x03.dart b/LanguageFeatures/Subtyping/static/test_cases/class_member_x03.dart
index bd8e1f5..514e1a9 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/class_member_x03.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/class_member_x03.dart
@@ -6,7 +6,6 @@
 /// of T0 can be assigned to the mixin member of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class ClassMemberMixin1_t03 {
   @T1 m = t1Default;
 
diff --git a/LanguageFeatures/Subtyping/static/test_cases/global_variable_fail_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/global_variable_fail_x01.dart
index 8693443..560e093 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/global_variable_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/global_variable_fail_x01.dart
@@ -8,7 +8,6 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/test_cases/global_variable_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/global_variable_x01.dart
index 0729c62..4033166 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/global_variable_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/global_variable_x01.dart
@@ -6,7 +6,6 @@
 /// of T0 can be assigned to the to global variable of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class GlobalVariableTest {
   GlobalVariableTest() {
     t1Instance = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/test_cases/local_variable_fail_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/local_variable_fail_x01.dart
index f918c53..c0a2bbb 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/local_variable_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/local_variable_fail_x01.dart
@@ -8,7 +8,6 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 
-
 class LocalVariableTest {
   LocalVariableTest() {
     @T1 t1 = t0Instance;
diff --git a/LanguageFeatures/Subtyping/static/test_cases/local_variable_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/local_variable_x01.dart
index 288ecd0..ac5ac67 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/local_variable_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/local_variable_x01.dart
@@ -6,7 +6,6 @@
 /// of T0 can be assigned to the to local variable of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class LocalVariableTest {
 
   LocalVariableTest() {
diff --git a/LanguageFeatures/Subtyping/static/test_cases/return_value_fail_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/return_value_fail_x01.dart
index 9257fd7..b9c5f4b 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/return_value_fail_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/return_value_fail_x01.dart
@@ -7,7 +7,6 @@
 /// @author sgrekhov@unipro.ru
 /// @author ngl@unipro.ru
 
-
 @T1 returnValueFunc() => t0Instance;
 //                       ^^^^^^^^^^
 // [analyzer] unspecified
diff --git a/LanguageFeatures/Subtyping/static/test_cases/return_value_x01.dart b/LanguageFeatures/Subtyping/static/test_cases/return_value_x01.dart
index ad4c21c..be8112c 100644
--- a/LanguageFeatures/Subtyping/static/test_cases/return_value_x01.dart
+++ b/LanguageFeatures/Subtyping/static/test_cases/return_value_x01.dart
@@ -6,7 +6,6 @@
 /// of T0 can be used as a return value of type T1
 /// @author sgrekhov@unipro.ru
 
-
 @T1 returnValueFunc() => t0Instance;
 
 class ReturnValueTest {
@@ -27,5 +26,4 @@
 
   new ReturnValueTest().testMethod();
   new ReturnValueTest().testGetter;
-
 }
diff --git a/LanguageFeatures/Subtyping/static/test_types/left_null_fail_A02.dart b/LanguageFeatures/Subtyping/static/test_types/left_null_fail_A02.dart
index 330c026..bc92caf 100644
--- a/LanguageFeatures/Subtyping/static/test_types/left_null_fail_A02.dart
+++ b/LanguageFeatures/Subtyping/static/test_types/left_null_fail_A02.dart
@@ -12,7 +12,6 @@
 /// @description Check that otherwise, the query is false. Test some class S
 /// @author sgrekhov@unipro.ru
 
-
 Null t0Instance = null;
 Object t1Instance = new Object();
 
diff --git a/LanguageFeatures/Subtyping/static/test_types/left_null_fail_A03.dart b/LanguageFeatures/Subtyping/static/test_types/left_null_fail_A03.dart
index 330c026..bc92caf 100644
--- a/LanguageFeatures/Subtyping/static/test_types/left_null_fail_A03.dart
+++ b/LanguageFeatures/Subtyping/static/test_types/left_null_fail_A03.dart
@@ -12,7 +12,6 @@
 /// @description Check that otherwise, the query is false. Test some class S
 /// @author sgrekhov@unipro.ru
 
-
 Null t0Instance = null;
 Object t1Instance = new Object();
 
diff --git a/LanguageFeatures/Subtyping/static/test_types/left_nullable_fail_A01.dart b/LanguageFeatures/Subtyping/static/test_types/left_nullable_fail_A01.dart
index 51ec41b..3eb6879 100644
--- a/LanguageFeatures/Subtyping/static/test_types/left_nullable_fail_A01.dart
+++ b/LanguageFeatures/Subtyping/static/test_types/left_nullable_fail_A01.dart
@@ -10,7 +10,6 @@
 /// subtype T1 then T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 
-
 class T1 {
   const T1();
 }
diff --git a/LanguageFeatures/Subtyping/static/test_types/left_promoted_variable_A02.dart b/LanguageFeatures/Subtyping/static/test_types/left_promoted_variable_A02.dart
index 5245d7c..e6f1621 100644
--- a/LanguageFeatures/Subtyping/static/test_types/left_promoted_variable_A02.dart
+++ b/LanguageFeatures/Subtyping/static/test_types/left_promoted_variable_A02.dart
@@ -28,7 +28,7 @@
 
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  //# <!-- Test body -->
+    //# <!-- Test body -->
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/test_types/type_variable_reflexivity_1_A02.dart b/LanguageFeatures/Subtyping/static/test_types/type_variable_reflexivity_1_A02.dart
index 5cfbe93..5a54a6f 100644
--- a/LanguageFeatures/Subtyping/static/test_types/type_variable_reflexivity_1_A02.dart
+++ b/LanguageFeatures/Subtyping/static/test_types/type_variable_reflexivity_1_A02.dart
@@ -28,7 +28,7 @@
 
 test<T>(T t0Instance) {
   if (t0Instance is S0) {
-  //# <!-- Test body -->
+    //# <!-- Test body -->
   }
 }
 
diff --git a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t01.dart b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t01.dart
index 7fa9fea..ad5e825 100644
--- a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t01.dart
@@ -8,7 +8,6 @@
 /// @description Check that if type T0 is Never then T0 is a subtype of T1
 /// @author sgrekhov@unipro.ru
 
-
 class T1 {}
 
 test(Never n) {
diff --git a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t03.dart b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t03.dart
index 716ffce..ecb0144 100644
--- a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t03.dart
+++ b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t03.dart
@@ -9,6 +9,7 @@
 /// @author sgrekhov@unipro.ru
 
 import "../../../../Utils/expect.dart";
+
 class T1 {}
 
 class C<X extends T1> {}
diff --git a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t04.dart b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t04.dart
index 2e29531..0660f01 100644
--- a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t04.dart
+++ b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t04.dart
@@ -9,6 +9,7 @@
 /// @author sgrekhov@unipro.ru
 
 import "../../../../Utils/expect.dart";
+
 class T1 {}
 
 class C<X extends T1> {}
diff --git a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t05.dart b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t05.dart
index a12f3dd..9b97993 100644
--- a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t05.dart
+++ b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t05.dart
@@ -8,7 +8,6 @@
 /// @description Check that Never is a valid super-bounded type argument
 /// @author sgrekhov@unipro.ru
 
-
 class C<X extends C<X>> {}
 
 main() {
diff --git a/LanguageFeatures/Subtyping/static/tests/left_null_A01_t01.dart b/LanguageFeatures/Subtyping/static/tests/left_null_A01_t01.dart
index e2685a0..ed36f28 100644
--- a/LanguageFeatures/Subtyping/static/tests/left_null_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/tests/left_null_A01_t01.dart
@@ -13,7 +13,6 @@
 /// is not subtype of a type T1.
 /// @author sgrekhov@unipro.ru
 
-
 class T1 {}
 
 T test<T>(T t, Null n) {
diff --git a/LanguageFeatures/Subtyping/static/tests/right_legacy_A01.dart b/LanguageFeatures/Subtyping/static/tests/right_legacy_A01.dart
index 9242fc5..9c4694d 100644
--- a/LanguageFeatures/Subtyping/static/tests/right_legacy_A01.dart
+++ b/LanguageFeatures/Subtyping/static/tests/right_legacy_A01.dart
@@ -11,6 +11,7 @@
 /// @author sgrekhov@unipro.ru
 
 // Requirements=nnbd-weak
+
 import "../../utils/legacy_lib.dart";
 
 class S1 {
diff --git a/LanguageFeatures/Subtyping/static/tests/right_legacy_fail_A01.dart b/LanguageFeatures/Subtyping/static/tests/right_legacy_fail_A01.dart
index 0733360..16da9dc 100644
--- a/LanguageFeatures/Subtyping/static/tests/right_legacy_fail_A01.dart
+++ b/LanguageFeatures/Subtyping/static/tests/right_legacy_fail_A01.dart
@@ -11,6 +11,7 @@
 /// @author sgrekhov@unipro.ru
 
 // Requirements=nnbd-weak
+
 import "../../utils/legacy_lib.dart";
 
 class S1 {
diff --git a/LanguageFeatures/Subtyping/static/tests/right_nullable_A01_t01.dart b/LanguageFeatures/Subtyping/static/tests/right_nullable_A01_t01.dart
index c583d9b..744ad8e 100644
--- a/LanguageFeatures/Subtyping/static/tests/right_nullable_A01_t01.dart
+++ b/LanguageFeatures/Subtyping/static/tests/right_nullable_A01_t01.dart
@@ -14,7 +14,6 @@
 /// T0 is subtype of T1.
 /// @author sgrekhov@unipro.ru
 
-
 class S1 {
   const S1();
 }
diff --git a/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t01.dart b/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t01.dart
index 4da5450..ebc5ce5 100644
--- a/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t01.dart
+++ b/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t01.dart
@@ -15,7 +15,6 @@
 /// of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class S1 {
   const S1();
 }
diff --git a/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t02.dart b/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t02.dart
index ee8c3a1..72f9924 100644
--- a/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t02.dart
+++ b/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t02.dart
@@ -10,12 +10,11 @@
 ///  or T0 <: Null
 ///  or T0 is X0 and X0 has bound S0 and S0 <: T1
 ///  or T0 is X0 & S0 and S0 <: T1
-/// @description Check that if type T1 is S1? and T0 is X0 & S0 and S0 <: T1 then
-/// T0 is subtype of T1. Test that if type T0 is a subtype of a type T1, then instance
-/// of T0 can be used as an argument of type T1
+/// @description Check that if type T1 is S1? and T0 is X0 & S0 and S0 <: T1
+/// then T0 is subtype of T1. Test that if type T0 is a subtype of a type T1,
+/// then instance of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class S1 {
   const S1();
 }
@@ -114,7 +113,6 @@
     c1.superGetter;
 
     // Test type parameters
-
     ArgumentsBinding2_t02<S1?> c2 = new ArgumentsBinding2_t02<S1?>(t0Instance);
     c2 = new ArgumentsBinding2_t02<S1?>.c2(t1Instance, t0Instance);
     c2 = new ArgumentsBinding2_t02<S1?>.c5(t0Instance);
diff --git a/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t03.dart b/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t03.dart
index 06a6604..69cb2fe 100644
--- a/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t03.dart
+++ b/LanguageFeatures/Subtyping/static/tests/right_nullable_A02_t03.dart
@@ -10,12 +10,11 @@
 ///  or T0 <: Null
 ///  or T0 is X0 and X0 has bound S0 and S0 <: T1
 ///  or T0 is X0 & S0 and S0 <: T1
-/// @description Check that if type T1 is S1? and T0 is X0 & S0 and S0 <: T1 then
-/// T0 is subtype of T1. Test that if type T0 is a subtype of a type T1, then instance
-/// of T0 can be used as an argument of type T1
+/// @description Check that if type T1 is S1? and T0 is X0 & S0 and S0 <: T1
+/// then T0 is subtype of T1. Test that if type T0 is a subtype of a type T1,
+/// then instance of T0 can be used as an argument of type T1
 /// @author sgrekhov@unipro.ru
 
-
 class S1 {
   const S1();
 }
@@ -27,7 +26,7 @@
 
 const t1Default = const S1();
 
-class ArgumentsBindingMixin1_t03 {
+mixin ArgumentsBindingMixin1_t03 {
   S1? m = t1Default;
 
   void superTest(S1? val) {}
@@ -51,7 +50,7 @@
   }
 }
 
-class ArgumentsBindingMixin2_t03<X> {
+mixin ArgumentsBindingMixin2_t03<X> {
   void superTest(X val) {}
   void superTestNamed(X val, {required X val2}) {}
   void set superSetter(X val) {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A06.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A06.dart
index e3954cc..c3a13d4 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A06.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A06.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with positional arguments
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A07.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A07.dart
index 9c5bac0..e1d35fe 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A07.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A07.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with positional arguments
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A08.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A08.dart
index 801ae5a..5c4ef15 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A08.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A08.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void function with named arguments
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A09.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A09.dart
index 24537fe..b513f48 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A09.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A09.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void function with named arguments
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A10.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A10.dart
index 0448e5c..eec8d54 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A10.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A10.dart
@@ -5,8 +5,9 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A11.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A11.dart
index ad791cb..6169281 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A11.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A11.dart
@@ -5,9 +5,9 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function without actual arguments
-/// but returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function without actual
+/// arguments but returning some value
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A12.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A12.dart
index 0d58d0c..a1b5354 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A12.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A12.dart
@@ -5,9 +5,9 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test generic function without actual arguments but
-/// returning some value
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test generic function without actual arguments
+/// but returning some value
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A13.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A13.dart
index 5a8db05..2c0741b 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A13.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A13.dart
@@ -5,8 +5,9 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A14.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A14.dart
index a20b5d6..e632707 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A14.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A14.dart
@@ -5,8 +5,9 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with required arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with required
+/// arguments
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A15.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A15.dart
index fbb4e02..b197e55 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A15.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A15.dart
@@ -5,8 +5,9 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with positional arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with positional
+/// arguments
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A16.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A16.dart
index 82474fa..b861d5a 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A16.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A16.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with positional
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with positional
 /// arguments
 /// @author sgrekhov@unipro.ru
 
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A17.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A17.dart
index 69da89e..aa1a33a 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A17.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A17.dart
@@ -5,8 +5,8 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test void generic function with named arguments
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/function_type_function_A18.dart b/LanguageFeatures/Subtyping/test_types/function_type_function_A18.dart
index 5cc1fa3..4e84e73 100644
--- a/LanguageFeatures/Subtyping/test_types/function_type_function_A18.dart
+++ b/LanguageFeatures/Subtyping/test_types/function_type_function_A18.dart
@@ -5,8 +5,9 @@
 /// @assertion We say that a type T0 is a subtype of a type T1 (written T0 <: T1)
 /// when:
 /// Function Type/Function: T0 is a function type and T1 is Function
-/// @description Check that if type T0 is a function type and T1 is Function then
-/// T0 is a subtype of T1. Test non-void generic function with named arguments
+/// @description Check that if type T0 is a function type and T1 is Function
+/// then T0 is a subtype of T1. Test non-void generic function with named
+/// arguments
 /// @author sgrekhov@unipro.ru
 
 class C {}
diff --git a/LanguageFeatures/Subtyping/test_types/left_FutureOr_fail_A01.dart b/LanguageFeatures/Subtyping/test_types/left_FutureOr_fail_A01.dart
index 33f4109..8d39ec5 100644
--- a/LanguageFeatures/Subtyping/test_types/left_FutureOr_fail_A01.dart
+++ b/LanguageFeatures/Subtyping/test_types/left_FutureOr_fail_A01.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 
 import "dart:async";
diff --git a/LanguageFeatures/Subtyping/test_types/left_FutureOr_fail_A02.dart b/LanguageFeatures/Subtyping/test_types/left_FutureOr_fail_A02.dart
index 4ca7cef..8959609 100644
--- a/LanguageFeatures/Subtyping/test_types/left_FutureOr_fail_A02.dart
+++ b/LanguageFeatures/Subtyping/test_types/left_FutureOr_fail_A02.dart
@@ -8,8 +8,8 @@
 ///   and Future<S0> <: T1
 ///   and S0 <: T1
 /// @description Check that if a type T0 is FutureOr<S0> and S0 is a subtype of
-/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype of
-/// a type T1.
+/// T1 but Future<S0> is not a subtype of T1 , then a type T0 is not a subtype
+/// of a type T1.
 /// @author sgrekhov@unipro.ru
 
 import "dart:async";
diff --git a/LanguageFeatures/Subtyping/test_types/left_legacy_fail_A01.dart b/LanguageFeatures/Subtyping/test_types/left_legacy_fail_A01.dart
index a6f9b79..1bdb874 100644
--- a/LanguageFeatures/Subtyping/test_types/left_legacy_fail_A01.dart
+++ b/LanguageFeatures/Subtyping/test_types/left_legacy_fail_A01.dart
@@ -6,8 +6,8 @@
 /// when:
 /// Left Legacy if T0 is S0* then:
 /// - T0 <: T1 iff S0 <: T1.
-/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then T0
-/// is not subtype of T1.
+/// @description Check that if type T0 is S0* and S0 is not subtype of T1 then
+/// T0 is not subtype of T1.
 /// @author sgrekhov@unipro.ru
 
 // Requirements=nnbd-weak
diff --git a/LanguageFeatures/Subtyping/test_types/left_null_A04.dart b/LanguageFeatures/Subtyping/test_types/left_null_A04.dart
index 7c493ad..41acba4 100644
--- a/LanguageFeatures/Subtyping/test_types/left_null_A04.dart
+++ b/LanguageFeatures/Subtyping/test_types/left_null_A04.dart
@@ -13,7 +13,6 @@
 /// subtype of T1
 /// @author sgrekhov@unipro.ru
 
-
 Null t0Instance = null;
 Null? t1Instance = null;
 
diff --git a/LanguageFeatures/Subtyping/test_types/left_null_A05.dart b/LanguageFeatures/Subtyping/test_types/left_null_A05.dart
index 53231ba..a2393c4 100644
--- a/LanguageFeatures/Subtyping/test_types/left_null_A05.dart
+++ b/LanguageFeatures/Subtyping/test_types/left_null_A05.dart
@@ -13,7 +13,6 @@
 /// subtype of T1
 /// @author sgrekhov@unipro.ru
 
-
 class S {
   const S();
 }
diff --git a/LanguageFeatures/Subtyping/test_types/left_top_A01.dart b/LanguageFeatures/Subtyping/test_types/left_top_A01.dart
index 16b7764..5e18246 100644
--- a/LanguageFeatures/Subtyping/test_types/left_top_A01.dart
+++ b/LanguageFeatures/Subtyping/test_types/left_top_A01.dart
@@ -9,7 +9,6 @@
 /// subtype of a type T1.
 /// @author sgrekhov@unipro.ru
 
-
 dynamic t0Instance = "Show must go on";
 Object? t1Instance = new Object();
 
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_A01.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_A01.dart
index 844ce2d..5bed6f1 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_A01.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_A01.dart
@@ -18,7 +18,6 @@
 /// subtype of T1
 /// @author sgrekhov@unipro.ru
 
-
 class U0 extends U1 {}
 class U1 {}
 class V0 {}
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_A02.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_A02.dart
index ff9985b..8dfc371 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_A02.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_A02.dart
@@ -79,4 +79,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_A03.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_A03.dart
index f122772..0247e62 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_A03.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_A03.dart
@@ -58,15 +58,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-    {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3, V4<dynamic, void, Object>? x4});
+    {V2<dynamic, void, Object>? x2,
+    V3<dynamic, void, Object>? x3,
+    V4<dynamic, void, Object>? x4});
 typedef T1 = U1<dynamic, void, Object> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<dynamic, void, Object> x0, V1<dynamic, void, Object> x1,
-        {V2<dynamic, void, Object>? x2, V3<dynamic, void, Object>? x3,
-        V4<dynamic, void, Object>? x4}) => new U0<C, List<String>, int>();
+        {V2<dynamic, void, Object>? x2,
+        V3<dynamic, void, Object>? x3,
+        V4<dynamic, void, Object>? x4}) =>
+    new U0<C, List<String>, int>();
 U1<dynamic, void, Object> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
         {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3}) =>
@@ -79,4 +83,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_A04.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_A04.dart
index d59521c..8f4e8b6 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_A04.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_A04.dart
@@ -58,14 +58,18 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4});
+    {V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4});
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     {S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3});
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
         V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-        {V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4}) =>
+        {V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4}) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
         S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
@@ -79,4 +83,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_A05.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_A05.dart
index 766c1c0..3a599c5 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_A05.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_A05.dart
@@ -61,4 +61,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A12.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A12.dart
index 6240e08..bfbff1b 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A12.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A12.dart
@@ -19,31 +19,51 @@
 /// @author sgrekhov@unipro.ru
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
+
 class S4 extends V4 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
+
 class Y1 extends B1 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B1>(S0 y0, S1 y1,
+    {S2? x2, S3? x3, S4? x4, V4? x5}); // x2...x5 is not subset of x2...x4
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1, {S2? x2, S3? x3, S4? x4, V4? x5}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B1>(S0 y0, S1 y1,
+        {S2? x2, S3? x3, S4? x4, V4? x5}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
@@ -52,4 +72,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A21.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A21.dart
index c0ec970..eaa81aa 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A21.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A21.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 
 class U0 extends U1 {}
@@ -44,4 +44,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A22.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A22.dart
index 14252ad..a5a050e 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A22.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A22.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 
 class A {}
@@ -80,4 +80,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A23.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A23.dart
index 4e17e94..60364cb 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A23.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A23.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in 0...n such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Vi[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 
 class A {}
@@ -62,4 +62,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A31.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A31.dart
index 1b3dab2..5cc2ae5 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A31.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A31.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1
 /// @author sgrekhov@unipro.ru
 
 class U0 extends U1 {}
@@ -44,4 +44,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A32.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A32.dart
index c2be489..28e6215 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A32.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A32.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 
 class A {}
@@ -59,14 +59,19 @@
 
 typedef T0 = U0<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // S2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U1<A, List, num> Function<X extends B0, Y extends B1>(
     S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
     {S2<C, List<String>, int>? x2, S3<C, List<String>, int>? x3});
 
 U0<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U0<C, List<String>, int>();
 U1<A, List, num> t1Func<X extends B0, Y extends B1>(
         S0<C, List<String>, int> y0, S1<C, List<String>, int> y1,
@@ -80,4 +85,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A33.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A33.dart
index d324c2a..0bf4aa5 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A33.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A33.dart
@@ -15,8 +15,8 @@
 /// and B0i[Z0/X0, ..., Zk/Xk] === B1i[Z0/Y0, ..., Zk/Yk] for i in 0...k
 /// where the Zi are fresh type variables with bounds B0i[Z0/X0, ..., Zk/Xk]
 /// @description Check that if there is i in n+1...q such that
-/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is not
-/// a subtype of T1. Test generic types
+/// Si[Z0/Y0, ..., Zk/Yk] is not subtype of Tj[Z0/X0, ..., Zk/Xk], then T0 is
+/// not a subtype of T1. Test generic types
 /// @author sgrekhov@unipro.ru
 
 class A {}
@@ -41,14 +41,19 @@
 
 typedef T0 = U<C, List<String>, int> Function<X extends B0, Y extends B1>(
     V0<A, List, num> x0, V1<A, List, num> x1,
-    {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
+    {V2<A, List, double>? x2,
+    V3<A, List, num>? x3,
+    V4<A, List, num>?
+        x4}); // V2<C, List<String>, int> is not a subtype of V2<A, List, double>
 typedef T1 = U<A, List, num> Function<X extends B0, Y extends B1>(
     V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
     {V2<C, List<String>, int>? x2, V3<C, List<String>, int>? x3});
 
 U<C, List<String>, int> t0Func<X extends B0, Y extends B1>(
         V0<A, List, num> x0, V1<A, List, num> x1,
-        {V2<A, List, double>? x2, V3<A, List, num>? x3, V4<A, List, num>? x4}) =>
+        {V2<A, List, double>? x2,
+        V3<A, List, num>? x3,
+        V4<A, List, num>? x4}) =>
     new U<C, List<String>, int>();
 U<A, List, num> t1Func<X extends B0, Y extends B1>(
         V0<C, List<String>, int> y0, V1<C, List<String>, int> y1,
@@ -62,4 +67,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A42.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A42.dart
index 25b397f..c24ba49 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A42.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A42.dart
@@ -77,4 +77,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A43.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A43.dart
index ebc3059..512cc73 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A43.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A43.dart
@@ -61,4 +61,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A51.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A51.dart
index bf6d2f3..e95bbb5 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A51.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A51.dart
@@ -19,29 +19,46 @@
 /// @author sgrekhov@unipro.ru
 
 class U0 extends U1 {}
+
 class U1 {}
+
 class B0 {}
+
 class B1 {}
+
 class V0 {}
+
 class V1 {}
+
 class V2 {}
+
 class V3 {}
+
 class V4 {}
+
 class S0 extends V0 {}
+
 class S1 extends V1 {}
+
 class S2 extends V2 {}
+
 class S3 extends V3 {}
 
 class X0 extends B0 {}
+
 class X1 extends B1 {}
 
 class Y0 extends B0 {}
 
-typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4});
-typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}); //  Y extends B0, not B1
+typedef T0 = U0 Function<X extends B0, Y extends B1>(V0 x0, V1 x1,
+    {V2? x2, V3? x3, V4? x4});
+typedef T1 = U1 Function<X extends B0, Y extends B0>(S0 y0, S1 y1,
+    {S2? x2, S3? x3}); //  Y extends B0, not B1
 
-U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) => new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) => new U1();
+U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, {V2? x2, V3? x3, V4? x4}) =>
+    new U0();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, {S2? x2, S3? x3}) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
@@ -50,4 +67,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A52.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A52.dart
index a87ebfc..d871d67 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A52.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A52.dart
@@ -77,4 +77,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A53.dart b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A53.dart
index 9eef3fd..45804ad 100644
--- a/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A53.dart
+++ b/LanguageFeatures/Subtyping/test_types/named_function_types_fail_A53.dart
@@ -61,4 +61,3 @@
 
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A11.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A11.dart
index fea188e..bf7f544 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A11.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A11.dart
@@ -75,4 +75,3 @@
 const t1Default = t1Func;
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A12.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A12.dart
index 0e7e1ca..780d3b7 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A12.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A12.dart
@@ -77,4 +77,3 @@
 const t1Default = t1Func;
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A13.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A13.dart
index 4505d24..591ef3f 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A13.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A13.dart
@@ -77,4 +77,3 @@
 const t1Default = t1Func;
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A14.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A14.dart
index e9a1067..828b72e 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A14.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A14.dart
@@ -77,4 +77,3 @@
 const t1Default = t1Func;
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A21.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A21.dart
index d658506..61c2b47 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A21.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A21.dart
@@ -78,6 +78,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A22.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A22.dart
index 937ad4c..f81db7a 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A22.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A22.dart
@@ -81,6 +81,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A23.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A23.dart
index b332c26..8d0b2a3 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A23.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A23.dart
@@ -80,6 +80,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A24.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A24.dart
index 9545305..1ee3a9e 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A24.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A24.dart
@@ -79,6 +79,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A31.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A31.dart
index 2e5a178..98e76a4 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A31.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A31.dart
@@ -75,6 +75,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A32.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A32.dart
index d970184..858a25e 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A32.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A32.dart
@@ -58,23 +58,27 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]);
+    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+    [S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
-U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    S2<Null, Null, Null> x2, [S3<Null, Null, Null>? x3]) =>
+U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(S0<Null, Null, Null> y0,
+        S1<Null, Null, Null> y1, S2<Null, Null, Null> x2,
+        [S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A33.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A33.dart
index b43852d..b57eeb2 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A33.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A33.dart
@@ -58,23 +58,27 @@
 
 typedef T0 = U0<Null, Null, Null> Function<X extends B0, Y extends B1>(
     V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]);
+    [V2<A?, List?, num?>? x2,
+    V3<A?, List?, num?>? x3,
+    V4<A?, List?, num?>? x4]);
 typedef T1 = U1<A?, List?, num?> Function<X extends B0, Y extends B1>(
     S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
     [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]);
 
 U0<Null, Null, Null> t0Func<X extends B0, Y extends B1>(
-    V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
-    [V2<A?, List?, num?>? x2, V3<A?, List?, num?>? x3, V4<A?, List?, num?>? x4]) =>
+        V0<A?, List?, num?> x0, V1<A?, List?, num?> x1,
+        [V2<A?, List?, num?>? x2,
+        V3<A?, List?, num?>? x3,
+        V4<A?, List?, num?>? x4]) =>
     new U0<Null, Null, Null>();
 U1<A?, List?, num?> t1Func<X extends B0, Y extends B1>(
-    S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
-    [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
+        S0<Null, Null, Null> y0, S1<Null, Null, Null> y1,
+        [S2<Null, Null, Null>? x2, S3<Null, Null, Null>? x3]) =>
     new U1<A?, List?, num?>();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A34.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A34.dart
index fb4056f..2b298b6 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A34.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A34.dart
@@ -75,6 +75,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A41.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A41.dart
index 8f4e9b8..aab0c6c 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A41.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A41.dart
@@ -57,6 +57,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A42.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A42.dart
index 94d134e..ad7bf92 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A42.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A42.dart
@@ -57,6 +57,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A43.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A43.dart
index dc21db7..3274c34 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A43.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A43.dart
@@ -57,6 +57,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_A44.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_A44.dart
index b391aff..42b33b6 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_A44.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_A44.dart
@@ -57,6 +57,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A01.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A01.dart
index 3058569..3f96223 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A01.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A01.dart
@@ -37,5 +37,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A02.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A02.dart
index 1cbfeae..ae12960 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A02.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A02.dart
@@ -38,5 +38,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A03.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A03.dart
index 98b8108..8b663fb 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A03.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A03.dart
@@ -37,5 +37,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A04.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A04.dart
index 4c5d895..cd5bd6c 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A04.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A04.dart
@@ -37,5 +37,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A05.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A05.dart
index f6f5df4..bfdfe61 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A05.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A05.dart
@@ -67,6 +67,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A06.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A06.dart
index 4a828d0..0a3309f 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A06.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A06.dart
@@ -67,6 +67,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A07.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A07.dart
index df54020..0a7e1e0 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A07.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A07.dart
@@ -67,6 +67,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A08.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A08.dart
index f053fb9..c2743c4 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A08.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A08.dart
@@ -65,6 +65,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A11.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A11.dart
index be2af42..2fe9355 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A11.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A11.dart
@@ -40,5 +40,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A12.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A12.dart
index a53f028..e9ea616 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A12.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A12.dart
@@ -68,6 +68,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A21.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A21.dart
index 97fc3cd..5aeac9d 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A21.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A21.dart
@@ -40,5 +40,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A22.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A22.dart
index fced69b..b322b4f 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A22.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A22.dart
@@ -67,6 +67,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A31.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A31.dart
index 9c664a6..686c17f 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A31.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A31.dart
@@ -53,11 +53,12 @@
 
 U0 t0Func<X extends B0, Y extends B1>(V0 x0, V1 x1, [V2? x2, V3? x3, V4? x4]) =>
     new U0();
-U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) => new U1();
+U1 t1Func<X extends B0, Y extends B0>(S0 y0, S1 y1, [S2? x2, S3? x3]) =>
+    new U1();
 
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A32.dart b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A32.dart
index 19faee9..aa1b7ca 100644
--- a/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A32.dart
+++ b/LanguageFeatures/Subtyping/test_types/positional_function_types_fail_A32.dart
@@ -68,6 +68,6 @@
 T0 t0Instance = t0Func;
 T1 t1Instance = t1Func;
 const t1Default = t1Func;
+
 //# @T0 = T0
 //# @T1 = T1
-//# @GenericFunctionType
diff --git a/LanguageFeatures/Subtyping/test_types/records_fail_A07.dart b/LanguageFeatures/Subtyping/test_types/records_fail_A07.dart
index 426419d..708d3c2 100644
--- a/LanguageFeatures/Subtyping/test_types/records_fail_A07.dart
+++ b/LanguageFeatures/Subtyping/test_types/records_fail_A07.dart
@@ -15,7 +15,7 @@
 // SharedOptions=--enable-experiment=records
 
 (int, String, {bool b}) t0Instance = (1, "2", b: true);
-(int, String, {List<num> b}) t1Instance = (3, "4", b: []);
+(int, String, {List<num> b}) t1Instance = (3, "4", b: <num>[]);
 
 const t1Default = const (5, "6", b: <num>[]);
 
diff --git a/LanguageFeatures/Subtyping/test_types/right_FutureOr_A01.dart b/LanguageFeatures/Subtyping/test_types/right_FutureOr_A01.dart
index cba3b00..bf9532a 100644
--- a/LanguageFeatures/Subtyping/test_types/right_FutureOr_A01.dart
+++ b/LanguageFeatures/Subtyping/test_types/right_FutureOr_A01.dart
@@ -25,9 +25,12 @@
 
 class T0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
diff --git a/LanguageFeatures/Subtyping/test_types/right_FutureOr_A03.dart b/LanguageFeatures/Subtyping/test_types/right_FutureOr_A03.dart
index 7f97b42..0a7fe1c 100644
--- a/LanguageFeatures/Subtyping/test_types/right_FutureOr_A03.dart
+++ b/LanguageFeatures/Subtyping/test_types/right_FutureOr_A03.dart
@@ -18,15 +18,19 @@
 class S1 {
   const S1();
 }
+
 bool testDef(Object error) => true;
 void onErrorDef() {}
 FutureOr<S1> onTimeoutDef() => new S1();
 
 class S0 implements Future<S1> {
   asStream() => getStream<S1>();
-  catchError(Function onError, {bool test(Object error)? = testDef}) => new Future.value();
-  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) => new Future<T0>.value();
-  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) => new Future.value();
+  catchError(Function onError, {bool test(Object error)? = testDef}) =>
+      new Future.value();
+  then<T0>(FutureOr<T0> onValue(S1 value), {Function? onError = onErrorDef}) =>
+      new Future<T0>.value();
+  timeout(Duration timeLimit, {FutureOr<S1> onTimeout()? = onTimeoutDef}) =>
+      new Future.value();
   whenComplete(FutureOr action()) => new Future.value();
 }
 
@@ -35,8 +39,7 @@
   return d as Stream<T>;
 }
 
-class X0 extends S0 {
-}
+class X0 extends S0 {}
 
 X0 t0Instance = new X0();
 FutureOr<S1> t1Instance = new Future.value(new S1());
diff --git a/LanguageFeatures/Subtyping/test_types/right_object_A01.dart b/LanguageFeatures/Subtyping/test_types/right_object_A01.dart
index ac980f7..99441e9 100644
--- a/LanguageFeatures/Subtyping/test_types/right_object_A01.dart
+++ b/LanguageFeatures/Subtyping/test_types/right_object_A01.dart
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is an unpromoted type variable with bound B
 /// and B <: Object then T0 is subtype of T1
diff --git a/LanguageFeatures/Subtyping/test_types/right_object_A04.dart b/LanguageFeatures/Subtyping/test_types/right_object_A04.dart
index 4bc27dd..f19777a 100644
--- a/LanguageFeatures/Subtyping/test_types/right_object_A04.dart
+++ b/LanguageFeatures/Subtyping/test_types/right_object_A04.dart
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1
diff --git a/LanguageFeatures/Subtyping/test_types/right_object_A05.dart b/LanguageFeatures/Subtyping/test_types/right_object_A05.dart
index dba7f85..f48964e 100644
--- a/LanguageFeatures/Subtyping/test_types/right_object_A05.dart
+++ b/LanguageFeatures/Subtyping/test_types/right_object_A05.dart
@@ -10,8 +10,8 @@
 ///  - if T0 is a promoted type variable X & S then T0 <: T1 iff S <: Object
 ///  - if T0 is FutureOr<S> for some S, then T0 <: T1 iff S <: Object.
 ///  - if T0 is S* for any S, then T0 <: T1 iff S <: T1
-///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does not
-///      hold (per above, the result of the subtyping query is false).
+///  - if T0 is Null, dynamic, void, or S? for any S, then the subtyping does
+///      not hold (per above, the result of the subtyping query is false).
 ///  - Otherwise T0 <: T1 is true.
 /// @description Check that if T0 is FutureOr<S> for some S and S <: Object then
 /// T0 is subtype of T1