diff --git a/LanguageFeatures/Enhanced-Enum/grammar_A10_t01.dart b/LanguageFeatures/Enhanced-Enum/grammar_A10_t01.dart
index 5eaab97..aac9730 100644
--- a/LanguageFeatures/Enhanced-Enum/grammar_A10_t01.dart
+++ b/LanguageFeatures/Enhanced-Enum/grammar_A10_t01.dart
@@ -12,6 +12,7 @@
 /// @description Check that it's a compile-time error if the enum declaration
 /// contains a static member declaration with the name `values`
 /// @author sgrekhov@unipro.ru
+/// @issue 48387
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/grammar_A10_t02.dart b/LanguageFeatures/Enhanced-Enum/grammar_A10_t02.dart
index e3e21e7..505e5ff 100644
--- a/LanguageFeatures/Enhanced-Enum/grammar_A10_t02.dart
+++ b/LanguageFeatures/Enhanced-Enum/grammar_A10_t02.dart
@@ -12,6 +12,7 @@
 /// @description Check that it's a compile-time error if the enum declaration
 /// contains a static member declaration with the name `values`
 /// @author sgrekhov@unipro.ru
+/// @issue 48389
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/grammar_A10_t03.dart b/LanguageFeatures/Enhanced-Enum/grammar_A10_t03.dart
index 3da1869..43dadb5 100644
--- a/LanguageFeatures/Enhanced-Enum/grammar_A10_t03.dart
+++ b/LanguageFeatures/Enhanced-Enum/grammar_A10_t03.dart
@@ -12,6 +12,7 @@
 /// @description Check that it's a compile-time error if the enum declaration
 /// contains a static member declaration with the name `values`
 /// @author sgrekhov@unipro.ru
+/// @issue 48389
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/grammar_A10_t04.dart b/LanguageFeatures/Enhanced-Enum/grammar_A10_t04.dart
index 64b722c..12b7db5 100644
--- a/LanguageFeatures/Enhanced-Enum/grammar_A10_t04.dart
+++ b/LanguageFeatures/Enhanced-Enum/grammar_A10_t04.dart
@@ -12,10 +12,14 @@
 /// @description Check that it's a compile-time error if the enum declaration
 /// contains a static member declaration with the name `values`
 /// @author sgrekhov@unipro.ru
+/// @issue 48387
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
-enum E1<T> {
+enum E1 {
+//   ^^
+// [analyzer] unspecified
+// [cfe] unspecified
   e1,
   e2,
   e3;
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t02.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t02.dart
index 310d506..6b111bd 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t02.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t02.dart
@@ -50,6 +50,7 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name values
 /// @author sgrekhov@unipro.ru
+/// @issue 48389
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t03.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t03.dart
index 92bdf80..8d1f471 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t03.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t03.dart
@@ -50,6 +50,7 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name values
 /// @author sgrekhov@unipro.ru
+/// @issue 48389
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t04.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t04.dart
index dff0b65..19ea864 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t04.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t04.dart
@@ -50,10 +50,14 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name values
 /// @author sgrekhov@unipro.ru
+/// @issue 48387
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
 enum E1 {
+//   ^^
+// [analyzer] unspecified
+// [cfe] unspecified
   e1,
   e2;
 
@@ -64,6 +68,8 @@
 }
 
 enum E2 {
+//   ^^
+// [cfe] unspecified
   e1(42),
   e2(0);
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t05.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t05.dart
index 1cc32bb..83d91e8 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t05.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t05.dart
@@ -50,6 +50,7 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name `values`
 /// @author sgrekhov@unipro.ru
+/// @issue 48388
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t06.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t06.dart
index fa0758d..df33302 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t06.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t06.dart
@@ -50,6 +50,7 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name `values`
 /// @author sgrekhov@unipro.ru
+/// @issue 48388
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t07.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t07.dart
index 04d0785..c08754c 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t07.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t07.dart
@@ -50,6 +50,7 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name `values`
 /// @author sgrekhov@unipro.ru
+/// @issue 48388
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t08.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t08.dart
index 5f4858a..2d1efa6 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t08.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t08.dart
@@ -50,6 +50,7 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name `values`
 /// @author sgrekhov@unipro.ru
+/// @issue 48388
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t13.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t13.dart
index dba767a..b57d721 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t13.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t13.dart
@@ -50,6 +50,7 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name values
 /// @author sgrekhov@unipro.ru
+/// @issue 48388
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t14.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t14.dart
index 2507357..f9f671b 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t14.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t14.dart
@@ -50,6 +50,7 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name values
 /// @author sgrekhov@unipro.ru
+/// @issue 48388
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t15.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t15.dart
index 9f231e8..80482a1 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t15.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t15.dart
@@ -50,6 +50,7 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name values
 /// @author sgrekhov@unipro.ru
+/// @issue 48388
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t16.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t16.dart
index 69a0456..e40e935 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t16.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A03_t16.dart
@@ -50,6 +50,7 @@
 /// superinterface and the interface of the declarations contains an instance
 /// member with the name values
 /// @author sgrekhov@unipro.ru
+/// @issue 48388
 
 // SharedOptions=--enable-experiment=enhanced-enums
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t04.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t04.dart
index f8b32ef..34cf5e6 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t04.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t04.dart
@@ -56,9 +56,6 @@
 
 abstract class E1 extends Enum {
   void set index(int val) {}
-//         ^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
 }
 
 abstract class E2 extends Enum {
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t08.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t08.dart
index 3757d02..063a3a5 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t08.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t08.dart
@@ -59,12 +59,11 @@
   e2;
 
   void set index(int val) {}
-//         ^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
 }
 
 enum E2 {
+//   ^^
+// [analyzer] unspecified
   e1(42),
   e2(0);
 
diff --git a/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t12.dart b/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t12.dart
index ce4f68c..bc5f0b9 100644
--- a/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t12.dart
+++ b/LanguageFeatures/Enhanced-Enum/implementing_enum_A04_t12.dart
@@ -56,9 +56,6 @@
 
 mixin M1 on Enum {
   void set index(int v) {}
-//         ^^^^^
-// [analyzer] unspecified
-// [cfe] unspecified
 }
 
 mixin M2 on Enum {
diff --git a/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t04.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/expando_key_t04.dart
similarity index 100%
rename from LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t04.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/WeakReference/expando_key_t04.dart
diff --git a/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t05.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/expando_key_t05.dart
similarity index 100%
rename from LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t05.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/WeakReference/expando_key_t05.dart
diff --git a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t01.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t01.dart
index 2d1fcea..97643e1 100644
--- a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t01.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t01.dart
@@ -13,6 +13,7 @@
 /// object supplied in the constructor, or null if the weak reference has been
 /// cleared
 /// @author sgrekhov@unipro.ru
+/// @issue 48391
 
 import "../../gc_utils_lib.dart";
 import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t02.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t02.dart
index f762429..93e8790 100644
--- a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t02.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t02.dart
@@ -13,6 +13,7 @@
 /// object supplied in the constructor, or null if the weak reference has been
 /// cleared
 /// @author sgrekhov@unipro.ru
+/// @issue 48391
 
 import "../../gc_utils_lib.dart";
 import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t03.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t03.dart
index 353a1ba..687aa64 100644
--- a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t03.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t03.dart
@@ -13,6 +13,7 @@
 /// object supplied in the constructor, or null if the weak reference has been
 /// cleared
 /// @author sgrekhov@unipro.ru
+/// @issue 48391
 
 import "../../gc_utils_lib.dart";
 import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t04.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t04.dart
index 62b4c9b..453fc5a 100644
--- a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t04.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t04.dart
@@ -13,6 +13,7 @@
 /// object supplied in the constructor, or null if the weak reference has been
 /// cleared
 /// @author sgrekhov@unipro.ru
+/// @issue 48391
 
 import "../../gc_utils_lib.dart";
 import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t05.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t05.dart
index e48f355..be09c8d 100644
--- a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t05.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t05.dart
@@ -23,7 +23,7 @@
   C(this.id);
 }
 
-main() {
+main() async {
   C? c1 = C(42);
   WeakReference<C> wr = WeakReference(c1);
   asyncStart();
@@ -38,6 +38,7 @@
     Expect.isNull(wr.target);
     asyncEnd();
   });
+  await Future.delayed(Duration(milliseconds: 10));
   Expect.isNotNull(wr.target);
   Expect.equals(c1, wr.target);
   c1 = null;
diff --git a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t07.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t07.dart
index 4d8115d..5c92af2 100644
--- a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t07.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t07.dart
@@ -13,6 +13,7 @@
 /// object supplied in the constructor, or null if the weak reference has been
 /// cleared
 /// @author sgrekhov@unipro.ru
+/// @issue 48391
 
 import "../../gc_utils_lib.dart";
 import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t08.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t08.dart
index 4b6216a..ecd33b3 100644
--- a/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t08.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t08.dart
@@ -13,6 +13,7 @@
 /// object supplied in the constructor, or null if the weak reference has been
 /// cleared
 /// @author sgrekhov@unipro.ru
+/// @issue 48391
 
 import "../../gc_utils_lib.dart";
 import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t11.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t11.dart
index d971f52..f933f77 100644
--- a/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t11.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t11.dart
@@ -8,6 +8,7 @@
 /// @description Checks that [value] must be supported as an [Expando] key.
 /// Test [Null].
 /// @author iarkh@unipro.ru
+/// @issue 48390
 
 import '../../../../Utils/expect.dart';