Remove some multitest runtime-tests.

Change-Id: I8fb69fecbe67236a4cbad9c1eb899a31a26a1ba3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/410002
Reviewed-by: Martin Kustermann <kustermann@google.com>
Commit-Queue: Lasse Nielsen <lrn@google.com>
diff --git a/runtime/tests/concurrency/stress_test_list.json b/runtime/tests/concurrency/stress_test_list.json
index 5517354..4b79bbc 100644
--- a/runtime/tests/concurrency/stress_test_list.json
+++ b/runtime/tests/concurrency/stress_test_list.json
@@ -594,8 +594,6 @@
   "../../../tests/corelib/uri_test.dart",
   "../../../tests/corelib/very_big_integer_test.dart",
   "../../../tests/language/abstract/equal_test.dart",
-  "../../../tests/language/abstract/exact_selector_runtime_test.dart",
-  "../../../tests/language/abstract/factory_constructor_runtime_test.dart",
   "../../../tests/language/abstract/getter2_test.dart",
   "../../../tests/language/abstract/method_test.dart",
   "../../../tests/language/abstract/object_method_test.dart",
@@ -606,12 +604,9 @@
   "../../../tests/language/accessor_conflict/import_prefixed2_test.dart",
   "../../../tests/language/accessor_conflict/import_prefixed_test.dart",
   "../../../tests/language/accessor_conflict/import_test.dart",
-  "../../../tests/language/argument/assignability_function_typed_runtime_test.dart",
   "../../../tests/language/argument/named_argument_test.dart",
   "../../../tests/language/argument/named_in_const_creation_test.dart",
   "../../../tests/language/assert/assignable_type_test.dart",
-  "../../../tests/language/assert/initializer_const_error2_runtime_test.dart",
-  "../../../tests/language/assert/initializer_const_error_runtime_test.dart",
   "../../../tests/language/assert/initializer_test.dart",
   "../../../tests/language/assert/message_test.dart",
   "../../../tests/language/assert/with_message_test.dart",
@@ -630,10 +625,7 @@
   "../../../tests/language/async/break_in_finally_test.dart",
   "../../../tests/language/async/call_test.dart",
   "../../../tests/language/async/cascade_test.dart",
-  "../../../tests/language/async/congruence_local_runtime_test.dart",
-  "../../../tests/language/async/congruence_method_runtime_test.dart",
   "../../../tests/language/async/congruence_top_level_test.dart",
-  "../../../tests/language/async/congruence_unnamed_runtime_test.dart",
   "../../../tests/language/async/continue_label_test.dart",
   "../../../tests/language/async/control_structures_test.dart",
   "../../../tests/language/async/covariant_type_test.dart",
@@ -642,10 +634,8 @@
   "../../../tests/language/async/error_timing_test.dart",
   "../../../tests/language/async/finally_rethrow_test.dart",
   "../../../tests/language/async/identifier_test.dart",
-  "../../../tests/language/async/or_generator_return_type_stacktrace_runtime_test.dart",
   "../../../tests/language/async/regression_23058_test.dart",
   "../../../tests/language/async/rethrow_test.dart",
-  "../../../tests/language/async/return_types_runtime_test.dart",
   "../../../tests/language/async/this_bound_test.dart",
   "../../../tests/language/async/throw_in_catch_test.dart",
   "../../../tests/language/async_nested/async_nested01_test.dart",
@@ -721,7 +711,6 @@
   "../../../tests/language/async_star/yieldstar_test.dart",
   "../../../tests/language/await/and_ifnull_test.dart",
   "../../../tests/language/await/await_test.dart",
-  "../../../tests/language/await/backwards_compatibility_runtime_test.dart",
   "../../../tests/language/await/exceptions_test.dart",
   "../../../tests/language/await/for_cancel_test.dart",
   "../../../tests/language/await/for_test.dart",
@@ -752,18 +741,12 @@
   "../../../tests/language/call/method_as_cast_test.dart",
   "../../../tests/language/call/method_function_typed_value_test.dart",
   "../../../tests/language/call/method_implicit_invoke_instance_test.dart",
-  "../../../tests/language/call/method_implicit_invoke_local_runtime_1_test.dart",
-  "../../../tests/language/call/method_implicit_invoke_local_runtime_2_test.dart",
-  "../../../tests/language/call/method_implicit_invoke_local_runtime_3_test.dart",
-  "../../../tests/language/call/method_implicit_invoke_local_runtime_4_test.dart",
-  "../../../tests/language/call/method_implicit_invoke_local_runtime_test.dart",
   "../../../tests/language/call/method_implicit_invoke_static_test.dart",
   "../../../tests/language/call/method_implicit_invoke_top_level_test.dart",
   "../../../tests/language/call/method_implicit_tear_off_test.dart",
   "../../../tests/language/call/method_is_check_test.dart",
   "../../../tests/language/call/operator_test.dart",
   "../../../tests/language/call/property_test.dart",
-  "../../../tests/language/call/through_getter_runtime_test.dart",
   "../../../tests/language/call/through_null_getter_test.dart",
   "../../../tests/language/call/type_literal_test.dart",
   "../../../tests/language/call/with_no_such_method_test.dart",
@@ -783,20 +766,16 @@
   "../../../tests/language/cascade/nested_test.dart",
   "../../../tests/language/cascade/on_static_field_test.dart",
   "../../../tests/language/cascade/precedence_test.dart",
-  "../../../tests/language/cascade/runtime_test.dart",
   "../../../tests/language/class/class_test.dart",
   "../../../tests/language/class/classes_static_method_clash_test.dart",
   "../../../tests/language/class/codegen_test.dart",
-  "../../../tests/language/class/cyclic_class_member_runtime_test.dart",
   "../../../tests/language/class/cyclic_hierarchy_test.dart",
   "../../../tests/language/class/inheritance_chain_test.dart",
-  "../../../tests/language/class/keyword_runtime_test.dart",
   "../../../tests/language/class/large_class_declaration_test.dart",
   "../../../tests/language/class/multiple_interface_inheritance_test.dart",
   "../../../tests/language/class/override_inference_test.dart",
   "../../../tests/language/class/recursive_inheritance_test.dart",
   "../../../tests/language/class/syntax2_test.dart",
-  "../../../tests/language/class/variable_shadow_class_runtime_test.dart",
   "../../../tests/language/class_modifiers/base/base_class_base_subtype_test.dart",
   "../../../tests/language/class_modifiers/base/base_class_extend_outside_test.dart",
   "../../../tests/language/class_modifiers/base/base_class_extend_test.dart",
@@ -868,13 +847,11 @@
   "../../../tests/language/closure/in_initializer2_test.dart",
   "../../../tests/language/closure/in_initializer_test.dart",
   "../../../tests/language/closure/instantiation_closure_equality_test.dart",
-  "../../../tests/language/closure/internals_runtime_test.dart",
   "../../../tests/language/closure/nested_generic_closure_test.dart",
   "../../../tests/language/closure/param_null_to_object_test.dart",
   "../../../tests/language/closure/parameter_types_test.dart",
   "../../../tests/language/closure/parse_closures_in_initializers_test.dart",
   "../../../tests/language/closure/partial_instantiation_eager_bounds_check_test.dart",
-  "../../../tests/language/closure/partial_instantiation_static_bounds_check_runtime_test.dart",
   "../../../tests/language/closure/regress46568_test.dart",
   "../../../tests/language/closure/self_reference_test.dart",
   "../../../tests/language/closure/shared_state_test.dart",
@@ -890,10 +867,7 @@
   "../../../tests/language/closure/with_super_field_test.dart",
   "../../../tests/language/closure/with_super_send_test.dart",
   "../../../tests/language/compile_time_constant/a_test.dart",
-  "../../../tests/language/compile_time_constant/arguments_runtime_test.dart",
   "../../../tests/language/compile_time_constant/b_test.dart",
-  "../../../tests/language/compile_time_constant/c_runtime_1_test.dart",
-  "../../../tests/language/compile_time_constant/c_runtime_test.dart",
   "../../../tests/language/compile_time_constant/compile_time_constant11_test.dart",
   "../../../tests/language/compile_time_constant/compile_time_constant12_test.dart",
   "../../../tests/language/compile_time_constant/compile_time_constant2_test.dart",
@@ -910,62 +884,33 @@
   "../../../tests/language/compile_time_constant/h_test.dart",
   "../../../tests/language/compile_time_constant/i_test.dart",
   "../../../tests/language/compile_time_constant/j_test.dart",
-  "../../../tests/language/compile_time_constant/k_runtime_test.dart",
   "../../../tests/language/compile_time_constant/l_test.dart",
   "../../../tests/language/compile_time_constant/m_test.dart",
   "../../../tests/language/compile_time_constant/n_test.dart",
-  "../../../tests/language/compile_time_constant/o_runtime_test.dart",
-  "../../../tests/language/compile_time_constant/p_runtime_test.dart",
   "../../../tests/language/compile_time_constant/q_test.dart",
-  "../../../tests/language/compile_time_constant/r_runtime_test.dart",
-  "../../../tests/language/compile_time_constant/runtime_test.dart",
-  "../../../tests/language/compile_time_constant/static2_runtime_test.dart",
-  "../../../tests/language/compile_time_constant/static3_runtime_test.dart",
-  "../../../tests/language/compile_time_constant/static_runtime_test.dart",
   "../../../tests/language/const/cast3_test.dart",
   "../../../tests/language/const/cast4_test.dart",
-  "../../../tests/language/const/conditional_runtime_test.dart",
   "../../../tests/language/const/const2_test.dart",
   "../../../tests/language/const/const3_test.dart",
   "../../../tests/language/const/const4_test.dart",
-  "../../../tests/language/const/const_locals_runtime_test.dart",
   "../../../tests/language/const/const_test.dart",
   "../../../tests/language/const/constant_dag_test.dart",
   "../../../tests/language/const/constant_type_variable_test.dart",
-  "../../../tests/language/const/constructor3_runtime_1_test.dart",
-  "../../../tests/language/const/constructor3_runtime_2_test.dart",
-  "../../../tests/language/const/constructor3_runtime_test.dart",
-  "../../../tests/language/const/constructor_mixin2_runtime_test.dart",
   "../../../tests/language/const/constructor_mixin3_test.dart",
   "../../../tests/language/const/constructor_mixin_test.dart",
-  "../../../tests/language/const/constructor_nonconst_field_runtime_test.dart",
-  "../../../tests/language/const/constructor_nonconst_param_runtime_test.dart",
-  "../../../tests/language/const/constructor_runtime_test.dart",
   "../../../tests/language/const/constructor_super2_test.dart",
-  "../../../tests/language/const/constructor_super_runtime_test.dart",
-  "../../../tests/language/const/constructor_syntax_runtime_test.dart",
   "../../../tests/language/const/ct_const_test.dart",
-  "../../../tests/language/const/dynamic_type_literal_runtime_1_test.dart",
-  "../../../tests/language/const/dynamic_type_literal_runtime_2_test.dart",
-  "../../../tests/language/const/dynamic_type_literal_runtime_test.dart",
   "../../../tests/language/const/escape_frog_test.dart",
   "../../../tests/language/const/evaluation_test.dart",
   "../../../tests/language/const/factory_member_test.dart",
   "../../../tests/language/const/factory_redirection_test.dart",
-  "../../../tests/language/const/factory_with_body_runtime_test.dart",
-  "../../../tests/language/const/getter_runtime_test.dart",
   "../../../tests/language/const/global_test.dart",
   "../../../tests/language/const/inference_test.dart",
-  "../../../tests/language/const/init2_runtime_1_test.dart",
-  "../../../tests/language/const/init2_runtime_test.dart",
   "../../../tests/language/const/init_test.dart",
-  "../../../tests/language/const/instance_field_runtime_test.dart",
   "../../../tests/language/const/instantiated_function_constant_test.dart",
   "../../../tests/language/const/list_test.dart",
   "../../../tests/language/const/local_test.dart",
   "../../../tests/language/const/locals_test.dart",
-  "../../../tests/language/const/map2_runtime_test.dart",
-  "../../../tests/language/const/map3_runtime_test.dart",
   "../../../tests/language/const/map4_test.dart",
   "../../../tests/language/const/map5_test.dart",
   "../../../tests/language/const/map_hashcode_override2_test.dart",
@@ -983,9 +928,7 @@
   "../../../tests/language/const/set_hashcode_override2_test.dart",
   "../../../tests/language/const/set_null_lookup_test.dart",
   "../../../tests/language/const/string_test.dart",
-  "../../../tests/language/const/switch2_runtime_test.dart",
   "../../../tests/language/const/switch_test.dart",
-  "../../../tests/language/const/syntax_runtime_test.dart",
   "../../../tests/language/const/tree_test.dart",
   "../../../tests/language/const/var_test.dart",
   "../../../tests/language/constants_2018/potential_const_dynamic_test.dart",
@@ -993,18 +936,11 @@
   "../../../tests/language/constants_2018/potential_const_type_test.dart",
   "../../../tests/language/constants_2018/type_cast_test.dart",
   "../../../tests/language/constants_2018/type_check_test.dart",
-  "../../../tests/language/constructor/bad_constructor_runtime_1_test.dart",
-  "../../../tests/language/constructor/bad_constructor_runtime_test.dart",
-  "../../../tests/language/constructor/bad_named_constructor_runtime_test.dart",
   "../../../tests/language/constructor/body_test.dart",
-  "../../../tests/language/constructor/bodyless_wrong_arg_runtime_test.dart",
   "../../../tests/language/constructor/call_as_function_test.dart",
-  "../../../tests/language/constructor/call_wrong_argument_count_runtime_test.dart",
-  "../../../tests/language/constructor/constructor10_runtime_test.dart",
   "../../../tests/language/constructor/constructor11_test.dart",
   "../../../tests/language/constructor/constructor12_strong_test.dart",
   "../../../tests/language/constructor/constructor12_test.dart",
-  "../../../tests/language/constructor/constructor13_runtime_test.dart",
   "../../../tests/language/constructor/constructor2_test.dart",
   "../../../tests/language/constructor/constructor3_test.dart",
   "../../../tests/language/constructor/constructor4_test.dart",
@@ -1012,18 +948,12 @@
   "../../../tests/language/constructor/constructor6_test.dart",
   "../../../tests/language/constructor/constructor7_test.dart",
   "../../../tests/language/constructor/constructor8_test.dart",
-  "../../../tests/language/constructor/constructor9_runtime_test.dart",
   "../../../tests/language/constructor/constructor_contexts_test.dart",
   "../../../tests/language/constructor/constructor_test.dart",
-  "../../../tests/language/constructor/cyclic_runtime_test.dart",
   "../../../tests/language/constructor/default_class_implicit_constructor_test.dart",
-  "../../../tests/language/constructor/default_factory2_runtime_test.dart",
   "../../../tests/language/constructor/default_factory3_test.dart",
   "../../../tests/language/constructor/default_factory_library_test.dart",
-  "../../../tests/language/constructor/default_factory_runtime_test.dart",
   "../../../tests/language/constructor/default_test.dart",
-  "../../../tests/language/constructor/duplicate_initializers_runtime_test.dart",
-  "../../../tests/language/constructor/duplicate_runtime_test.dart",
   "../../../tests/language/constructor/evaluation_redirecting_constructor_test.dart",
   "../../../tests/language/constructor/example_constructor_test.dart",
   "../../../tests/language/constructor/external_constructor_test.dart",
@@ -1034,34 +964,12 @@
   "../../../tests/language/constructor/initializer_test.dart",
   "../../../tests/language/constructor/multiple_field_assignment_constructor_test.dart",
   "../../../tests/language/constructor/name_clash_test.dart",
-  "../../../tests/language/constructor/named_runtime_test.dart",
-  "../../../tests/language/constructor/no_such_constructor_runtime_test.dart",
   "../../../tests/language/constructor/non_const_constructor_without_body_test.dart",
   "../../../tests/language/constructor/non_parameterized_factory2_test.dart",
   "../../../tests/language/constructor/non_parameterized_factory_test.dart",
   "../../../tests/language/constructor/patch_tear_off_test.dart",
-  "../../../tests/language/constructor/redirect2_runtime_test.dart",
-  "../../../tests/language/constructor/redirect_cycle_runtime_test.dart",
-  "../../../tests/language/constructor/redirect_indirect_cycle_runtime_test.dart",
-  "../../../tests/language/constructor/redirect_runtime_test.dart",
-  "../../../tests/language/constructor/reference_runtime_10_test.dart",
-  "../../../tests/language/constructor/reference_runtime_11_test.dart",
-  "../../../tests/language/constructor/reference_runtime_12_test.dart",
-  "../../../tests/language/constructor/reference_runtime_1_test.dart",
-  "../../../tests/language/constructor/reference_runtime_2_test.dart",
-  "../../../tests/language/constructor/reference_runtime_3_test.dart",
-  "../../../tests/language/constructor/reference_runtime_4_test.dart",
-  "../../../tests/language/constructor/reference_runtime_5_test.dart",
-  "../../../tests/language/constructor/reference_runtime_6_test.dart",
-  "../../../tests/language/constructor/reference_runtime_7_test.dart",
-  "../../../tests/language/constructor/reference_runtime_8_test.dart",
-  "../../../tests/language/constructor/reference_runtime_9_test.dart",
-  "../../../tests/language/constructor/reference_runtime_test.dart",
-  "../../../tests/language/constructor/return_runtime_test.dart",
   "../../../tests/language/constructor/tear_off_test.dart",
-  "../../../tests/language/constructor/type_parameter_runtime_test.dart",
   "../../../tests/language/constructor/unnamed_new_test.dart",
-  "../../../tests/language/constructor/unresolved_default_runtime_test.dart",
   "../../../tests/language/constructor/with_mixin_test.dart",
   "../../../tests/language/control_flow_collections/for_await_test.dart",
   "../../../tests/language/control_flow_collections/for_dynamic_null_strong_test.dart",
@@ -1103,15 +1011,11 @@
   "../../../tests/language/deferred/closurize_load_library_test.dart",
   "../../../tests/language/deferred/constant_list_test.dart",
   "../../../tests/language/deferred/deferred_and_immediate_import_test.dart",
-  "../../../tests/language/deferred/duplicate_prefix1_runtime_test.dart",
-  "../../../tests/language/deferred/duplicate_prefix2_runtime_test.dart",
-  "../../../tests/language/deferred/duplicate_prefix3_runtime_test.dart",
   "../../../tests/language/deferred/exported_main_test.dart",
   "../../../tests/language/deferred/function_type_test.dart",
   "../../../tests/language/deferred/global_test.dart",
   "../../../tests/language/deferred/import_core_test.dart",
   "../../../tests/language/deferred/inlined_test.dart",
-  "../../../tests/language/deferred/load_constants_runtime_test.dart",
   "../../../tests/language/deferred/load_inval_code_test.dart",
   "../../../tests/language/deferred/loading_unit_root_has_only_export_test.dart",
   "../../../tests/language/deferred/mixin_test.dart",
@@ -1130,15 +1034,11 @@
   "../../../tests/language/double/identical_test.dart",
   "../../../tests/language/double/int_addition_test.dart",
   "../../../tests/language/double/int_to_string_test.dart",
-  "../../../tests/language/double/invalid_runtime_test.dart",
   "../../../tests/language/double/modulo_test.dart",
   "../../../tests/language/double/nan_comparison_test.dart",
-  "../../../tests/language/double/to_string_as_exponential2_runtime_test.dart",
   "../../../tests/language/double/to_string_as_exponential3_test.dart",
   "../../../tests/language/double/to_string_as_exponential_test.dart",
-  "../../../tests/language/double/to_string_as_fixed2_runtime_test.dart",
   "../../../tests/language/double/to_string_as_fixed_test.dart",
-  "../../../tests/language/double/to_string_as_precision2_runtime_test.dart",
   "../../../tests/language/double/to_string_as_precision3_test.dart",
   "../../../tests/language/double/to_string_as_precision_test.dart",
   "../../../tests/language/double/to_string_test.dart",
@@ -1146,7 +1046,6 @@
   "../../../tests/language/double_literals/implicit_double_context_test.dart",
   "../../../tests/language/dynamic/call_test.dart",
   "../../../tests/language/dynamic/dynamic_test.dart",
-  "../../../tests/language/dynamic/field_runtime_test.dart",
   "../../../tests/language/dynamic/hash_code_test.dart",
   "../../../tests/language/dynamic/invoke_test.dart",
   "../../../tests/language/dynamic/named_args_test.dart",
@@ -1157,9 +1056,6 @@
   "../../../tests/language/enum/enum_test.dart",
   "../../../tests/language/enum/index_test.dart",
   "../../../tests/language/enum/initialization_near_stack_overflow_test.dart",
-  "../../../tests/language/enum/is_keyword_runtime_test.dart",
-  "../../../tests/language/enum/private_runtime_1_test.dart",
-  "../../../tests/language/enum/private_runtime_test.dart",
   "../../../tests/language/enum/value_name_test.dart",
   "../../../tests/language/exception/catch_liveness_test.dart",
   "../../../tests/language/exception/exception_test.dart",
@@ -1200,7 +1096,6 @@
   "../../../tests/language/exception/try_catch_optimized5_test.dart",
   "../../../tests/language/exception/try_catch_osr_test.dart",
   "../../../tests/language/exception/try_catch_regress_27483_test.dart",
-  "../../../tests/language/exception/try_catch_runtime_test.dart",
   "../../../tests/language/exception/try_finally_regress_25333_test.dart",
   "../../../tests/language/exception/try_finally_regress_25654_test.dart",
   "../../../tests/language/export/cyclic_test.dart",
@@ -1212,7 +1107,6 @@
   "../../../tests/language/export/main_test.dart",
   "../../../tests/language/export/not_shadowed_by_prefix_test.dart",
   "../../../tests/language/export/order_test.dart",
-  "../../../tests/language/export/private_runtime_test.dart",
   "../../../tests/language/export/reexport_core_test.dart",
   "../../../tests/language/extension_methods/basic_static_extension_test.dart",
   "../../../tests/language/extension_methods/issue_45551_error_test.dart",
@@ -1245,19 +1139,10 @@
   "../../../tests/language/extension_methods/syntax/extension_methods_test.dart",
   "../../../tests/language/external_abstract_fields/abstract_fields_test.dart",
   "../../../tests/language/external_abstract_fields/external_fields_test.dart",
-  "../../../tests/language/factory/and_instance_variable_runtime_test.dart",
   "../../../tests/language/factory/arrow_test.dart",
-  "../../../tests/language/factory/factory4_runtime_test.dart",
-  "../../../tests/language/factory/factory5_runtime_test.dart",
-  "../../../tests/language/factory/factory6_runtime_test.dart",
   "../../../tests/language/factory/implementation_test.dart",
-  "../../../tests/language/factory/redirection2_runtime_test.dart",
-  "../../../tests/language/factory/redirection3_cyclic_runtime_test.dart",
-  "../../../tests/language/factory/return_type_checked_runtime_test.dart",
-  "../../../tests/language/factory/runtime_test.dart",
   "../../../tests/language/factory/type_parameter2_test.dart",
   "../../../tests/language/factory/type_parameter_test.dart",
-  "../../../tests/language/field/decl_missing_var_type_runtime_test.dart",
   "../../../tests/language/field/field_test.dart",
   "../../../tests/language/field/function_field_test.dart",
   "../../../tests/language/field/increment_bailout_test.dart",
@@ -1271,14 +1156,11 @@
   "../../../tests/language/field/parameter_test.dart",
   "../../../tests/language/field/super_access2_test.dart",
   "../../../tests/language/field/super_access_test.dart",
-  "../../../tests/language/field/type_check_runtime_test.dart",
   "../../../tests/language/field/wierd_name_test.dart",
-  "../../../tests/language/final/attempt_reinitialization_runtime_test.dart",
   "../../../tests/language/final/field_initialization_order_test.dart",
   "../../../tests/language/final/field_override_test.dart",
   "../../../tests/language/final/initialize_inside_closure_test.dart",
   "../../../tests/language/final/used_in_try_test.dart",
-  "../../../tests/language/final/variable_assignment_runtime_test.dart",
   "../../../tests/language/function/apply_generic2_test.dart",
   "../../../tests/language/function/apply_generic_test.dart",
   "../../../tests/language/function/argument_test.dart",
@@ -1291,7 +1173,6 @@
   "../../../tests/language/function/local2_test.dart",
   "../../../tests/language/function/local3_test.dart",
   "../../../tests/language/function/local_function_test.dart",
-  "../../../tests/language/function/malformed_result_type_runtime_test.dart",
   "../../../tests/language/function/propagation_test.dart",
   "../../../tests/language/function/regress_45601_test.dart",
   "../../../tests/language/function/type2_test.dart",
@@ -1300,11 +1181,8 @@
   "../../../tests/language/function/type_alias2_test.dart",
   "../../../tests/language/function/type_alias3_test.dart",
   "../../../tests/language/function/type_alias4_test.dart",
-  "../../../tests/language/function/type_alias6_runtime_test.dart",
   "../../../tests/language/function/type_alias8_test.dart",
-  "../../../tests/language/function/type_alias9_runtime_test.dart",
   "../../../tests/language/function/type_alias_test.dart",
-  "../../../tests/language/function/type_call_getter2_runtime_test.dart",
   "../../../tests/language/function/type_call_getter_test.dart",
   "../../../tests/language/function/type_in_constant_test.dart",
   "../../../tests/language/function/type_parameter2_test.dart",
@@ -1476,9 +1354,6 @@
   "../../../tests/language/generic/cascaded_forwarding_stubs_generic_test.dart",
   "../../../tests/language/generic/closure_test.dart",
   "../../../tests/language/generic/conflicting_generic_interfaces_no_conflict_test.dart",
-  "../../../tests/language/generic/constructor_mixin2_runtime_test.dart",
-  "../../../tests/language/generic/constructor_mixin3_runtime_test.dart",
-  "../../../tests/language/generic/constructor_mixin_runtime_test.dart",
   "../../../tests/language/generic/creation_test.dart",
   "../../../tests/language/generic/deep_test.dart",
   "../../../tests/language/generic/f_bounded_equality_test.dart",
@@ -1486,25 +1361,13 @@
   "../../../tests/language/generic/f_bounded_quantification3_test.dart",
   "../../../tests/language/generic/f_bounded_quantification4_test.dart",
   "../../../tests/language/generic/f_bounded_quantification5_test.dart",
-  "../../../tests/language/generic/f_bounded_quantification_runtime_test.dart",
   "../../../tests/language/generic/field_mixin2_test.dart",
   "../../../tests/language/generic/field_mixin3_test.dart",
   "../../../tests/language/generic/field_mixin4_test.dart",
   "../../../tests/language/generic/field_mixin5_test.dart",
-  "../../../tests/language/generic/field_mixin6_runtime_test.dart",
   "../../../tests/language/generic/field_mixin_test.dart",
   "../../../tests/language/generic/function_bounds_test.dart",
   "../../../tests/language/generic/function_dcall_test.dart",
-  "../../../tests/language/generic/function_subtype_parametrized_typedef_runtime_1_test.dart",
-  "../../../tests/language/generic/function_subtype_parametrized_typedef_runtime_2_test.dart",
-  "../../../tests/language/generic/function_subtype_parametrized_typedef_runtime_3_test.dart",
-  "../../../tests/language/generic/function_subtype_parametrized_typedef_runtime_test.dart",
-  "../../../tests/language/generic/function_subtype_runtime_1_test.dart",
-  "../../../tests/language/generic/function_subtype_runtime_2_test.dart",
-  "../../../tests/language/generic/function_subtype_runtime_test.dart",
-  "../../../tests/language/generic/function_type_as_type_argument_runtime_1_test.dart",
-  "../../../tests/language/generic/function_type_as_type_argument_runtime_test.dart",
-  "../../../tests/language/generic/function_typedef2_runtime_test.dart",
   "../../../tests/language/generic/function_typedef_test.dart",
   "../../../tests/language/generic/functions_test.dart",
   "../../../tests/language/generic/generic2_test.dart",
@@ -1521,12 +1384,9 @@
   "../../../tests/language/generic/instantiate_tearoff_after_contravariance_check_test.dart",
   "../../../tests/language/generic/instantiate_tearoff_of_call_test.dart",
   "../../../tests/language/generic/instantiate_tearoff_test.dart",
-  "../../../tests/language/generic/instantiate_type_variable_runtime_test.dart",
   "../../../tests/language/generic/is_check_test.dart",
   "../../../tests/language/generic/list_checked_test.dart",
   "../../../tests/language/generic/local_functions_test.dart",
-  "../../../tests/language/generic/metadata_runtime_1_test.dart",
-  "../../../tests/language/generic/metadata_runtime_test.dart",
   "../../../tests/language/generic/method_types_test.dart",
   "../../../tests/language/generic/mock_test.dart",
   "../../../tests/language/generic/native_test.dart",
@@ -1535,10 +1395,6 @@
   "../../../tests/language/generic/parameterized_extends_test.dart",
   "../../../tests/language/generic/recursive_generic_test.dart",
   "../../../tests/language/generic/regress_45767_test.dart",
-  "../../../tests/language/generic/reify_typevar_runtime_1_test.dart",
-  "../../../tests/language/generic/reify_typevar_runtime_2_test.dart",
-  "../../../tests/language/generic/reify_typevar_runtime_3_test.dart",
-  "../../../tests/language/generic/reify_typevar_runtime_test.dart",
   "../../../tests/language/generic/self_reference_test.dart",
   "../../../tests/language/generic/sends_test.dart",
   "../../../tests/language/generic/super_bounded_types_and_nested_variance_test.dart",
@@ -1551,14 +1407,12 @@
   "../../../tests/language/generic/type_argument_substitution_test.dart",
   "../../../tests/language/generic/type_parameter_literal_test.dart",
   "../../../tests/language/generic/typedef_test.dart",
-  "../../../tests/language/generic/wrong_number_type_arguments_runtime_test.dart",
   "../../../tests/language/generic_methods/closure_test.dart",
   "../../../tests/language/generic_methods/explicit_instantiated_tearoff_test.dart",
   "../../../tests/language/generic_methods/fbounded_futureor_test.dart",
   "../../../tests/language/generic_methods/function_type_test.dart",
   "../../../tests/language/generic_methods/generic_class_tearoff_test.dart",
   "../../../tests/language/generic_methods/generic_function_parameter_test.dart",
-  "../../../tests/language/generic_methods/generic_function_result_runtime_test.dart",
   "../../../tests/language/generic_methods/generic_invocation_all_subexpression_types_test.dart",
   "../../../tests/language/generic_methods/generic_invocation_all_types_test.dart",
   "../../../tests/language/generic_methods/generic_methods_test.dart",
@@ -1578,23 +1432,14 @@
   "../../../tests/language/generic_methods/type_expression_test.dart",
   "../../../tests/language/generic_methods/unused_parameter_test.dart",
   "../../../tests/language/getter/closure_execution_order_test.dart",
-  "../../../tests/language/getter/no_setter2_runtime_test.dart",
-  "../../../tests/language/getter/no_setter_runtime_test.dart",
   "../../../tests/language/getter/override3_test.dart",
-  "../../../tests/language/getter/parameters_runtime_test.dart",
   "../../../tests/language/getter/setter_getters_setters_test.dart",
   "../../../tests/language/getter/setter_in_lib_test.dart",
   "../../../tests/language/getter/setter_interceptor_test.dart",
   "../../../tests/language/getter/setter_order_test.dart",
   "../../../tests/language/getter/setter_type2_test.dart",
-  "../../../tests/language/getter/setter_type_runtime_test.dart",
-  "../../../tests/language/getter/syntax_runtime_1_test.dart",
-  "../../../tests/language/getter/syntax_runtime_test.dart",
   "../../../tests/language/identifier/built_in_identifier_test.dart",
-  "../../../tests/language/identifier/built_in_illegal_runtime_test.dart",
-  "../../../tests/language/identifier/known_prefix_error_runtime_test.dart",
   "../../../tests/language/identifier/known_prefix_test.dart",
-  "../../../tests/language/identifier/known_usage_error_runtime_test.dart",
   "../../../tests/language/identifier/naming2_test.dart",
   "../../../tests/language/identifier/naming3_test.dart",
   "../../../tests/language/identifier/naming_test.dart",
@@ -1608,35 +1453,8 @@
   "../../../tests/language/if/dangling_else_test.dart",
   "../../../tests/language/if/if_test.dart",
   "../../../tests/language/if/nested_if_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_10_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_13_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_14_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_15_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_16_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_17_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_18_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_19_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_1_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_20_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_21_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_22_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_23_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_24_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_25_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_26_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_27_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_2_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_3_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_4_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_5_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_6_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_7_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_8_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_9_test.dart",
-  "../../../tests/language/if_null/assignment_behavior_runtime_test.dart",
   "../../../tests/language/if_null/behavior_test.dart",
   "../../../tests/language/if_null/evaluation_order_test.dart",
-  "../../../tests/language/if_null/precedence_runtime_test.dart",
   "../../../tests/language/implicit_creation/implicit_const_context_constructor_generic_named_test.dart",
   "../../../tests/language/implicit_creation/implicit_const_context_constructor_generic_test.dart",
   "../../../tests/language/implicit_creation/implicit_const_context_constructor_named_test.dart",
@@ -1659,7 +1477,6 @@
   "../../../tests/language/implicit_creation/implicit_new_prefix_constructor_named_test.dart",
   "../../../tests/language/implicit_creation/implicit_new_prefix_constructor_test.dart",
   "../../../tests/language/import/collection_no_prefix_test.dart",
-  "../../../tests/language/import/combinators2_runtime_test.dart",
   "../../../tests/language/import/config_corelib_test.dart",
   "../../../tests/language/import/core_no_prefix_test.dart",
   "../../../tests/language/import/core_prefix_test.dart",
@@ -1667,18 +1484,8 @@
   "../../../tests/language/import/cyclic_test.dart",
   "../../../tests/language/import/duplicate_prefix_test.dart",
   "../../../tests/language/import/hidden_import_test.dart",
-  "../../../tests/language/import/hidden_runtime_test.dart",
-  "../../../tests/language/import/internal_library_runtime_test.dart",
   "../../../tests/language/import/name_clash_test.dart",
-  "../../../tests/language/import/nonexisting_dart_uri_runtime_test.dart",
-  "../../../tests/language/import/private_runtime_test.dart",
-  "../../../tests/language/import/self_runtime_test.dart",
   "../../../tests/language/import/show_test.dart",
-  "../../../tests/language/inference/accessor_ref_runtime_1_test.dart",
-  "../../../tests/language/inference/accessor_ref_runtime_2_test.dart",
-  "../../../tests/language/inference/accessor_ref_runtime_3_test.dart",
-  "../../../tests/language/inference/accessor_ref_runtime_4_test.dart",
-  "../../../tests/language/inference/accessor_ref_runtime_test.dart",
   "../../../tests/language/inference/dynamic_nullable_test.dart",
   "../../../tests/language/inference_update_1/downward_inference_preferred_over_horizontal_test.dart",
   "../../../tests/language/inference_update_1/horizontal_inference_disabled_test.dart",
@@ -1730,7 +1537,6 @@
   "../../../tests/language/initializing_formal/capture_test.dart",
   "../../../tests/language/initializing_formal/promotion_test.dart",
   "../../../tests/language/initializing_formal/scope_test.dart",
-  "../../../tests/language/initializing_formal/type_annotation_runtime_test.dart",
   "../../../tests/language/instance/compound_assignment_operator_test.dart",
   "../../../tests/language/instance/field_initializer_test.dart",
   "../../../tests/language/instance/incr_deopt_test.dart",
@@ -1745,13 +1551,8 @@
   "../../../tests/language/interceptor/interceptor9_test.dart",
   "../../../tests/language/interceptor/interceptor_test.dart",
   "../../../tests/language/interface/constants_test.dart",
-  "../../../tests/language/interface/duplicate_interface_implements_runtime_test.dart",
   "../../../tests/language/interface/duplicate_interface_test.dart",
-  "../../../tests/language/interface/implements_futureor_runtime_test.dart",
   "../../../tests/language/interface/inherit_field_test.dart",
-  "../../../tests/language/interface/injection1_runtime_test.dart",
-  "../../../tests/language/interface/injection2_runtime_test.dart",
-  "../../../tests/language/interface/runtime_test.dart",
   "../../../tests/language/invalid_returns/async_valid_returns_test.dart",
   "../../../tests/language/invalid_returns/sync_valid_returns_test.dart",
   "../../../tests/language/is/function_test.dart",
@@ -1760,20 +1561,11 @@
   "../../../tests/language/is/interfaces_test.dart",
   "../../../tests/language/is/is2_test.dart",
   "../../../tests/language/is/is4_test.dart",
-  "../../../tests/language/is/isnot_malformed_type_runtime_test.dart",
-  "../../../tests/language/is/malformed_type_runtime_test.dart",
   "../../../tests/language/is/nan_test.dart",
   "../../../tests/language/is/object_test.dart",
   "../../../tests/language/is/operator_clash_test.dart",
   "../../../tests/language/is/operator_test.dart",
   "../../../tests/language/is/optimized_test.dart",
-  "../../../tests/language/label/label3_runtime_1_test.dart",
-  "../../../tests/language/label/label3_runtime_test.dart",
-  "../../../tests/language/label/label5_runtime_test.dart",
-  "../../../tests/language/label/label6_runtime_1_test.dart",
-  "../../../tests/language/label/label6_runtime_2_test.dart",
-  "../../../tests/language/label/label6_runtime_test.dart",
-  "../../../tests/language/label/label8_runtime_test.dart",
   "../../../tests/language/label/label_test.dart",
   "../../../tests/language/lazy/map_test.dart",
   "../../../tests/language/lazy/static2_test.dart",
@@ -1784,24 +1576,7 @@
   "../../../tests/language/lazy/static8_test.dart",
   "../../../tests/language/lazy/static_test.dart",
   "../../../tests/language/lazy/throwing_variable_test.dart",
-  "../../../tests/language/least_upper_bound/expansive_runtime_test.dart",
   "../../../tests/language/least_upper_bound/least_upper_bound_function_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_10_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_11_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_14_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_15_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_16_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_18_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_19_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_20_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_22_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_3_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_4_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_5_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_7_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_8_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_9_test.dart",
-  "../../../tests/language/least_upper_bound/runtime_test.dart",
   "../../../tests/language/library/juxtaposition_test.dart",
   "../../../tests/language/library/library1_test.dart",
   "../../../tests/language/library/library5_test.dart",
@@ -1816,7 +1591,6 @@
   "../../../tests/language/list/is_test.dart",
   "../../../tests/language/list/length_tracer_test.dart",
   "../../../tests/language/list/list_test.dart",
-  "../../../tests/language/list/literal1_runtime_test.dart",
   "../../../tests/language/list/literal2_test.dart",
   "../../../tests/language/list/literal3_test.dart",
   "../../../tests/language/list/literal_test.dart",
@@ -1826,7 +1600,6 @@
   "../../../tests/language/list/tracer_in_list_test.dart",
   "../../../tests/language/list/tracer_in_map_test.dart",
   "../../../tests/language/list/tracer_return_from_tearoff_closure_test.dart",
-  "../../../tests/language/loop/break_outside_loop_runtime_test.dart",
   "../../../tests/language/loop/break_test.dart",
   "../../../tests/language/loop/continue_test.dart",
   "../../../tests/language/loop/do_while2_test.dart",
@@ -1843,23 +1616,14 @@
   "../../../tests/language/loop/for_in_side_effects_test.dart",
   "../../../tests/language/loop/for_in_test.dart",
   "../../../tests/language/loop/for_inlining_test.dart",
-  "../../../tests/language/loop/for_runtime_test.dart",
   "../../../tests/language/loop/for_variable_capture_test.dart",
   "../../../tests/language/loop/for_without_condition_test.dart",
   "../../../tests/language/loop/hoist_test.dart",
   "../../../tests/language/loop/non_dominating_loop_test.dart",
   "../../../tests/language/loop/unconditional_break_test.dart",
   "../../../tests/language/loop/while_test.dart",
-  "../../../tests/language/malbounded/instantiation_runtime_test.dart",
-  "../../../tests/language/malbounded/type_cast_runtime_test.dart",
-  "../../../tests/language/malbounded/type_literal_runtime_test.dart",
-  "../../../tests/language/malbounded/type_test2_runtime_test.dart",
-  "../../../tests/language/malbounded/type_test_runtime_test.dart",
-  "../../../tests/language/malformed/inheritance_runtime_test.dart",
-  "../../../tests/language/malformed/runtime_test.dart",
   "../../../tests/language/map/literal10_test.dart",
   "../../../tests/language/map/literal12_test.dart",
-  "../../../tests/language/map/literal1_runtime_test.dart",
   "../../../tests/language/map/literal2_test.dart",
   "../../../tests/language/map/literal5_test.dart",
   "../../../tests/language/map/literal6_test.dart",
@@ -1882,15 +1646,12 @@
   "../../../tests/language/method/binding_test.dart",
   "../../../tests/language/method/invocation_test.dart",
   "../../../tests/language/method/name_test.dart",
-  "../../../tests/language/method/not_found_runtime_test.dart",
-  "../../../tests/language/method/override3_runtime_test.dart",
   "../../../tests/language/method/override_test.dart",
   "../../../tests/language/mixin/abstract_getter_test.dart",
   "../../../tests/language/mixin/accessor_test.dart",
   "../../../tests/language/mixin/and_extension_member_test.dart",
   "../../../tests/language/mixin/bound_test.dart",
   "../../../tests/language/mixin/class_from_core_library_test.dart",
-  "../../../tests/language/mixin/cyclic_runtime_test.dart",
   "../../../tests/language/mixin/deduplication_test.dart",
   "../../../tests/language/mixin/extends_field_test.dart",
   "../../../tests/language/mixin/extends_is_test.dart",
@@ -1906,15 +1667,10 @@
   "../../../tests/language/mixin/forwarding_stub_tearoff_test.dart",
   "../../../tests/language/mixin/generic_test.dart",
   "../../../tests/language/mixin/getter_regression_test.dart",
-  "../../../tests/language/mixin/illegal_constructor_runtime_test.dart",
-  "../../../tests/language/mixin/illegal_static_access_runtime_test.dart",
-  "../../../tests/language/mixin/illegal_super_use_runtime_test.dart",
-  "../../../tests/language/mixin/illegal_superclass_runtime_test.dart",
   "../../../tests/language/mixin/implements2_test.dart",
   "../../../tests/language/mixin/implements_test.dart",
   "../../../tests/language/mixin/implicit_covariance_test.dart",
   "../../../tests/language/mixin/inference_mixin_field_test.dart",
-  "../../../tests/language/mixin/interface_check_runtime_test.dart",
   "../../../tests/language/mixin/is_test.dart",
   "../../../tests/language/mixin/issue10216_2_test.dart",
   "../../../tests/language/mixin/issue10216_test.dart",
@@ -2012,7 +1768,6 @@
   "../../../tests/language/mixin_legacy/and_extension_member_test.dart",
   "../../../tests/language/mixin_legacy/bound_test.dart",
   "../../../tests/language/mixin_legacy/class_from_core_library_test.dart",
-  "../../../tests/language/mixin_legacy/cyclic_runtime_test.dart",
   "../../../tests/language/mixin_legacy/deduplication_test.dart",
   "../../../tests/language/mixin_legacy/extends_field_test.dart",
   "../../../tests/language/mixin_legacy/extends_is_test.dart",
@@ -2028,22 +1783,15 @@
   "../../../tests/language/mixin_legacy/forwarding_stub_tearoff_test.dart",
   "../../../tests/language/mixin_legacy/generic_test.dart",
   "../../../tests/language/mixin_legacy/getter_regression_test.dart",
-  "../../../tests/language/mixin_legacy/illegal_constructor_runtime_test.dart",
-  "../../../tests/language/mixin_legacy/illegal_static_access_runtime_test.dart",
-  "../../../tests/language/mixin_legacy/illegal_super_use_runtime_test.dart",
-  "../../../tests/language/mixin_legacy/illegal_superclass_runtime_test.dart",
   "../../../tests/language/mixin_legacy/implements2_test.dart",
   "../../../tests/language/mixin_legacy/implements_test.dart",
   "../../../tests/language/mixin_legacy/implicit_covariance_test.dart",
   "../../../tests/language/mixin_legacy/inference_mixin_field_test.dart",
-  "../../../tests/language/mixin_legacy/interface_check_runtime_test.dart",
-  "../../../tests/language/mixin_legacy/invalid_override_in_mixin_runtime_test.dart",
   "../../../tests/language/mixin_legacy/is_test.dart",
   "../../../tests/language/mixin_legacy/issue10216_2_test.dart",
   "../../../tests/language/mixin_legacy/issue10216_test.dart",
   "../../../tests/language/mixin_legacy/lib_extends_field_test.dart",
   "../../../tests/language/mixin_legacy/lib_extends_method_test.dart",
-  "../../../tests/language/mixin_legacy/method_override_runtime_test.dart",
   "../../../tests/language/mixin_legacy/method_test.dart",
   "../../../tests/language/mixin_legacy/mixin2_test.dart",
   "../../../tests/language/mixin_legacy/mixin3_test.dart",
@@ -2097,8 +1845,6 @@
   "../../../tests/language/mixin_legacy/with_named_import_test.dart",
   "../../../tests/language/named_arguments_anywhere/all_kinds_test.dart",
   "../../../tests/language/named_arguments_anywhere/order_side_effects_ok_test.dart",
-  "../../../tests/language/new/create_unresolved_type_runtime_test.dart",
-  "../../../tests/language/new/expression_type_args_runtime_test.dart",
   "../../../tests/language/new/statement_test.dart",
   "../../../tests/language/nnbd/boolean_conversion/boolean_conversion_strong_test.dart",
   "../../../tests/language/nnbd/const/potentially_constant_types_test.dart",
@@ -2285,7 +2031,6 @@
   "../../../tests/language/nosuchmethod_forwarding/nosuchmethod_forwarding_arguments_test.dart",
   "../../../tests/language/nosuchmethod_forwarding/nosuchmethod_forwarding_partial_instantiation_test.dart",
   "../../../tests/language/null/access_error_test.dart",
-  "../../../tests/language/null/checked_runtime_test.dart",
   "../../../tests/language/null/inline_test.dart",
   "../../../tests/language/null/is2_test.dart",
   "../../../tests/language/null/is_test.dart",
@@ -2294,33 +2039,16 @@
   "../../../tests/language/null/null2_test.dart",
   "../../../tests/language/null/to_string2_test.dart",
   "../../../tests/language/null/to_string_test.dart",
-  "../../../tests/language/null_aware/access_runtime_test.dart",
-  "../../../tests/language/null_aware/assignment_runtime_test.dart",
   "../../../tests/language/null_aware/dynamic_test.dart",
-  "../../../tests/language/null_aware/increment_decrement_runtime_test.dart",
   "../../../tests/language/null_aware/index_this_null_aware_equals_test.dart",
-  "../../../tests/language/null_aware/invocation_runtime_test.dart",
   "../../../tests/language/null_aware/null_aware_index_on_null_test.dart",
   "../../../tests/language/null_aware/null_shortening_test.dart",
   "../../../tests/language/null_aware/opt_test.dart",
   "../../../tests/language/number/constant_folding1_test.dart",
-  "../../../tests/language/number/identifier_runtime_test.dart",
   "../../../tests/language/number/identity2_test.dart",
   "../../../tests/language/number/identity_test.dart",
   "../../../tests/language/number/infinity_test.dart",
   "../../../tests/language/number/int2_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_10_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_11_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_1_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_2_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_3_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_4_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_5_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_6_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_7_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_8_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_9_test.dart",
-  "../../../tests/language/number/int64_literal_runtime_test.dart",
   "../../../tests/language/number/int_test.dart",
   "../../../tests/language/number/numbers_test.dart",
   "../../../tests/language/number/syntax_test.dart",
@@ -2343,7 +2071,6 @@
   "../../../tests/language/operator/index_evaluation_order_test.dart",
   "../../../tests/language/operator/index_test.dart",
   "../../../tests/language/operator/integer_division_by_zero_test.dart",
-  "../../../tests/language/operator/invalid_assignment_to_postfix_increment_runtime_test.dart",
   "../../../tests/language/operator/left_shift_test.dart",
   "../../../tests/language/operator/logical_expression2_test.dart",
   "../../../tests/language/operator/logical_expression4_test.dart",
@@ -2373,7 +2100,6 @@
   "../../../tests/language/operator/truncdiv_zero_test.dart",
   "../../../tests/language/operator/unary2_test.dart",
   "../../../tests/language/operator/unary_test.dart",
-  "../../../tests/language/operator/unsupported_runtime_test.dart",
   "../../../tests/language/optimize/allocation_sinking_inlining_test.dart",
   "../../../tests/language/optimize/bailout2_test.dart",
   "../../../tests/language/optimize/bailout3_test.dart",
@@ -2402,7 +2128,6 @@
   "../../../tests/language/optimize/inferrer_constructor2_test.dart",
   "../../../tests/language/optimize/inferrer_constructor3_test.dart",
   "../../../tests/language/optimize/inferrer_constructor4_test.dart",
-  "../../../tests/language/optimize/inferrer_constructor5_runtime_test.dart",
   "../../../tests/language/optimize/inferrer_constructor_test.dart",
   "../../../tests/language/optimize/inferrer_named_parameter_test.dart",
   "../../../tests/language/optimize/inferrer_synthesized_constructor_test.dart",
@@ -2435,33 +2160,18 @@
   "../../../tests/language/optimize/string_charat_test.dart",
   "../../../tests/language/optimize/string_charcodeat_test.dart",
   "../../../tests/language/override/const_field_test.dart",
-  "../../../tests/language/override/inheritance_abstract_runtime_1_test.dart",
-  "../../../tests/language/override/inheritance_abstract_runtime_2_test.dart",
-  "../../../tests/language/override/inheritance_abstract_runtime_3_test.dart",
-  "../../../tests/language/override/inheritance_abstract_runtime_4_test.dart",
-  "../../../tests/language/override/inheritance_abstract_runtime_5_test.dart",
-  "../../../tests/language/override/inheritance_abstract_runtime_6_test.dart",
-  "../../../tests/language/override/inheritance_abstract_runtime_7_test.dart",
-  "../../../tests/language/override/inheritance_abstract_runtime_test.dart",
-  "../../../tests/language/override/method_with_field_runtime_test.dart",
-  "../../../tests/language/parameter/bad_named2_runtime_test.dart",
-  "../../../tests/language/parameter/bad_named_runtime_test.dart",
   "../../../tests/language/parameter/initializer2_test.dart",
   "../../../tests/language/parameter/initializer5_test.dart",
   "../../../tests/language/parameter/initializer_test.dart",
   "../../../tests/language/parameter/metadata_test.dart",
   "../../../tests/language/parameter/name_conflict_test.dart",
-  "../../../tests/language/parameter/named_aggregated_runtime_test.dart",
   "../../../tests/language/parameter/named_clash_test.dart",
   "../../../tests/language/parameter/named_count_test.dart",
-  "../../../tests/language/parameter/named_default_eq_runtime_test.dart",
   "../../../tests/language/parameter/named_passing_false_test.dart",
   "../../../tests/language/parameter/named_passing_falsy_test.dart",
   "../../../tests/language/parameter/named_passing_null_test.dart",
   "../../../tests/language/parameter/named_passing_zero_test.dart",
   "../../../tests/language/parameter/named_regression_test.dart",
-  "../../../tests/language/parameter/named_runtime_test.dart",
-  "../../../tests/language/parameter/named_type_runtime_test.dart",
   "../../../tests/language/parameter/named_with_conversions_test.dart",
   "../../../tests/language/parameter/named_with_dollars_test.dart",
   "../../../tests/language/parameter/named_with_object_property_names_test.dart",
@@ -2469,7 +2179,6 @@
   "../../../tests/language/parameter/param_test.dart",
   "../../../tests/language/parameter/parameter1_test.dart",
   "../../../tests/language/parameter/parameter2_test.dart",
-  "../../../tests/language/parameter/positional_type_runtime_test.dart",
   "../../../tests/language/parameter/types_specialization_test.dart",
   "../../../tests/language/part/refers_to_core_library_runtime_test.dart",
   "../../../tests/language/patterns/call_tear_off_test.dart",
diff --git a/tests/language/abstract/exact_selector_runtime_test.dart b/tests/language/abstract/exact_selector_runtime_test.dart
deleted file mode 100644
index 3d8f29e..0000000
--- a/tests/language/abstract/exact_selector_runtime_test.dart
+++ /dev/null
@@ -1,40 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Regression test for dart2js that used to duplicate some `Object`
-// methods to handle `noSuchMethod`.
-
-import "package:expect/expect.dart";
-
-class Foo {
-  noSuchMethod(im) => 42;
-}
-
-@pragma('vm:never-inline')
-@pragma('dart2js:noInline')
-returnFoo() {
-  (() => 42)();
-  return new Foo();
-}
-
-class Bar {
-  operator ==(other) => false;
-}
-
-var a = [false, true, new Object(), new Bar()];
-
-main() {
-  if (a[0] as bool) {
-    // This `==` call will make the compiler create a selector with an
-    // exact `TypeMask` of `Foo`. Since `Foo` is abstract, such a call
-    // cannot happen, but we still used to generate a `==` method on
-    // the `Object` class to handle `noSuchMethod`.
-    print(returnFoo() == 42);
-  } else {
-    Expect.isFalse(a[2] == 42);
-  }
-}
diff --git a/tests/language/abstract/factory_constructor_runtime_test.dart b/tests/language/abstract/factory_constructor_runtime_test.dart
deleted file mode 100644
index 33dcd17..0000000
--- a/tests/language/abstract/factory_constructor_runtime_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test program for constructors and initializers.
-
-// Exercises issue 2282, factory constructors in abstract classes should
-// not emit a static type warning
-
-class B extends A1 {
-  B() {}
-  method() {}
-}
-
-abstract class A1 {
-  A1() {}
-  method(); // Abstract.
-  factory A1.make() {
-    return new B();
-  }
-}
-
-main() {
-  new A1.make();
-}
diff --git a/tests/language/argument/assignability_function_typed_runtime_test.dart b/tests/language/argument/assignability_function_typed_runtime_test.dart
deleted file mode 100644
index 172c2ce3..0000000
--- a/tests/language/argument/assignability_function_typed_runtime_test.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-void f(num callback(num x)) {}
-
-Object intToObject(int x) => 0;
-Object numToObject(num x) => 0;
-Object objectToObject(Object x) => 0;
-int intToInt(int x) => 0;
-int numToInt(num x) => 0;
-int objectToInt(Object x) => 0;
-num intToNum(int x) => 0;
-num numToNum(num x) => 0;
-num objectToNum(Object x) => 0;
-
-main() {
-  // Unrelated types (not assignable)
-
-  // Assignable but fails at runtime.
-  var intToObject2 = intToObject;
-
-  var intToNum2 = intToNum;
-
-  var numToObject2 = numToObject;
-
-  // Ok
-  f(numToNum);
-  f(numToInt);
-  f(objectToNum);
-  f(objectToInt);
-}
diff --git a/tests/language/assert/initializer_const_error2_runtime_test.dart b/tests/language/assert/initializer_const_error2_runtime_test.dart
deleted file mode 100644
index aa83c8c..0000000
--- a/tests/language/assert/initializer_const_error2_runtime_test.dart
+++ /dev/null
@@ -1,58 +0,0 @@
-// 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.
-// VMOptions=--enable-asserts
-// dart2jsOptions=--enable-asserts
-//
-// Test of asserts in initializer lists.
-
-import "package:expect/expect.dart";
-
-class C {
-  final int x;
-  // Const constructors.
-  const C.cc01(this.x, y) : assert(x < y);
-  const C.cc02(x, y) : x = x, assert(x < y);
-  const C.cc03(x, y) : assert(x < y), x = x;
-  const C.cc04(this.x, y) : assert(x < y), super();
-  const C.cc05(x, y) : x = x, assert(x < y), super();
-  const C.cc06(x, y) : assert(x < y), x = x, super();
-  const C.cc07(x, y) : assert(x < y), x = x, assert(y > x), super();
-  const C.cc08(this.x, y) : assert(x < y, "$x < $y");
-  const C.cc09(this.x, y) : assert(x < y);
-  const C.cc10(this.x, y) : assert(x < y, "$x < $y");
-}
-
-main() {
-  const x = 3;
-  {
-    const C.cc01(2, x);
-  }
-  {
-    const C.cc02(2, x);
-  }
-  {
-    const C.cc03(2, x);
-  }
-  {
-    const C.cc04(2, x);
-  }
-  {
-    const C.cc05(2, x);
-  }
-  {
-    const C.cc06(2, x);
-  }
-  {
-    const C.cc07(2, x);
-  }
-  {
-    const C.cc08(2, x);
-  }
-  {
-    const C.cc09(2, x);
-  }
-  {
-    const C.cc10(2, x);
-  }
-}
diff --git a/tests/language/assert/initializer_const_error2_test.dart b/tests/language/assert/initializer_const_error2_test.dart
index 48b1190..1453311 100644
--- a/tests/language/assert/initializer_const_error2_test.dart
+++ b/tests/language/assert/initializer_const_error2_test.dart
@@ -20,7 +20,21 @@
   const C.cc10(this.x, y) : assert(x < y, "$x < $y");
 }
 
-main() {
+void main() {
+  {
+    const x = 3;
+    const C.cc01(2, x);
+    const C.cc02(2, x);
+    const C.cc03(2, x);
+    const C.cc04(2, x);
+    const C.cc05(2, x);
+    const C.cc06(2, x);
+    const C.cc07(2, x);
+    const C.cc08(2, x);
+    const C.cc09(2, x);
+    const C.cc10(2, x);
+  }
+
   {
     const x = 1;
     const C.cc01(2, x);
@@ -28,73 +42,55 @@
     // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
     //    ^
     // [cfe] Constant evaluation error:
-  }
-  {
-    const x = 1;
+
     const C.cc02(2, x);
     // [error column 5, length 18]
     // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
     //    ^
     // [cfe] Constant evaluation error:
-  }
-  {
-    const x = 1;
+
     const C.cc03(2, x);
     // [error column 5, length 18]
     // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
     //    ^
     // [cfe] Constant evaluation error:
-  }
-  {
-    const x = 1;
+
     const C.cc04(2, x);
     // [error column 5, length 18]
     // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
     //    ^
     // [cfe] Constant evaluation error:
-  }
-  {
-    const x = 1;
+
     const C.cc05(2, x);
     // [error column 5, length 18]
     // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
     //    ^
     // [cfe] Constant evaluation error:
-  }
-  {
-    const x = 1;
+
     const C.cc06(2, x);
     // [error column 5, length 18]
     // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
     //    ^
     // [cfe] Constant evaluation error:
-  }
-  {
-    const x = 1;
+
     const C.cc07(2, x);
     // [error column 5, length 18]
     // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
     //    ^
     // [cfe] Constant evaluation error:
-  }
-  {
-    const x = 1;
+
     const C.cc08(2, x);
     // [error column 5, length 18]
     // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
     //    ^
     // [cfe] Constant evaluation error:
-  }
-  {
-    const x = 1;
+
     const C.cc09(2, x);
     // [error column 5, length 18]
     // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
     //    ^
     // [cfe] Constant evaluation error:
-  }
-  {
-    const x = 1;
+
     const C.cc10(2, x);
     // [error column 5, length 18]
     // [analyzer] COMPILE_TIME_ERROR.CONST_EVAL_THROWS_EXCEPTION
diff --git a/tests/language/assert/initializer_const_error_runtime_test.dart b/tests/language/assert/initializer_const_error_runtime_test.dart
deleted file mode 100644
index d133e0d..0000000
--- a/tests/language/assert/initializer_const_error_runtime_test.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class C {
-  static bool check(x, y) => x < y;
-  final int x;
-  const C(this.x);
-  // The expression is not a potentially constant expression.
-  // This is a compile-time error even in production mode.
-  const C.bc03(this.x, y);
-}
-
-main() {
-  var c = new C.bc03(1, 2);
-  if (c.x != 1) throw "non-trivial use of c";
-}
diff --git a/tests/language/async/congruence_local_runtime_test.dart b/tests/language/async/congruence_local_runtime_test.dart
deleted file mode 100644
index 01c3112..0000000
--- a/tests/language/async/congruence_local_runtime_test.dart
+++ /dev/null
@@ -1,119 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// This test verifies that for a local async function, the following three
-// types are all appropriately matched:
-// - The static return type
-// - The return type of reified runtime type of a tearoff of the function or
-//   method
-// - The reified type of the future returned by the function or method
-//
-// Specific attention is paid to the following conditions:
-// - The static return type is determined by type inference
-// - The static return type is `dynamic`
-// - The function or method immediately returns a value or future with a
-//   different type (possibly using `=>` syntax)
-
-import 'dart:async';
-
-import 'package:expect/expect.dart';
-
-class A {}
-
-class B extends A {}
-
-Future quick() async {}
-
-Future<B> futureB() => new Future<B>.value(new B());
-
-void checkDynamic(dynamic tearoff) {
-  Expect.isTrue(tearoff is dynamic Function());
-  Expect.isFalse(tearoff is Future<dynamic> Function());
-  dynamic f = tearoff();
-  Expect.isTrue(f is Future<dynamic>);
-  Expect.isFalse(f is Future<A>);
-}
-
-void checkFutureObject(dynamic tearoff) {
-  Expect.isTrue(tearoff is Future<Object> Function());
-  Expect.isFalse(tearoff is Future<A> Function());
-  dynamic f = tearoff();
-  Expect.isTrue(f is Future<Object>);
-  Expect.isFalse(f is Future<A>);
-}
-
-void checkFutureA(dynamic tearoff) {
-  Expect.isTrue(tearoff is Future<A> Function());
-  Expect.isFalse(tearoff is Future<B> Function());
-  dynamic f = tearoff();
-  Expect.isTrue(f is Future<A>);
-  Expect.isFalse(f is Future<B>);
-}
-
-main() {
-  f_inferred_futureObject() async {
-    await quick();
-    if (false) {
-      return 0;
-    } else {
-      return new A();
-    }
-  }
-
-  f_inferred_A() async {
-    await quick();
-    if (false) {
-      return new A();
-    } else {
-      return new B();
-    }
-  }
-
-  dynamic f_dynamic() async {
-    await quick();
-    return new B();
-  }
-
-  Future<A> f_A() async {
-    await quick();
-    return new B();
-  }
-
-  Future<A> f_immediateReturn_B() async {
-    return new B();
-  }
-
-  Future<A> f_immediateReturn_FutureB() async {
-    return futureB();
-  }
-
-  Future<A> f_expressionSyntax_B() async => new B();
-
-  Future<A> f_expressionSyntax_FutureB() async => futureB();
-
-  // Not executed
-  void checkStaticTypes() {
-    // Check that f_inferred_futureObject's static return type is
-    // `Future<Object>`, by verifying that its return value can be assigned to
-    // `Future<Object>` but not `Future<int>`.
-    Future<Object> v1 = f_inferred_futureObject();
-
-    // Check that f_inferred_A's static return type is `Future<A>`, by verifying
-    // that its return value can be assigned to `Future<A>` but not
-    // `Future<B>`.
-    Future<A> v3 = f_inferred_A();
-  }
-
-  checkFutureObject(f_inferred_futureObject);
-  checkFutureA(f_inferred_A);
-  checkDynamic(f_dynamic);
-  checkFutureA(f_A);
-  checkFutureA(f_immediateReturn_B);
-  checkFutureA(f_immediateReturn_FutureB);
-  checkFutureA(f_expressionSyntax_B);
-  checkFutureA(f_expressionSyntax_FutureB);
-}
diff --git a/tests/language/async/congruence_method_runtime_test.dart b/tests/language/async/congruence_method_runtime_test.dart
deleted file mode 100644
index fb3f82e..0000000
--- a/tests/language/async/congruence_method_runtime_test.dart
+++ /dev/null
@@ -1,113 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// This test verifies that for an async method, the following three
-// types are all appropriately matched:
-// - The static return type
-// - The return type of reified runtime type of a tearoff of the function or
-//   method
-// - The reified type of the future returned by the function or method
-//
-// Specific attention is paid to the following conditions:
-// - The static return type is determined by type inference
-// - The static return type is `dynamic`
-// - The function or method immediately returns a value or future with a
-//   different type (possibly using `=>` syntax)
-
-import 'dart:async';
-
-import 'package:expect/expect.dart';
-
-class A {}
-
-class B extends A {}
-
-Future quick() async {}
-
-Future<B> futureB() => new Future<B>.value(new B());
-
-abstract class I {
-  dynamic f_inferred_dynamic();
-  Future<A> f_inferred_A();
-}
-
-class C implements I {
-  f_inferred_dynamic() async {
-    await quick();
-    return new B();
-  }
-
-  f_inferred_A() async {
-    await quick();
-    return new B();
-  }
-
-  dynamic f_dynamic() async {
-    await quick();
-    return new B();
-  }
-
-  Future<A> f_A() async {
-    await quick();
-    return new B();
-  }
-
-  Future<A> f_immediateReturn_B() async {
-    return new B();
-  }
-
-  Future<A> f_immediateReturn_FutureB() async {
-    return futureB();
-  }
-
-  Future<A> f_expressionSyntax_B() async => new B();
-
-  Future<A> f_expressionSyntax_FutureB() async => futureB();
-}
-
-// Not executed
-void checkStaticTypes(C c) {
-  // Check that f_inferred_dynamic's static return type is `dynamic`, by
-  // verifying that no error occurs if we try to call `foo` on its return value.
-  c.f_inferred_dynamic().foo();
-
-  // Check that f_inferred_A's static return type is `Future<A>`, by verifying
-  // that its return value can be assigned to `Future<A>` but not
-  // `Future<B>`.
-  Future<A> v1 = c.f_inferred_A();
-}
-
-void checkDynamic(dynamic tearoff) {
-  Expect.isTrue(tearoff is dynamic Function());
-  Expect.isFalse(tearoff is Future<dynamic> Function());
-  dynamic f = tearoff();
-  Expect.isTrue(f is Future<dynamic>);
-  Expect.isFalse(f is Future<A>);
-}
-
-void checkFutureA(dynamic tearoff) {
-  Expect.isTrue(tearoff is Future<A> Function());
-  Expect.isFalse(tearoff is Future<B> Function());
-  dynamic f = tearoff();
-  Expect.isTrue(f is Future<A>);
-  Expect.isFalse(f is Future<B>);
-}
-
-void test(C c) {
-  checkDynamic(c.f_inferred_dynamic);
-  checkFutureA(c.f_inferred_A);
-  checkDynamic(c.f_dynamic);
-  checkFutureA(c.f_A);
-  checkFutureA(c.f_immediateReturn_B);
-  checkFutureA(c.f_immediateReturn_FutureB);
-  checkFutureA(c.f_expressionSyntax_B);
-  checkFutureA(c.f_expressionSyntax_FutureB);
-}
-
-main() {
-  test(new C());
-}
diff --git a/tests/language/async/congruence_unnamed_runtime_test.dart b/tests/language/async/congruence_unnamed_runtime_test.dart
deleted file mode 100644
index 352b19a..0000000
--- a/tests/language/async/congruence_unnamed_runtime_test.dart
+++ /dev/null
@@ -1,139 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// This test verifies that for an unnamed async closure, the following three
-// types are all appropriately matched:
-// - The static return type
-// - The return type of reified runtime type of a tearoff of the function or
-//   method
-// - The reified type of the future returned by the function or method
-//
-// Specific attention is paid to the following conditions:
-// - The static return type is determined by type inference
-// - The static return type is `dynamic`
-// - The function or method immediately returns a value or future with a
-//   different type (possibly using `=>` syntax)
-
-import 'dart:async';
-
-import 'package:expect/expect.dart';
-
-class A {}
-
-class B extends A {}
-
-Future quick() async {}
-
-Future<A> futureA() => new Future<A>.value(new A());
-
-Future<B> futureB() => new Future<B>.value(new B());
-
-void checkFutureObject(dynamic tearoff) {
-  Expect.isTrue(tearoff is Future<Object> Function());
-  Expect.isFalse(tearoff is Future<A> Function());
-  dynamic f = tearoff();
-  Expect.isTrue(f is Future<Object>);
-  Expect.isFalse(f is Future<A>);
-}
-
-void checkFutureDynamic(dynamic tearoff) {
-  Expect.isTrue(tearoff is Future<dynamic> Function());
-  Expect.isFalse(tearoff is Future<A> Function());
-  dynamic f = tearoff();
-  Expect.isTrue(f is Future<dynamic>);
-  Expect.isFalse(f is Future<A>);
-}
-
-void checkFutureA(dynamic tearoff) {
-  Expect.isTrue(tearoff is Future<A> Function());
-  Expect.isFalse(tearoff is Future<B> Function());
-  dynamic f = tearoff();
-  Expect.isTrue(f is Future<A>);
-  Expect.isFalse(f is Future<B>);
-}
-
-main() {
-  var f_inferred_futureObject = () async {
-    await quick();
-    if (false) {
-      return 0;
-    } else {
-      return new A();
-    }
-  };
-
-  var f_inferred_A = () async {
-    await quick();
-    if (false) {
-      return new A();
-    } else {
-      return new B();
-    }
-  };
-
-  Future<dynamic> Function() f_futureDynamic = () async {
-    await quick();
-    if (false) {
-      return 0;
-    } else {
-      return new B();
-    }
-  };
-
-  Future<A> Function() f_A = () async {
-    await quick();
-    if (false) {
-      return new A();
-    } else {
-      return new B();
-    }
-  };
-
-  Future<A> Function() f_immediateReturn_B = () async {
-    if (false) {
-      return new A();
-    } else {
-      return new B();
-    }
-  };
-
-  Future<A> Function() f_immediateReturn_FutureB = () async {
-    if (false) {
-      return new A();
-    } else {
-      return futureB();
-    }
-  };
-
-  Future<A> Function() f_expressionSyntax_B =
-      () async => false ? new A() : new B();
-
-  Future<A> Function() f_expressionSyntax_FutureB =
-      () async => false ? futureA() : futureB();
-
-  // Not executed
-  void checkStaticTypes() {
-    // Check that f_inferred_futureObject's static return type is
-    // `Future<Object>`, by verifying that its return value can be assigned to
-    // `Future<Object>` but not `Future<int>`.
-    Future<Object> v1 = f_inferred_futureObject();
-
-    // Check that f_inferred_A's static return type is `Future<A>`, by verifying
-    // that its return value can be assigned to `Future<A>` but not
-    // `Future<B>`.
-    Future<A> v3 = f_inferred_A();
-  }
-
-  checkFutureObject(f_inferred_futureObject);
-  checkFutureA(f_inferred_A);
-  checkFutureDynamic(f_futureDynamic);
-  checkFutureA(f_A);
-  checkFutureA(f_immediateReturn_B);
-  checkFutureA(f_immediateReturn_FutureB);
-  checkFutureA(f_expressionSyntax_B);
-  checkFutureA(f_expressionSyntax_FutureB);
-}
diff --git a/tests/language/async/or_generator_return_type_stacktrace_runtime_test.dart b/tests/language/async/or_generator_return_type_stacktrace_runtime_test.dart
deleted file mode 100644
index b070002..0000000
--- a/tests/language/async/or_generator_return_type_stacktrace_runtime_test.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-void main() {}
diff --git a/tests/language/async/return_types_runtime_test.dart b/tests/language/async/return_types_runtime_test.dart
deleted file mode 100644
index a8d63c64..0000000
--- a/tests/language/async/return_types_runtime_test.dart
+++ /dev/null
@@ -1,67 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "dart:async";
-import "package:expect/async_helper.dart";
-import "package:expect/expect.dart";
-
-Future foo1() async {
-  return 3;
-}
-
-Future<int> foo2() async {
-  return 3;
-}
-
-foo3() async {
-  return "String";
-}
-
-foo4() async {
-  return "String";
-}
-
-foo5() async {
-  return 3;
-}
-
-Future<int> foo6() async {
-  // This is fine, the future is flattened
-  return new Future<int>.value(3);
-}
-
-foo7() async {
-  return new Future<int>.value(3);
-}
-
-Iterable<int> foo8() sync* {
-  yield 1;
-  // Can only have valueless return in sync* functions.
-  return;
-}
-
-Stream<int> foo9() async* {
-  yield 1;
-  // Can only have valueless return in async* functions.
-  return;
-}
-
-Future test() async {
-  Expect.equals(3, await foo1());
-  Expect.equals(3, await foo2());
-  Expect.equals("String", await foo3());
-  Expect.equals("String", await foo4());
-  Expect.equals(3, await foo5());
-  Expect.equals(3, await await foo6());
-  Expect.equals(3, await await foo7());
-  Expect.listEquals([1], foo8().toList());
-  Expect.listEquals([1], await foo9().toList());
-}
-
-main() {
-  asyncTest(test);
-}
diff --git a/tests/language/await/backwards_compatibility_runtime_test.dart b/tests/language/await/backwards_compatibility_runtime_test.dart
deleted file mode 100644
index 1f4893e..0000000
--- a/tests/language/await/backwards_compatibility_runtime_test.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'dart:async';
-
-import 'package:expect/expect.dart';
-
-get await => 4;
-
-// For functions that are declared with the async modifier we treat await as
-// keyword.
-
-test0() async {
-  var x = await 7;
-  Expect.equals(7, x);
-}
-
-test1() async {
-  var x = await 9;
-  Expect.equals(9, x);
-}
-
-// For functions that are not declared with the async modifier we allow await to
-// be used as an identifier.
-
-test2() {
-  var y = await;
-  Expect.equals(4, y);
-}
-
-test3() {
-  var await = 3;
-  Expect.equals(3, await);
-}
-
-main() {
-  test0();
-  test1();
-  test2();
-  test3();
-}
diff --git a/tests/language/call/method_implicit_invoke_local_runtime_1_legacy_test.dart b/tests/language/call/method_implicit_invoke_local_runtime_1_legacy_test.dart
deleted file mode 100644
index 9a9ade4..0000000
--- a/tests/language/call/method_implicit_invoke_local_runtime_1_legacy_test.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Implements Function which is not allowed in Dart 3.
-// @dart=2.19
-
-// Dart test program to test arithmetic operations.
-
-import "package:expect/expect.dart";
-
-class C1 {
-  int call(int i) => 2 * i;
-}
-
-class C2 implements Function {
-  int call(int i) => 2 * i;
-}
-
-main() {
-  C1 c1 = new C1();
-  // Implicitly invokes c1.call(1)
-  Expect.equals(c1(1), 2);
-  dynamic d1 = c1;
-  // Implicitly invokes d1.call(1)
-
-  C2 c2 = new C2();
-  // Implicitly invokes c2.call(1)
-
-  dynamic d2 = c2;
-  // Implicitly invokes d2.call(1)
-
-  // Cannot invoke with the wrong signature.
-}
diff --git a/tests/language/call/method_implicit_invoke_local_runtime_1_test.dart b/tests/language/call/method_implicit_invoke_local_runtime_1_test.dart
deleted file mode 100644
index 0c1307b..0000000
--- a/tests/language/call/method_implicit_invoke_local_runtime_1_test.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Dart test program to test arithmetic operations.
-
-import "package:expect/expect.dart";
-
-class C1 {
-  int call(int i) => 2 * i;
-}
-
-class C2 {
-  int call(int i) => 2 * i;
-}
-
-main() {
-  C1 c1 = new C1();
-  // Implicitly invokes c1.call(1)
-  Expect.equals(c1(1), 2);
-  dynamic d1 = c1;
-  // Implicitly invokes d1.call(1)
-
-  C2 c2 = new C2();
-  // Implicitly invokes c2.call(1)
-
-  dynamic d2 = c2;
-  // Implicitly invokes d2.call(1)
-
-  // Cannot invoke with the wrong signature.
-}
diff --git a/tests/language/call/method_implicit_invoke_local_runtime_2_legacy_test.dart b/tests/language/call/method_implicit_invoke_local_runtime_2_legacy_test.dart
deleted file mode 100644
index 2af4719..0000000
--- a/tests/language/call/method_implicit_invoke_local_runtime_2_legacy_test.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Implements Function which is not allowed in Dart 3.
-// @dart=2.19
-
-// Dart test program to test arithmetic operations.
-
-import "package:expect/expect.dart";
-
-class C1 {
-  int call(int i) => 2 * i;
-}
-
-class C2 implements Function {
-  int call(int i) => 2 * i;
-}
-
-main() {
-  C1 c1 = new C1();
-  // Implicitly invokes c1.call(1)
-
-  dynamic d1 = c1;
-  // Implicitly invokes d1.call(1)
-  Expect.equals(d1(1), 2);
-  C2 c2 = new C2();
-  // Implicitly invokes c2.call(1)
-
-  dynamic d2 = c2;
-  // Implicitly invokes d2.call(1)
-
-  // Cannot invoke with the wrong signature.
-}
diff --git a/tests/language/call/method_implicit_invoke_local_runtime_2_test.dart b/tests/language/call/method_implicit_invoke_local_runtime_2_test.dart
deleted file mode 100644
index 28249b0..0000000
--- a/tests/language/call/method_implicit_invoke_local_runtime_2_test.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Dart test program to test arithmetic operations.
-
-import "package:expect/expect.dart";
-
-class C1 {
-  int call(int i) => 2 * i;
-}
-
-class C2 {
-  int call(int i) => 2 * i;
-}
-
-main() {
-  C1 c1 = new C1();
-  // Implicitly invokes c1.call(1)
-
-  dynamic d1 = c1;
-  // Implicitly invokes d1.call(1)
-  Expect.equals(d1(1), 2);
-  C2 c2 = new C2();
-  // Implicitly invokes c2.call(1)
-
-  dynamic d2 = c2;
-  // Implicitly invokes d2.call(1)
-
-  // Cannot invoke with the wrong signature.
-}
diff --git a/tests/language/call/method_implicit_invoke_local_runtime_3_legacy_test.dart b/tests/language/call/method_implicit_invoke_local_runtime_3_legacy_test.dart
deleted file mode 100644
index e6bbaba..0000000
--- a/tests/language/call/method_implicit_invoke_local_runtime_3_legacy_test.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Implements Function which is not allowed in Dart 3.
-// @dart=2.19
-
-// Dart test program to test arithmetic operations.
-
-import "package:expect/expect.dart";
-
-class C1 {
-  int call(int i) => 2 * i;
-}
-
-class C2 implements Function {
-  int call(int i) => 2 * i;
-}
-
-main() {
-  C1 c1 = new C1();
-  // Implicitly invokes c1.call(1)
-
-  dynamic d1 = c1;
-  // Implicitly invokes d1.call(1)
-
-  C2 c2 = new C2();
-  // Implicitly invokes c2.call(1)
-  Expect.equals(c2(1), 2);
-  dynamic d2 = c2;
-  // Implicitly invokes d2.call(1)
-
-  // Cannot invoke with the wrong signature.
-}
diff --git a/tests/language/call/method_implicit_invoke_local_runtime_3_test.dart b/tests/language/call/method_implicit_invoke_local_runtime_3_test.dart
deleted file mode 100644
index 110f6be..0000000
--- a/tests/language/call/method_implicit_invoke_local_runtime_3_test.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Dart test program to test arithmetic operations.
-
-import "package:expect/expect.dart";
-
-class C1 {
-  int call(int i) => 2 * i;
-}
-
-class C2 {
-  int call(int i) => 2 * i;
-}
-
-main() {
-  C1 c1 = new C1();
-  // Implicitly invokes c1.call(1)
-
-  dynamic d1 = c1;
-  // Implicitly invokes d1.call(1)
-
-  C2 c2 = new C2();
-  // Implicitly invokes c2.call(1)
-  Expect.equals(c2(1), 2);
-  dynamic d2 = c2;
-  // Implicitly invokes d2.call(1)
-
-  // Cannot invoke with the wrong signature.
-}
diff --git a/tests/language/call/method_implicit_invoke_local_runtime_4_legacy_test.dart b/tests/language/call/method_implicit_invoke_local_runtime_4_legacy_test.dart
deleted file mode 100644
index e2c7ffd..0000000
--- a/tests/language/call/method_implicit_invoke_local_runtime_4_legacy_test.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Implements Function which is not allowed in Dart 3.
-// @dart=2.19
-
-// Dart test program to test arithmetic operations.
-
-import "package:expect/expect.dart";
-
-class C1 {
-  int call(int i) => 2 * i;
-}
-
-class C2 implements Function {
-  int call(int i) => 2 * i;
-}
-
-main() {
-  C1 c1 = new C1();
-  // Implicitly invokes c1.call(1)
-
-  dynamic d1 = c1;
-  // Implicitly invokes d1.call(1)
-
-  C2 c2 = new C2();
-  // Implicitly invokes c2.call(1)
-
-  dynamic d2 = c2;
-  // Implicitly invokes d2.call(1)
-  Expect.equals(d2(1), 2);
-  // Cannot invoke with the wrong signature.
-}
diff --git a/tests/language/call/method_implicit_invoke_local_runtime_4_test.dart b/tests/language/call/method_implicit_invoke_local_runtime_4_test.dart
deleted file mode 100644
index f213671..0000000
--- a/tests/language/call/method_implicit_invoke_local_runtime_4_test.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Dart test program to test arithmetic operations.
-
-import "package:expect/expect.dart";
-
-class C1 {
-  int call(int i) => 2 * i;
-}
-
-class C2 {
-  int call(int i) => 2 * i;
-}
-
-main() {
-  C1 c1 = new C1();
-  // Implicitly invokes c1.call(1)
-
-  dynamic d1 = c1;
-  // Implicitly invokes d1.call(1)
-
-  C2 c2 = new C2();
-  // Implicitly invokes c2.call(1)
-
-  dynamic d2 = c2;
-  // Implicitly invokes d2.call(1)
-  Expect.equals(d2(1), 2);
-  // Cannot invoke with the wrong signature.
-}
diff --git a/tests/language/call/method_implicit_invoke_local_runtime_legacy_test.dart b/tests/language/call/method_implicit_invoke_local_runtime_legacy_test.dart
index 01a47c8..28c6b56 100644
--- a/tests/language/call/method_implicit_invoke_local_runtime_legacy_test.dart
+++ b/tests/language/call/method_implicit_invoke_local_runtime_legacy_test.dart
@@ -1,6 +1,3 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
 // 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.
@@ -8,8 +5,6 @@
 // Implements Function which is not allowed in Dart 3.
 // @dart=2.19
 
-// Dart test program to test arithmetic operations.
-
 import "package:expect/expect.dart";
 
 class C1 {
@@ -23,15 +18,14 @@
 main() {
   C1 c1 = new C1();
   // Implicitly invokes c1.call(1)
-
+  Expect.equals(c1(1), 2);
   dynamic d1 = c1;
   // Implicitly invokes d1.call(1)
-
+  Expect.equals(d1(1), 2);
   C2 c2 = new C2();
   // Implicitly invokes c2.call(1)
-
+  Expect.equals(c2(1), 2);
   dynamic d2 = c2;
   // Implicitly invokes d2.call(1)
-
-  // Cannot invoke with the wrong signature.
+  Expect.equals(d2(1), 2);
 }
diff --git a/tests/language/call/method_implicit_invoke_local_runtime_test.dart b/tests/language/call/method_implicit_invoke_local_runtime_test.dart
deleted file mode 100644
index a3d9c21..0000000
--- a/tests/language/call/method_implicit_invoke_local_runtime_test.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Dart test program to test arithmetic operations.
-
-import "package:expect/expect.dart";
-
-class C1 {
-  int call(int i) => 2 * i;
-}
-
-class C2 {
-  int call(int i) => 2 * i;
-}
-
-main() {
-  C1 c1 = new C1();
-  // Implicitly invokes c1.call(1)
-
-  dynamic d1 = c1;
-  // Implicitly invokes d1.call(1)
-
-  C2 c2 = new C2();
-  // Implicitly invokes c2.call(1)
-
-  dynamic d2 = c2;
-  // Implicitly invokes d2.call(1)
-
-  // Cannot invoke with the wrong signature.
-}
diff --git a/tests/language/call/through_getter_runtime_test.dart b/tests/language/call/through_getter_runtime_test.dart
deleted file mode 100644
index 66d7836..0000000
--- a/tests/language/call/through_getter_runtime_test.dart
+++ /dev/null
@@ -1,176 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-// Tests that we can call functions through getters.
-
-const TOP_LEVEL_CONST = 1;
-const TOP_LEVEL_CONST_REF = TOP_LEVEL_CONST;
-const TOP_LEVEL_NULL = null;
-
-var topLevel;
-
-class CallThroughGetterTest {
-  static void testMain() {
-    testTopLevel();
-    testField();
-    testGetter();
-    testMethod();
-    testEvaluationOrder();
-  }
-
-  static void testTopLevel() {
-    topLevel = () {
-      return 2;
-    };
-    Expect.equals(1, TOP_LEVEL_CONST);
-    Expect.equals(1, TOP_LEVEL_CONST_REF);
-    Expect.equals(2, topLevel());
-  }
-
-  static void testField() {
-    A a = new A();
-    a.field = () => 42;
-    Expect.equals(42, a.field());
-    Expect.equals(42, (a.field)());
-
-    a.field = () => 87;
-    Expect.equals(87, a.field());
-    Expect.equals(87, (a.field)());
-
-    a.field = 99;
-    Expect.throwsNoSuchMethodError(() => a.field());
-    Expect.throwsNoSuchMethodError(() => (a.field)());
-  }
-
-  static void testGetter() {
-    A a = new A();
-    a.field = () => 42;
-    Expect.equals(42, a.getter());
-    Expect.equals(42, (a.getter)());
-
-    a.field = () => 87;
-    Expect.equals(87, a.getter());
-    Expect.equals(87, (a.getter)());
-
-    a.field = 99;
-    Expect.throwsNoSuchMethodError(() => a.getter());
-    Expect.throwsNoSuchMethodError(() => (a.getter)());
-  }
-
-  static void testMethod() {
-    A a = new A();
-    a.field = () => 42;
-    Expect.equals(true, a.method() is Function);
-    Expect.equals(42, a.method()());
-
-    a.field = () => 87;
-    Expect.equals(true, a.method() is Function);
-    Expect.equals(87, a.method()());
-
-    a.field = null;
-    Expect.equals(null, a.method());
-  }
-
-  static void testEvaluationOrder() {
-    B b = new B();
-    Expect.equals("gf", b.g0());
-    b = new B();
-    Expect.equals("gf", (b.g0)());
-
-    b = new B();
-    Expect.equals("xgf", b.g1(b.x));
-    b = new B();
-    Expect.equals("gxf", (b.g1)(b.x));
-
-    b = new B();
-    Expect.equals("xygf", b.g2(b.x, b.y));
-    b = new B();
-    Expect.equals("gxyf", (b.g2)(b.x, b.y));
-
-    b = new B();
-    Expect.equals("xyzgf", b.g3(b.x, b.y, b.z));
-    b = new B();
-    Expect.equals("gxyzf", (b.g3)(b.x, b.y, b.z));
-
-    b = new B();
-    Expect.equals("yzxgf", b.g3(b.y, b.z, b.x));
-    b = new B();
-    Expect.equals("gyzxf", (b.g3)(b.y, b.z, b.x));
-  }
-}
-
-class A {
-  A() {}
-  var field;
-  get getter {
-    return field;
-  }
-
-  method() {
-    return field;
-  }
-}
-
-class B {
-  B() : _order = new StringBuffer("") {}
-
-  get g0 {
-    _mark('g');
-    return () {
-      return _mark('f');
-    };
-  }
-
-  get g1 {
-    _mark('g');
-    return (x) {
-      return _mark('f');
-    };
-  }
-
-  get g2 {
-    _mark('g');
-    return (x, y) {
-      return _mark('f');
-    };
-  }
-
-  get g3 {
-    _mark('g');
-    return (x, y, z) {
-      return _mark('f');
-    };
-  }
-
-  get x {
-    _mark('x');
-    return 0;
-  }
-
-  get y {
-    _mark('y');
-    return 1;
-  }
-
-  get z {
-    _mark('z');
-    return 2;
-  }
-
-  _mark(m) {
-    _order.write(m);
-    return _order.toString();
-  }
-
-  StringBuffer _order;
-}
-
-main() {
-  CallThroughGetterTest.testMain();
-}
diff --git a/tests/language/cascade/runtime_test.dart b/tests/language/cascade/runtime_test.dart
deleted file mode 100644
index 17ef03c..0000000
--- a/tests/language/cascade/runtime_test.dart
+++ /dev/null
@@ -1,88 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-// Test cascades.
-
-class A {
-  int x;
-  int y;
-
-  A(this.x, this.y);
-
-  A setX(int x) {
-    this.x = x;
-    return this;
-  }
-
-  void setY(int y) {
-    this.y = y;
-  }
-
-  Function swap() {
-    int tmp = x;
-    x = y;
-    y = tmp;
-    return this.swap;
-  }
-
-  void check(int x, int y) {
-    Expect.equals(x, this.x);
-    Expect.equals(y, this.y);
-  }
-
-  operator [](var i) {
-    if (i == 0) return x;
-    if (i == 1) return y;
-    if (i == "swap") return this.swap;
-    return null;
-  }
-
-  operator []=(int i, int value) {
-    if (i == 0) {
-      x = value;
-    } else if (i == 1) {
-      y = value;
-    }
-  }
-
-  /**
-   * A pseudo-keyword.
-   */
-  import() {
-    x++;
-  }
-}
-
-main() {
-  A a = new A(1, 2);
-  a
-    ..check(1, 2)
-    ..swap()
-    ..check(2, 1)
-    ..x = 4
-    ..y = 9
-    ..check(4, 9)
-    ..setX(10)
-    ..check(10, 9)
-    ..y = 5
-    ..check(10, 5)
-    ..swap()()()
-    ..check(5, 10)
-    ..[0] = 2
-    ..check(2, 10)
-    ..setX(10).setY(3)
-    ..check(10, 3)
-    ..setX(7)["swap"]()
-    ..check(3, 7)
-    ..import()
-    ..check(4, 7)
-    ..["swap"]()()()
-    ..check(7, 4);
-  a.check(7, 4);
-}
diff --git a/tests/language/class/cyclic_class_member_runtime_test.dart b/tests/language/class/cyclic_class_member_runtime_test.dart
deleted file mode 100644
index efac93a..0000000
--- a/tests/language/class/cyclic_class_member_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that class with a cyclic hierarchy doesn't cause a loop in dart2js.
-
-class A {
-  // When checking that foo isn't overriding an instance method in the
-  // superclass, dart2js might loop.
-  static foo() {}
-}
-
-main() {
-  new A();
-}
diff --git a/tests/language/class/keyword_runtime_test.dart b/tests/language/class/keyword_runtime_test.dart
deleted file mode 100644
index 1a24314..0000000
--- a/tests/language/class/keyword_runtime_test.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that "class" cannot be used as identifier.
-
-class foo {}
-
-void main() {}
diff --git a/tests/language/class/variable_shadow_class_runtime_test.dart b/tests/language/class/variable_shadow_class_runtime_test.dart
deleted file mode 100644
index e6724fe..0000000
--- a/tests/language/class/variable_shadow_class_runtime_test.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-import "package:expect/expect.dart";
-
-// Local variables can shadow class names.
-
-class Test {
-  final int field;
-  Test.named(this.field);
-}
-
-main() {
-  {
-    // Now this refers to the variable.
-    var i = new Test.named(10);
-    Expect.equals(10, i.field);
-  }
-
-  {
-    // Shadowing is allowed.
-    var Test = 1;
-    Expect.equals(2, Test + 1);
-  }
-}
diff --git a/tests/language/closure/internals_runtime_test.dart b/tests/language/closure/internals_runtime_test.dart
deleted file mode 100644
index ab67593..0000000
--- a/tests/language/closure/internals_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class C {
-  foo() => 123;
-}
-
-main() {
-  var f = new C().foo;
-}
diff --git a/tests/language/closure/partial_instantiation_static_bounds_check_runtime_test.dart b/tests/language/closure/partial_instantiation_static_bounds_check_runtime_test.dart
deleted file mode 100644
index b1e5a3a..0000000
--- a/tests/language/closure/partial_instantiation_static_bounds_check_runtime_test.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-topFn<T extends num>(T x) {
-  print(T);
-}
-
-class C<T> {
-  instanceFn<S extends T>(S x) {
-    print(S);
-  }
-}
-
-class D<T> extends C<T> {
-  void foo() {}
-}
-
-void main() {
-  localFn<T extends num>(T x) {
-    print(T);
-  }
-}
diff --git a/tests/language/compile_time_constant/arguments_runtime_test.dart b/tests/language/compile_time_constant/arguments_runtime_test.dart
deleted file mode 100644
index 0521397..0000000
--- a/tests/language/compile_time_constant/arguments_runtime_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class A {
-  const A(a);
-  const A.named({a = 42});
-  const A.optional([a]);
-}
-
-main() {
-  const A(1);
-
-  const A.named();
-
-  const A.optional();
-  const A.optional(42);
-}
diff --git a/tests/language/compile_time_constant/c_runtime_1_test.dart b/tests/language/compile_time_constant/c_runtime_1_test.dart
deleted file mode 100644
index 47c670f..0000000
--- a/tests/language/compile_time_constant/c_runtime_1_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for 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 m0 = const {499: 400 + 99};
-const m1 = const {"foo" + "bar": 42};
-const m2 = const {};
-const m3 = const {};
-
-use(x) => x;
-
-main() {
-  use(m0);
-  use(m1);
-  use(m2);
-  use(m3);
-}
diff --git a/tests/language/compile_time_constant/c_runtime_test.dart b/tests/language/compile_time_constant/c_runtime_test.dart
deleted file mode 100644
index bc0e67c..0000000
--- a/tests/language/compile_time_constant/c_runtime_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for 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 m0 = const {499: 400 + 99};
-const m1 = const {};
-const m2 = const {};
-const m3 = const {};
-
-use(x) => x;
-
-main() {
-  use(m0);
-  use(m1);
-  use(m2);
-  use(m3);
-}
diff --git a/tests/language/compile_time_constant/k_runtime_test.dart b/tests/language/compile_time_constant/k_runtime_test.dart
deleted file mode 100644
index 57f9152..0000000
--- a/tests/language/compile_time_constant/k_runtime_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-const x = const {'a': 4};
-const y = const {};
-
-const z = const {'__proto__': 499};
-
-const x2 = const {'a': 4};
-const y2 = const {'a': 14, 'b': 13};
-const z2 = const {'__proto__': 499};
-
-main() {
-  Expect.identical(x2, x);
-
-  Expect.identical(z2, z);
-}
diff --git a/tests/language/compile_time_constant/o_runtime_test.dart b/tests/language/compile_time_constant/o_runtime_test.dart
deleted file mode 100644
index 847af28..0000000
--- a/tests/language/compile_time_constant/o_runtime_test.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Test compile-time constants with string-interpolation.
-
-import "package:expect/expect.dart";
-
-const str = "foo";
-const m1 = const {"foo": 499};
-const m2 = const {"$str": 499};
-const m3 = const {
-  // Causes in a duplicate key error.
-  "foo": 499,
-};
-const m4 = const {
-  // Causes in a duplicate key error.
-  "$str": 499,
-};
-const m5 = const {
-  "f"
-          "o"
-          "o":
-      499,
-};
-
-const mm1 = const {"afoo#foo": 499};
-const mm2 = const {"a$str#$str": 499};
-const mm3 = const {
-  "a"
-          "$str"
-          "#"
-          "foo":
-      499,
-};
-const mm4 = const {
-  "a$str"
-          "#$str":
-      499,
-};
-
-main() {
-  Expect.equals(1, m1.length);
-  Expect.equals(499, m1["foo"]);
-  Expect.identical(m1, m2);
-  Expect.identical(m1, m3);
-  Expect.identical(m1, m4);
-  Expect.identical(m1, m5);
-
-  Expect.equals(1, mm1.length);
-  Expect.equals(499, mm1["afoo#foo"]);
-  Expect.identical(mm1, mm2);
-  Expect.identical(mm1, mm3);
-  Expect.identical(mm1, mm4);
-}
diff --git a/tests/language/compile_time_constant/p_runtime_test.dart b/tests/language/compile_time_constant/p_runtime_test.dart
deleted file mode 100644
index 4f835e2..0000000
--- a/tests/language/compile_time_constant/p_runtime_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class A {
-  const A();
-  final x = null;
-}
-
-class B extends A {
-  const B();
-}
-
-var b = const B();
-
-main() {
-  Expect.equals(null, b.x);
-}
diff --git a/tests/language/compile_time_constant/r_runtime_test.dart b/tests/language/compile_time_constant/r_runtime_test.dart
deleted file mode 100644
index 85d283d..0000000
--- a/tests/language/compile_time_constant/r_runtime_test.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for 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 x = "x";
-
-const y = const {0: "y"};
-
-main() {
-  print(x);
-  print(y);
-  const z = 1 + 1 + 1;
-  print(z);
-}
diff --git a/tests/language/compile_time_constant/runtime_test.dart b/tests/language/compile_time_constant/runtime_test.dart
deleted file mode 100644
index bbfed59..0000000
--- a/tests/language/compile_time_constant/runtime_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class Bad {
-  int foo = 0;
-  final int bar = -1;
-  static const int toto = -3;
-}
-
-void use(x) {}
-
-main() {
-  use(new Bad().bar);
-  use(Bad.toto);
-}
diff --git a/tests/language/compile_time_constant/static2_runtime_test.dart b/tests/language/compile_time_constant/static2_runtime_test.dart
deleted file mode 100644
index 3c2ba3b..0000000
--- a/tests/language/compile_time_constant/static2_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class A {
-  final int x;
-
-  const A.a2(this.x);
-
-  const A.a6(int x) : this.x = x;
-}
-
-main() {}
diff --git a/tests/language/compile_time_constant/static3_runtime_test.dart b/tests/language/compile_time_constant/static3_runtime_test.dart
deleted file mode 100644
index 3c2ba3b..0000000
--- a/tests/language/compile_time_constant/static3_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class A {
-  final int x;
-
-  const A.a2(this.x);
-
-  const A.a6(int x) : this.x = x;
-}
-
-main() {}
diff --git a/tests/language/compile_time_constant/static_runtime_test.dart b/tests/language/compile_time_constant/static_runtime_test.dart
deleted file mode 100644
index 3e2d798..0000000
--- a/tests/language/compile_time_constant/static_runtime_test.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-main() {}
diff --git a/tests/language/const/conditional_runtime_test.dart b/tests/language/const/conditional_runtime_test.dart
deleted file mode 100644
index f0a362c..0000000
--- a/tests/language/const/conditional_runtime_test.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test for conditionals as compile-time constants.
-
-import 'package:expect/expect.dart';
-
-class Marker {
-  final field;
-  const Marker(this.field);
-}
-
-var var0 = const Marker(0);
-var var1 = const Marker(1);
-const const0 = const Marker(0);
-const const1 = const Marker(1);
-
-const trueConst = true;
-const falseConst = false;
-var nonConst = true;
-const zeroConst = 0;
-
-const cond1 = trueConst ? const0 : const1;
-
-const cond2 = falseConst ? const0 : const1;
-
-void main() {
-  Expect.identical(var0, cond1);
-
-  Expect.identical(var1, cond2);
-}
diff --git a/tests/language/const/const_locals_runtime_test.dart b/tests/language/const/const_locals_runtime_test.dart
deleted file mode 100644
index c7d4437..0000000
--- a/tests/language/const/const_locals_runtime_test.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that constant local variables have constant initializers.
-
-import "package:expect/expect.dart";
-
-void main() {
-  const c2 = 0;
-
-  const c5 = constField;
-
-  const c8 = const Class();
-}
-
-var field = 0;
-
-final finalField = 0;
-
-const constField = 0;
-
-method() => 0;
-
-class Class {
-  const Class();
-}
diff --git a/tests/language/const/constructor3_runtime_1_test.dart b/tests/language/const/constructor3_runtime_1_test.dart
deleted file mode 100644
index 477d9fb..0000000
--- a/tests/language/const/constructor3_runtime_1_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class C {
-  final double d;
-  const C(this.d);
-}
-
-class D extends C {
-  const D(var d) : super(d);
-}
-
-const intValue = 0;
-const c = const C(0.0);
-
-main() {
-  print(c);
-}
diff --git a/tests/language/const/constructor3_runtime_2_test.dart b/tests/language/const/constructor3_runtime_2_test.dart
deleted file mode 100644
index c8c1c96..0000000
--- a/tests/language/const/constructor3_runtime_2_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class C {
-  final double d;
-  const C(this.d);
-}
-
-class D extends C {
-  const D(var d) : super(d);
-}
-
-const intValue = 0;
-
-const e = const D(0.0);
-
-main() {
-  print(e);
-}
diff --git a/tests/language/const/constructor3_runtime_test.dart b/tests/language/const/constructor3_runtime_test.dart
deleted file mode 100644
index 789b331..0000000
--- a/tests/language/const/constructor3_runtime_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class C {
-  final double d;
-  const C(this.d);
-}
-
-class D extends C {
-  const D(var d) : super(d);
-}
-
-const intValue = 0;
-
-main() {}
diff --git a/tests/language/const/constructor_mixin2_runtime_test.dart b/tests/language/const/constructor_mixin2_runtime_test.dart
deleted file mode 100644
index eedc657..0000000
--- a/tests/language/const/constructor_mixin2_runtime_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class Mixin {
-  var nonFinalField;
-}
-
-class A {
-  const A(foo);
-}
-
-class B extends A {
-  const B(foo) : super(foo);
-}
-
-main() {
-  var a = const B(42);
-}
diff --git a/tests/language/const/constructor_nonconst_field_runtime_test.dart b/tests/language/const/constructor_nonconst_field_runtime_test.dart
deleted file mode 100644
index 8780b2c..0000000
--- a/tests/language/const/constructor_nonconst_field_runtime_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class A {
-  final int j = 1;
-  const A();
-}
-
-int f() {
-  return 3;
-}
-
-main() {
-  const A().j;
-}
diff --git a/tests/language/const/constructor_nonconst_param_runtime_test.dart b/tests/language/const/constructor_nonconst_param_runtime_test.dart
deleted file mode 100644
index 60d0fa6..0000000
--- a/tests/language/const/constructor_nonconst_param_runtime_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class A {
-  const A(int a);
-}
-
-class B {
-  const B(dynamic v) //
-  ;
-}
-
-void main() {
-  const B("");
-}
diff --git a/tests/language/const/constructor_runtime_test.dart b/tests/language/const/constructor_runtime_test.dart
deleted file mode 100644
index b2d882c..0000000
--- a/tests/language/const/constructor_runtime_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class A<T> {
-  final int x;
-  const A.named() : x = 42;
-  A() : x = -1;
-}
-
-main() {
-  Expect.equals(42, (const A<int>.named()).x);
-  Expect.equals(42, (new A<int>.named()).x);
-}
diff --git a/tests/language/const/constructor_super_runtime_test.dart b/tests/language/const/constructor_super_runtime_test.dart
deleted file mode 100644
index 0e13704..0000000
--- a/tests/language/const/constructor_super_runtime_test.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class A {
-  final a;
-  A(this.a); // Not const.
-  const A.five() : a = 5;
-}
-
-class B extends A {
-  final b;
-  B(x) : b = x + 1, super(x);
-
-  // Const constructor cannot call non-const super constructor.
-}
-
-class C extends A {
-  C() : super(0);
-  // Implicit call to non-const constructor A(x).
-}
-
-main() {
-  var b1 = new B(0);
-}
diff --git a/tests/language/const/constructor_syntax_runtime_test.dart b/tests/language/const/constructor_syntax_runtime_test.dart
deleted file mode 100644
index d7ecde6..0000000
--- a/tests/language/const/constructor_syntax_runtime_test.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-main() {
-  var c1 = const C1();
-
-  var c3 = const C3();
-}
-
-abstract class I0 {
-  factory I0() = C0;
-}
-
-class C0 implements I0 {
-  C0();
-}
-
-class C1 {
-  const C1();
-}
-
-class C2 {
-  C2();
-}
-
-class C3 {
-  const C3();
-  final field = null;
-}
diff --git a/tests/language/const/dynamic_type_literal_runtime_1_test.dart b/tests/language/const/dynamic_type_literal_runtime_1_test.dart
deleted file mode 100644
index cf504a6..0000000
--- a/tests/language/const/dynamic_type_literal_runtime_1_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that 'dynamic' can be used in const expressions and has the expected
-// behavior.
-
-import "package:expect/expect.dart";
-
-const d = dynamic;
-const i = int;
-
-void main() {
-  Expect.isTrue(identical(d, dynamic));
-  // Duplicate key error.
-}
diff --git a/tests/language/const/dynamic_type_literal_runtime_2_test.dart b/tests/language/const/dynamic_type_literal_runtime_2_test.dart
deleted file mode 100644
index 85f14f4..0000000
--- a/tests/language/const/dynamic_type_literal_runtime_2_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that 'dynamic' can be used in const expressions and has the expected
-// behavior.
-
-import "package:expect/expect.dart";
-
-const d = dynamic;
-const i = int;
-
-void main() {
-  // Duplicate key error.
-
-  Expect.equals(2, const {d: 1, i: 2}.length);
-}
diff --git a/tests/language/const/dynamic_type_literal_runtime_test.dart b/tests/language/const/dynamic_type_literal_runtime_test.dart
deleted file mode 100644
index 25a3b7d..0000000
--- a/tests/language/const/dynamic_type_literal_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that 'dynamic' can be used in const expressions and has the expected
-// behavior.
-
-import "package:expect/expect.dart";
-
-const d = dynamic;
-const i = int;
-
-void main() {
-  // Duplicate key error.
-}
diff --git a/tests/language/const/factory_with_body_runtime_test.dart b/tests/language/const/factory_with_body_runtime_test.dart
deleted file mode 100644
index f78e0e0..0000000
--- a/tests/language/const/factory_with_body_runtime_test.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// Tests that a "const factory" with body produces a compile-time error.
-
-class ConstFactoryWithBody {}
-
-main() {}
diff --git a/tests/language/const/getter_runtime_test.dart b/tests/language/const/getter_runtime_test.dart
deleted file mode 100644
index ca8deac..0000000
--- a/tests/language/const/getter_runtime_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Check that const getters are not allowed.
-
-import 'package:expect/expect.dart';
-
-class C {
-  const C();
-
-  get x => 1;
-}
-
-get y => 2;
-
-main() {
-  const C().x;
-  y;
-}
diff --git a/tests/language/const/init2_runtime_1_test.dart b/tests/language/const/init2_runtime_1_test.dart
deleted file mode 100644
index bf0988d..0000000
--- a/tests/language/const/init2_runtime_1_test.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for 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 intValue = 0;
-const double c = 0.0;
-
-main() {
-  print(c);
-}
diff --git a/tests/language/const/init2_runtime_test.dart b/tests/language/const/init2_runtime_test.dart
deleted file mode 100644
index 8cae835..0000000
--- a/tests/language/const/init2_runtime_test.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for 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 intValue = 0;
-
-main() {}
diff --git a/tests/language/const/instance_field_runtime_test.dart b/tests/language/const/instance_field_runtime_test.dart
deleted file mode 100644
index 7664659..0000000
--- a/tests/language/const/instance_field_runtime_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that const instance fields are compile-time errors.
-
-class C {}
-
-void main() {
-  new C();
-}
diff --git a/tests/language/const/map2_runtime_test.dart b/tests/language/const/map2_runtime_test.dart
deleted file mode 100644
index 02e6a9e..0000000
--- a/tests/language/const/map2_runtime_test.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class A {
-  const factory A() = B;
-}
-
-class B implements A {
-  const B();
-}
-
-confuse(x) {
-  if (DateTime.now().millisecondsSinceEpoch == 42) return confuse(2);
-  return x;
-}
-
-main() {
-  // It is a compile-time error if the key type overrides operator ==.
-  dynamic m = const {const A(): 42};
-  Expect.equals(42, m[confuse(const B())]);
-
-  m = const {"foo": 99, const A(): 499};
-  Expect.equals(499, m[confuse(const B())]);
-}
diff --git a/tests/language/const/map3_runtime_test.dart b/tests/language/const/map3_runtime_test.dart
deleted file mode 100644
index 51cc9fa..0000000
--- a/tests/language/const/map3_runtime_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class A {
-  static const b = const B();
-}
-
-class B implements A {
-  const B();
-}
-
-main() {
-  // It is a compile-time error if the key type overrides operator ==.
-  dynamic m = const {A.b: 42};
-  Expect.equals(42, m[const B()]);
-
-  m = const {"foo": 99, A.b: 499};
-  Expect.equals(499, m[const B()]);
-}
diff --git a/tests/language/const/switch2_runtime_test.dart b/tests/language/const/switch2_runtime_test.dart
deleted file mode 100644
index cd29f2a..0000000
--- a/tests/language/const/switch2_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:expect/expect.dart';
-
-void main() {
-  var a = [1, 2, 3][2];
-  switch (a) {
-    case 1:
-      print("OK");
-  }
-}
diff --git a/tests/language/const/syntax_runtime_test.dart b/tests/language/const/syntax_runtime_test.dart
deleted file mode 100644
index b4e07af..0000000
--- a/tests/language/const/syntax_runtime_test.dart
+++ /dev/null
@@ -1,71 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-main() {
-  const f0 = 42;
-
-  const int f2 = 87;
-
-  Expect.equals(42, f0);
-  Expect.equals(87, f2);
-
-  Expect.equals(42, F0);
-
-  Expect.equals(87, F2);
-
-  Expect.isTrue(P0 is Point);
-
-  Expect.isTrue(A0 is int);
-  Expect.isTrue(A1 is int);
-
-  Expect.isTrue(C0.X is C1);
-
-  Expect.equals("Hello 42", B2);
-
-  const cf1 = identical(const Point(1, 2), const Point(1, 2));
-
-  var f5 = B5;
-}
-
-const F0 = 42;
-
-const int F2 = 87;
-
-class Point {
-  final x, y;
-  const Point(this.x, this.y);
-  operator +(int other) => x;
-}
-
-// Check that compile time expressions can include invocations of
-// user-defined const constructors.
-const P0 = const Point(0, 0);
-
-// Check that we cannot have cyclic references in compile time
-// expressions.
-const A0 = 42;
-const A1 = A0 + 1;
-
-class C0 {
-  static const X = const C1();
-}
-
-class C1 {
-  const C1();
-  final x = null;
-}
-
-// Check that sub-expressions of binary + are numeric.
-const B0 = 42;
-const B1 = "Hello";
-const B2 = "$B1 $B0";
-
-// Check identical.
-
-const B5 = identical(1, const Point(1, 2));
diff --git a/tests/language/constructor/bad_constructor_runtime_1_test.dart b/tests/language/constructor/bad_constructor_runtime_1_test.dart
deleted file mode 100644
index 88b2007..0000000
--- a/tests/language/constructor/bad_constructor_runtime_1_test.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// A constructor can't be static.
-class A {
-  A();
-}
-
-// A factory constructor can't be static.
-class B {
-  factory B() {
-    return B._();
-  }
-
-  B._();
-}
-
-// A named constructor can have the same name as a setter.
-class E {
-  set setter(value) {}
-  E.setter();
-}
-
-// A constructor can't be static.
-class F {
-  F() {}
-}
-
-main() {
-  new A();
-  new B();
-  new E.setter();
-  new F();
-}
diff --git a/tests/language/constructor/bad_constructor_runtime_test.dart b/tests/language/constructor/bad_constructor_runtime_test.dart
deleted file mode 100644
index 4932e71..0000000
--- a/tests/language/constructor/bad_constructor_runtime_test.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// A constructor can't be static.
-class A {
-  A();
-}
-
-// A factory constructor can't be static.
-class B {
-  factory B() {
-    return B._();
-  }
-
-  B._();
-}
-
-// A named constructor can have the same name as a setter.
-class E {
-  E.setter();
-}
-
-// A constructor can't be static.
-class F {
-  F() {}
-}
-
-main() {
-  new A();
-  new B();
-  new E.setter();
-  new F();
-}
diff --git a/tests/language/constructor/bad_named_constructor_runtime_test.dart b/tests/language/constructor/bad_named_constructor_runtime_test.dart
deleted file mode 100644
index dbb0841..0000000
--- a/tests/language/constructor/bad_named_constructor_runtime_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class A {
-  A() {}
-}
-
-main() {
-  new A();
-}
diff --git a/tests/language/constructor/bodyless_wrong_arg_runtime_test.dart b/tests/language/constructor/bodyless_wrong_arg_runtime_test.dart
deleted file mode 100644
index 5137e39..0000000
--- a/tests/language/constructor/bodyless_wrong_arg_runtime_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class Base {
-  final String name;
-  const Base(this.name);
-}
-
-class C extends Base {
-  const C(String s)
-    : super(
-        // Call super constructor with wrong argument count.
-        s,
-      );
-}
-
-main() {
-  const C("str");
-}
diff --git a/tests/language/constructor/call_wrong_argument_count_runtime_test.dart b/tests/language/constructor/call_wrong_argument_count_runtime_test.dart
deleted file mode 100644
index 5ab5197..0000000
--- a/tests/language/constructor/call_wrong_argument_count_runtime_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class Stockhorn {
-  Stockhorn(int a);
-}
-
-main() {
-  new Stockhorn(1);
-}
diff --git a/tests/language/constructor/constructor10_runtime_test.dart b/tests/language/constructor/constructor10_runtime_test.dart
deleted file mode 100644
index 8830f95..0000000
--- a/tests/language/constructor/constructor10_runtime_test.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Check that the implicit super call for synthetic constructors are checked.
-
-class A {
-  final x;
-  A(this.x);
-}
-
-class B extends A {
-  B() : super(null);
-}
-
-// ==========
-
-class Y extends A {
-  Y() : super(null);
-}
-
-class Z extends Y {
-  Z() : super();
-}
-
-// ==============
-
-class G extends A {
-  G() : super(null);
-}
-
-class H extends G {}
-
-main() {
-  new B().x;
-  new Z().x;
-  new H().x;
-}
diff --git a/tests/language/constructor/constructor13_runtime_test.dart b/tests/language/constructor/constructor13_runtime_test.dart
deleted file mode 100644
index 8ec48ae1..0000000
--- a/tests/language/constructor/constructor13_runtime_test.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Check that there's no crash when constructor called with wrong
-// number of args.
-
-class Klass {
-  Klass(v) {}
-}
-
-main() {
-  new Klass(1);
-}
diff --git a/tests/language/constructor/constructor9_runtime_test.dart b/tests/language/constructor/constructor9_runtime_test.dart
deleted file mode 100644
index fcdbf5a..0000000
--- a/tests/language/constructor/constructor9_runtime_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Check that all final instance fields of a class are initialized by
-// constructors.
-
-class Klass {
-  Klass(var v) : field_ = v {}
-
-  var field_;
-}
-
-main() {
-  new Klass(5);
-}
diff --git a/tests/language/constructor/cyclic_runtime_test.dart b/tests/language/constructor/cyclic_runtime_test.dart
deleted file mode 100644
index 72655ee..0000000
--- a/tests/language/constructor/cyclic_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class A {
-  A.a() : this.b();
-  A.b();
-  A.c() : this.b();
-}
-
-main() {
-  new A.a();
-  new A.b();
-  new A.c();
-}
diff --git a/tests/language/constructor/default_factory2_runtime_test.dart b/tests/language/constructor/default_factory2_runtime_test.dart
deleted file mode 100644
index 88d99b4..0000000
--- a/tests/language/constructor/default_factory2_runtime_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Check type bounds when invoking a redirecting factory method
-
-abstract class Foo {}
-
-abstract class IA<T> {}
-
-class A<T extends Foo> implements IA<T> {
-  factory A() {
-    return A._();
-  }
-
-  A._();
-}
-
-main() {}
diff --git a/tests/language/constructor/default_factory_runtime_test.dart b/tests/language/constructor/default_factory_runtime_test.dart
deleted file mode 100644
index 17c17b1..0000000
--- a/tests/language/constructor/default_factory_runtime_test.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-// Dart test program for testing default factories.
-
-abstract class Vehicle {}
-
-class Bike implements Vehicle, GoogleOne {
-  Bike.redOne() {}
-}
-
-abstract class SpaceShip {
-  factory SpaceShip() = GoogleOne;
-}
-
-class GoogleOne implements SpaceShip {
-  GoogleOne.internal_() {}
-  factory GoogleOne() {
-    return new GoogleOne.internal_();
-  }
-  factory GoogleOne.Vehicle() {
-    return new Bike.redOne();
-  }
-}
-
-main() {
-  Expect.equals(true, (new Bike.redOne()) is Bike);
-  Expect.equals(true, (new SpaceShip()) is GoogleOne);
-}
diff --git a/tests/language/constructor/duplicate_initializers_runtime_test.dart b/tests/language/constructor/duplicate_initializers_runtime_test.dart
deleted file mode 100644
index 9dfda78..0000000
--- a/tests/language/constructor/duplicate_initializers_runtime_test.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Check that initializers are not duplicated
-
-class Class {
-  Class(var v) : field_ = v;
-  // Test against duplicate final field initialization in initializing list.
-
-  Class.field(this.field_);
-  // Test against duplicate final field initialization between initializing
-  // formals and initializer list.
-
-  // Test against duplicate final field initialization in initializing formals.
-  Class.two_fields(this.field_);
-  final field_;
-}
-
-main() {
-  new Class(42);
-  new Class.field(42);
-  new Class.two_fields(42);
-}
diff --git a/tests/language/constructor/duplicate_runtime_test.dart b/tests/language/constructor/duplicate_runtime_test.dart
deleted file mode 100644
index ced4e14..0000000
--- a/tests/language/constructor/duplicate_runtime_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class Foo {
-  Foo();
-}
-
-main() {
-  new Foo();
-}
diff --git a/tests/language/constructor/named_runtime_test.dart b/tests/language/constructor/named_runtime_test.dart
deleted file mode 100644
index 641eaab..0000000
--- a/tests/language/constructor/named_runtime_test.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library named_constructor_test;
-
-import 'package:expect/expect.dart';
-import 'named_lib.dart' as prefix;
-
-class Class<T> {
-  final int value;
-  Class() : value = 0;
-  Class.named() : value = 1;
-}
-
-void main() {
-  Expect.equals(0, new Class().value);
-  Expect.equals(0, new Class<int>().value);
-
-  Expect.equals(1, new Class.named().value);
-  Expect.equals(1, new Class<int>.named().value);
-  // 'Class.named' is not a type:
-
-  // 'Class<int>.named<int>' doesn't fit the grammar syntax T.id:
-
-  new prefix.Class().value;
-  // 'prefix' is not a type:
-
-  new prefix.Class<int>().value;
-  // 'prefix<int>.Class<int>' doesn't fit the grammar syntax T.id:
-
-  new prefix.Class.named().value;
-  // 'prefix<int>.Class.named' doesn't fit the grammar syntax T.id:
-
-  // 'prefix.Class<int>.named' doesn't fit the grammar syntax T.id:
-  new prefix.Class<int>.named().value;
-  // 'prefix.Class.named<int>' doesn't fit the grammar syntax T.id:
-
-  // 'prefix<int>.Class<int>' doesn't fit the grammar syntax T.id:
-
-  // 'prefix<int>.Class.named<int>' doesn't fit the grammar syntax T.id:
-
-  // 'prefix.Class<int>.named<int>' doesn't fit the grammar syntax T.id:
-
-  // 'prefix<int>.Class<int>.named<int>' doesn't fit the grammar syntax T.id:
-}
diff --git a/tests/language/constructor/no_such_constructor_runtime_test.dart b/tests/language/constructor/no_such_constructor_runtime_test.dart
deleted file mode 100644
index ad2f0eb..0000000
--- a/tests/language/constructor/no_such_constructor_runtime_test.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class A {
-  A();
-}
-
-main() {}
diff --git a/tests/language/constructor/redirect2_runtime_test.dart b/tests/language/constructor/redirect2_runtime_test.dart
deleted file mode 100644
index bbd2b8e..0000000
--- a/tests/language/constructor/redirect2_runtime_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Redirection constructors must not have a function body.
-
-class A {
-  var x;
-  A(this.x) {}
-
-  // Redirecting constructor must not have a function body.
-
-  // Redirecting constructor must not initialize any fields.
-
-  // Redirecting constructor must not have initializing formal parameters.
-
-  // Redirection constructors must not call super constructor.
-}
-
-main() {
-  new A(3);
-}
diff --git a/tests/language/constructor/redirect_cycle_runtime_test.dart b/tests/language/constructor/redirect_cycle_runtime_test.dart
deleted file mode 100644
index b7d42b2..0000000
--- a/tests/language/constructor/redirect_cycle_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Redirection constructors must not be cyclic.
-
-class A {
-  var x;
-  A(x);
-}
-
-main() {
-  new A(10);
-}
diff --git a/tests/language/constructor/redirect_indirect_cycle_runtime_test.dart b/tests/language/constructor/redirect_indirect_cycle_runtime_test.dart
deleted file mode 100644
index a5f9ea7..0000000
--- a/tests/language/constructor/redirect_indirect_cycle_runtime_test.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class A {
-  var x;
-  A(x) : this.named(x, 0);
-  A.named(x, int y);
-  // Redirecting constructors must not be cyclic.
-}
-
-main() {
-  new A(10);
-}
diff --git a/tests/language/constructor/redirect_runtime_test.dart b/tests/language/constructor/redirect_runtime_test.dart
deleted file mode 100644
index d8e5af6..0000000
--- a/tests/language/constructor/redirect_runtime_test.dart
+++ /dev/null
@@ -1,73 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test program for redirection constructors.
-
-import "package:expect/expect.dart";
-
-class A {
-  var x;
-  A(this.x) {}
-  A.named(x, int y) : this(x + y);
-  A.named2(int x, int y, z) : this.named(staticFun(x, y), z);
-
-  // The following is a bit tricky. It is a compile-time error to
-  // refer to this (implicitly or explicitly) from an initializer.
-  // When we remove the line with moreStaticFun, staticFun is really a
-  // static function and it is legal to call it. This is what will
-  // happen in the /none version of this test. However, in /01,
-  // staticFun isn't really a static function and should cause a
-  // compile-time error.
-  static int staticFun(int v1, int v2) {
-    return v1 * v2;
-  }
-}
-
-class B extends A {
-  B(y) : super(y + 1) {}
-  B.named(y) : super.named(y, y + 1) {}
-}
-
-class C {
-  final x;
-  const C(this.x);
-  const C.named(x, int y) : this(x + y);
-}
-
-class D extends C {
-  const D(y) : super(y + 1);
-  const D.named(y) : super.named(y, y + 1);
-}
-
-class ConstructorRedirectTest {
-  static testMain() {
-    var a = new A(499);
-    Expect.equals(499, a.x);
-    a = new A.named(349, 499);
-    Expect.equals(349 + 499, a.x);
-    a = new A.named2(11, 42, 99);
-    Expect.equals(11 * 42 + 99, a.x);
-
-    var b = new B(498);
-    Expect.equals(499, b.x);
-    b = new B.named(249);
-    Expect.equals(499, b.x);
-
-    C c = const C(499);
-    Expect.equals(499, c.x);
-    c = const C.named(249, 250);
-    Expect.equals(499, c.x);
-
-    D d = const D(498);
-    Expect.equals(499, d.x);
-    d = const D.named(249);
-    Expect.equals(499, d.x);
-  }
-}
-
-main() {
-  ConstructorRedirectTest.testMain();
-}
diff --git a/tests/language/constructor/reference_runtime_10_test.dart b/tests/language/constructor/reference_runtime_10_test.dart
deleted file mode 100644
index 7e2f2d8..0000000
--- a/tests/language/constructor/reference_runtime_10_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  Foo.bar();
-}
diff --git a/tests/language/constructor/reference_runtime_11_test.dart b/tests/language/constructor/reference_runtime_11_test.dart
deleted file mode 100644
index 0664c0a..0000000
--- a/tests/language/constructor/reference_runtime_11_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  Foo<int>();
-}
diff --git a/tests/language/constructor/reference_runtime_12_test.dart b/tests/language/constructor/reference_runtime_12_test.dart
deleted file mode 100644
index 4f4b5f6..0000000
--- a/tests/language/constructor/reference_runtime_12_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  Foo<int>.bar();
-}
diff --git a/tests/language/constructor/reference_runtime_1_test.dart b/tests/language/constructor/reference_runtime_1_test.dart
deleted file mode 100644
index 76b04c0..0000000
--- a/tests/language/constructor/reference_runtime_1_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  new Foo();
-}
diff --git a/tests/language/constructor/reference_runtime_2_test.dart b/tests/language/constructor/reference_runtime_2_test.dart
deleted file mode 100644
index 9d6b573..0000000
--- a/tests/language/constructor/reference_runtime_2_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  new Foo.bar();
-}
diff --git a/tests/language/constructor/reference_runtime_3_test.dart b/tests/language/constructor/reference_runtime_3_test.dart
deleted file mode 100644
index 9cb6545..0000000
--- a/tests/language/constructor/reference_runtime_3_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  new Foo<int>();
-}
diff --git a/tests/language/constructor/reference_runtime_4_test.dart b/tests/language/constructor/reference_runtime_4_test.dart
deleted file mode 100644
index fe647fb..0000000
--- a/tests/language/constructor/reference_runtime_4_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  new Foo<int>.bar();
-}
diff --git a/tests/language/constructor/reference_runtime_5_test.dart b/tests/language/constructor/reference_runtime_5_test.dart
deleted file mode 100644
index d3f012c..0000000
--- a/tests/language/constructor/reference_runtime_5_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  const Foo();
-}
diff --git a/tests/language/constructor/reference_runtime_6_test.dart b/tests/language/constructor/reference_runtime_6_test.dart
deleted file mode 100644
index 96b142d..0000000
--- a/tests/language/constructor/reference_runtime_6_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  const Foo.bar();
-}
diff --git a/tests/language/constructor/reference_runtime_7_test.dart b/tests/language/constructor/reference_runtime_7_test.dart
deleted file mode 100644
index 6d79b6b..0000000
--- a/tests/language/constructor/reference_runtime_7_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  const Foo<int>();
-}
diff --git a/tests/language/constructor/reference_runtime_8_test.dart b/tests/language/constructor/reference_runtime_8_test.dart
deleted file mode 100644
index 473efd8..0000000
--- a/tests/language/constructor/reference_runtime_8_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  const Foo<int>.bar();
-}
diff --git a/tests/language/constructor/reference_runtime_9_test.dart b/tests/language/constructor/reference_runtime_9_test.dart
deleted file mode 100644
index 697c646..0000000
--- a/tests/language/constructor/reference_runtime_9_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {
-  Foo();
-}
diff --git a/tests/language/constructor/reference_runtime_test.dart b/tests/language/constructor/reference_runtime_test.dart
deleted file mode 100644
index 6ea59c1..0000000
--- a/tests/language/constructor/reference_runtime_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo<X> {
-  const Foo();
-  const Foo.bar();
-  const Foo.baz();
-}
-
-main() {}
diff --git a/tests/language/constructor/return_runtime_test.dart b/tests/language/constructor/return_runtime_test.dart
deleted file mode 100644
index 6335117..0000000
--- a/tests/language/constructor/return_runtime_test.dart
+++ /dev/null
@@ -1,39 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-// Dart spec 0.03, section 11.10 - generative constructors can only have return
-// statements in the form 'return;'.
-class A {
-  int x;
-  A(this.x) {
-    return;
-  }
-  A.test1(this.x) {}
-  A.test2(this.x) {}
-  int foo(int y) => x + y;
-}
-
-class B {}
-
-class C {
-  int value = -1;
-}
-
-class D {
-  int value = -1;
-}
-
-main() {
-  Expect.equals((new A(1)).foo(10), 11);
-  Expect.equals((new A.test1(1)).foo(10), 11);
-  Expect.equals((new A.test2(1)).foo(10), 11);
-  new B();
-  new C();
-  new D();
-}
diff --git a/tests/language/constructor/type_parameter_runtime_test.dart b/tests/language/constructor/type_parameter_runtime_test.dart
deleted file mode 100644
index 484508c2..0000000
--- a/tests/language/constructor/type_parameter_runtime_test.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Foo {}
-
-main() {
-  new Foo();
-}
diff --git a/tests/language/constructor/unresolved_default_runtime_test.dart b/tests/language/constructor/unresolved_default_runtime_test.dart
deleted file mode 100644
index c688b23..0000000
--- a/tests/language/constructor/unresolved_default_runtime_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test unresolved default constructor calls cause compilation errors.
-
-import 'package:expect/expect.dart';
-
-class A {
-  A.named();
-  static method() {}
-}
-
-main() {
-  A.method();
-}
diff --git a/tests/language/deferred/duplicate_prefix1_runtime_test.dart b/tests/language/deferred/duplicate_prefix1_runtime_test.dart
deleted file mode 100644
index 198027ad..0000000
--- a/tests/language/deferred/duplicate_prefix1_runtime_test.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "prefix_constraints_lib2.dart" as lib;
-
-void main() {}
diff --git a/tests/language/deferred/duplicate_prefix2_runtime_test.dart b/tests/language/deferred/duplicate_prefix2_runtime_test.dart
deleted file mode 100644
index 198027ad..0000000
--- a/tests/language/deferred/duplicate_prefix2_runtime_test.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "prefix_constraints_lib2.dart" as lib;
-
-void main() {}
diff --git a/tests/language/deferred/duplicate_prefix3_runtime_test.dart b/tests/language/deferred/duplicate_prefix3_runtime_test.dart
deleted file mode 100644
index d65eb11..0000000
--- a/tests/language/deferred/duplicate_prefix3_runtime_test.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-void main() {}
diff --git a/tests/language/deferred/load_constants_runtime_test.dart b/tests/language/deferred/load_constants_runtime_test.dart
deleted file mode 100644
index 91683b5..0000000
--- a/tests/language/deferred/load_constants_runtime_test.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart version of two-argument Ackermann-Peter function.
-
-library deferred_load_constants;
-
-import "package:expect/async_helper.dart";
-import "package:expect/expect.dart";
-import "load_constants.dart" deferred as foo;
-import "load_constants.dart";
-
-main() {
-  asyncStart();
-  Expect.throws(() => foo.c);
-  Expect.throws(() => foo.C);
-  Expect.throws(() => foo.funtype);
-  Expect.throws(() => foo.toplevel);
-  foo.loadLibrary().whenComplete(() {
-    // Reading constant declarations through deferred prefix works.
-    Expect.identical(c, foo.c);
-    Expect.identical(C, foo.C);
-    Expect.identical(funtype, foo.funtype);
-    Expect.identical(toplevel, foo.toplevel);
-    Expect.identical(C.staticfun, foo.C.staticfun);
-    // Access through deferred prefix is not a constant expression.
-
-    asyncEnd();
-  });
-}
diff --git a/tests/language/deferred/no_prefix_runtime_test.dart b/tests/language/deferred/no_prefix_runtime_test.dart
deleted file mode 100644
index 466bb5f..0000000
--- a/tests/language/deferred/no_prefix_runtime_test.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Loading a deferred library without prefix is not allowed.
-import "constraints_lib2.dart";
-
-void main() {}
diff --git a/tests/language/double/invalid_runtime_test.dart b/tests/language/double/invalid_runtime_test.dart
deleted file mode 100644
index 6ab6401..0000000
--- a/tests/language/double/invalid_runtime_test.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test an invalid double format
-
-main() {
-  ;
-}
diff --git a/tests/language/double/to_string_as_exponential2_runtime_test.dart b/tests/language/double/to_string_as_exponential2_runtime_test.dart
deleted file mode 100644
index 9b1c753..0000000
--- a/tests/language/double/to_string_as_exponential2_runtime_test.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Test basic integer operations.
-
-import "package:expect/expect.dart";
-
-main() {
-  var v = 1.0;
-  Expect.throwsRangeError(() => v.toStringAsExponential(-1));
-  Expect.throwsRangeError(() => v.toStringAsExponential(21));
-}
diff --git a/tests/language/double/to_string_as_fixed2_runtime_test.dart b/tests/language/double/to_string_as_fixed2_runtime_test.dart
deleted file mode 100644
index 42c5c65..0000000
--- a/tests/language/double/to_string_as_fixed2_runtime_test.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Test basic integer operations.
-
-import "package:expect/expect.dart";
-
-main() {
-  var v = 0.0;
-  Expect.throwsRangeError(() => v.toStringAsFixed(-1));
-  Expect.throwsRangeError(() => v.toStringAsFixed(21));
-}
diff --git a/tests/language/double/to_string_as_precision2_runtime_test.dart b/tests/language/double/to_string_as_precision2_runtime_test.dart
deleted file mode 100644
index cfac60e..0000000
--- a/tests/language/double/to_string_as_precision2_runtime_test.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Test basic integer operations.
-
-import "package:expect/expect.dart";
-
-main() {
-  var v = 0.0;
-  Expect.throwsRangeError(() => v.toStringAsPrecision(0));
-  Expect.throwsRangeError(() => v.toStringAsPrecision(22));
-}
diff --git a/tests/language/dynamic/field_runtime_test.dart b/tests/language/dynamic/field_runtime_test.dart
deleted file mode 100644
index 68d866d..0000000
--- a/tests/language/dynamic/field_runtime_test.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// Test that ensures that fields can be accessed dynamically.
-
-import "package:expect/expect.dart";
-
-class A extends C {
-  var a;
-  var b;
-}
-
-class C {
-  foo() {}
-  bar() {}
-}
-
-main() {
-  var a = new A();
-  a.a = 1;
-  a.b = a;
-}
diff --git a/tests/language/enum/is_keyword_runtime_test.dart b/tests/language/enum/is_keyword_runtime_test.dart
deleted file mode 100644
index 3f24d63..0000000
--- a/tests/language/enum/is_keyword_runtime_test.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that `enum` is considered a keyword and therefore invalid as the name of
-// declarations.
-
-main() {}
diff --git a/tests/language/enum/private_runtime_1_test.dart b/tests/language/enum/private_runtime_1_test.dart
deleted file mode 100644
index a712522..0000000
--- a/tests/language/enum/private_runtime_1_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test privacy issue for enums.
-
-library enum_private_test;
-
-import 'package:expect/expect.dart';
-
-import 'private_lib.dart';
-
-enum Enum1 { _A, _B }
-
-main() {
-  Expect.equals('Enum1._A,Enum1._B', Enum1.values.join(','));
-  Expect.equals('Enum2._A,Enum2._B', Enum2.values.join(','));
-}
diff --git a/tests/language/enum/private_runtime_test.dart b/tests/language/enum/private_runtime_test.dart
deleted file mode 100644
index 459b1d1..0000000
--- a/tests/language/enum/private_runtime_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test privacy issue for enums.
-
-library enum_private_test;
-
-import 'package:expect/expect.dart';
-
-import 'private_lib.dart';
-
-enum Enum1 { _A, _B }
-
-main() {
-  Expect.equals('Enum1._A,Enum1._B', Enum1.values.join(','));
-}
diff --git a/tests/language/exception/try_catch_runtime_test.dart b/tests/language/exception/try_catch_runtime_test.dart
deleted file mode 100644
index 872f9d7..0000000
--- a/tests/language/exception/try_catch_runtime_test.dart
+++ /dev/null
@@ -1,199 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// VMOptions=--optimization-counter-threshold=10
-
-import "package:expect/expect.dart";
-
-class MyException {}
-
-class MyException1 extends MyException {}
-
-class MyException2 extends MyException {}
-
-class TryCatchTest {
-  static void test1() {
-    var foo = 0;
-    try {
-      throw new MyException1();
-    } on MyException2 catch (e) {
-      foo = 1;
-    } on MyException1 catch (e) {
-      foo = 2;
-    } on MyException catch (e) {
-      foo = 3;
-    }
-    Expect.equals(2, foo);
-  }
-
-  static void test2() {
-    var foo = 0;
-    try {
-      throw new MyException1();
-    } on MyException2 catch (e) {
-      foo = 1;
-    } on MyException catch (e) {
-      foo = 2;
-    } on MyException1 catch (e) {
-      foo = 3;
-    }
-    Expect.equals(2, foo);
-  }
-
-  static void test3() {
-    var foo = 0;
-    try {
-      throw new MyException();
-    } on MyException2 catch (e) {
-      foo = 1;
-    } on MyException1 catch (e) {
-      foo = 2;
-    } on MyException catch (e) {
-      foo = 3;
-    }
-    Expect.equals(3, foo);
-  }
-
-  static void test4() {
-    var foo = 0;
-    try {
-      try {
-        throw new MyException();
-      } on MyException2 catch (e) {
-        foo = 1;
-      } on MyException1 catch (e) {
-        foo = 2;
-      }
-    } on MyException catch (e) {
-      Expect.equals(0, foo);
-      foo = 3;
-    }
-    Expect.equals(3, foo);
-  }
-
-  static void test5() {
-    var foo = 0;
-    try {
-      throw new MyException1();
-    } on MyException2 catch (e) {
-      foo = 1;
-    } catch (e) {
-      foo = 2;
-    }
-    Expect.equals(2, foo);
-  }
-
-  static void test6() {
-    var foo = 0;
-    try {
-      throw new MyException();
-    } on MyException2 catch (e) {
-      foo = 1;
-    } on MyException1 catch (e) {
-      foo = 2;
-    } catch (e) {
-      foo = 3;
-    }
-    Expect.equals(3, foo);
-  }
-
-  static void test7() {
-    var foo = 0;
-    try {
-      try {
-        throw new MyException();
-      } on MyException2 catch (e) {
-        foo = 1;
-      } on MyException1 catch (e) {
-        foo = 2;
-      }
-    } catch (e) {
-      Expect.equals(0, foo);
-      foo = 3;
-    }
-    Expect.equals(3, foo);
-  }
-
-  static void test8() {
-    var e = 3;
-    var caught = false;
-    try {
-      throw new MyException();
-    } catch (exc) {
-      caught = true;
-    }
-    Expect.equals(true, caught);
-    Expect.equals(3, e);
-  }
-
-  static void test9() {
-    dynamic e = 6;
-    try {
-      throw "up";
-    } on String {
-      e = "s";
-    } on int {
-      e = "i";
-    }
-    Expect.equals("s", e);
-  }
-
-  static void test10() {
-    try {
-      throw "up";
-    } on String catch (e) {
-      var e = 1; // ok, shadows exception variable.
-      Expect.equals(1, e);
-    }
-  }
-
-  static void test11() {
-    var e0 = 11;
-    try {
-      throw "up";
-    } on int catch (e0) {
-      Expect.fail("unreachable");
-    } on String catch (e1) {
-      // e0 from the other catch clause is not in scope.
-      Expect.equals(11, e0);
-    }
-  }
-
-  static void test12() {
-    const x = const [];
-    try {
-      throw "up";
-    } catch (e) {
-      Expect.equals("up", e);
-    } on String catch (e) {
-      // Compile-time constants in unreachable catch blocks are still
-      // compiled.
-
-      Expect.fail("unreachable");
-    }
-  }
-
-  static void testMain() {
-    test1();
-    test2();
-    test3();
-    test4();
-    test5();
-    test6();
-    test7();
-    test8();
-    test9();
-    test10();
-    test11();
-    test12();
-  }
-}
-
-main() {
-  for (var i = 0; i < 20; i++) {
-    TryCatchTest.testMain();
-  }
-}
diff --git a/tests/language/export/private_runtime_test.dart b/tests/language/export/private_runtime_test.dart
deleted file mode 100644
index e2628a1..0000000
--- a/tests/language/export/private_runtime_test.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Check that private dart:_ libraries cannot be imported.
-
-main() {
-  print("Done.");
-}
diff --git a/tests/language/factory/and_instance_variable_runtime_test.dart b/tests/language/factory/and_instance_variable_runtime_test.dart
deleted file mode 100644
index f6de065..0000000
--- a/tests/language/factory/and_instance_variable_runtime_test.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-abstract class A {
-  var bar;
-  factory A.bar() = B.bar;
-
-  get foo => bar;
-
-}
-
-class B implements A {
-  var bar;
-  factory B.bar() => new C.bar();
-
-  get foo => bar;
-
-
-  B() {}
-}
-
-class C extends B {
-  C.bar() {
-    bar = "foo";
-  }
-
-
-}
-
-main() {
-  assert(new A.bar().foo == "foo");
-  assert(new B.bar().foo == "foo");
-  assert(new C.bar().foo == "foo");
-  assert(new A.bar().bar == "foo");
-  assert(new B.bar().bar == "foo");
-  assert(new C.bar().bar == "foo");
-}
diff --git a/tests/language/factory/factory4_runtime_test.dart b/tests/language/factory/factory4_runtime_test.dart
deleted file mode 100644
index 931127b..0000000
--- a/tests/language/factory/factory4_runtime_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-abstract class Link<T> {
-
-}
-
-class A<T> {}
-
-class LinkFactory<T> extends A<T> {
-  factory LinkFactory.create() {
-    return LinkFactory._();
-  }
-
-  LinkFactory._();
-}
-
-main() {
-
-}
diff --git a/tests/language/factory/factory5_runtime_test.dart b/tests/language/factory/factory5_runtime_test.dart
deleted file mode 100644
index f5205c3..0000000
--- a/tests/language/factory/factory5_runtime_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-abstract class Link<T> {
-
-}
-
-class LinkFactory<T> {
-  factory LinkFactory.create() {
-    return LinkFactory._();
-  }
-
-  LinkFactory._();
-}
-
-main() {
-
-}
diff --git a/tests/language/factory/factory6_runtime_test.dart b/tests/language/factory/factory6_runtime_test.dart
deleted file mode 100644
index 8452028..0000000
--- a/tests/language/factory/factory6_runtime_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:expect/expect.dart';
-
-abstract class Link<T> {
-
-}
-
-class LinkFactory<T> {
-
-}
-
-main() {
-
-}
diff --git a/tests/language/factory/redirection2_runtime_test.dart b/tests/language/factory/redirection2_runtime_test.dart
deleted file mode 100644
index 2592b7e..0000000
--- a/tests/language/factory/redirection2_runtime_test.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-// Test that it is a compile-time error to have a redirection in a
-// non-factory constructor.
-
-class Foo {
-  Foo()
-
-  ;
-}
-
-class Bar extends Foo {
-  factory Bar() => Bar._();
-
-  Bar._();
-}
-
-main() {
-  Expect.isTrue(new Foo() is Foo);
-  Expect.isFalse(new Foo() is Bar);
-}
diff --git a/tests/language/factory/redirection3_cyclic_runtime_test.dart b/tests/language/factory/redirection3_cyclic_runtime_test.dart
deleted file mode 100644
index ecbccc2..0000000
--- a/tests/language/factory/redirection3_cyclic_runtime_test.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that a cycle in redirecting factories leads to a compile-time error.
-
-class A {
-  factory A.foo() = B;
-}
-
-class B implements A {
-  factory B() = C.bar;
-}
-
-class C implements B {
-  factory C.bar() = C.foo;
-  factory C.foo() = C
-
-  ;
-  C();
-}
-
-main() {
-  new A.foo();
-}
diff --git a/tests/language/factory/return_type_checked_runtime_test.dart b/tests/language/factory/return_type_checked_runtime_test.dart
deleted file mode 100644
index 3bef4c2..0000000
--- a/tests/language/factory/return_type_checked_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class A {
-
-}
-
-main() {
-
-}
diff --git a/tests/language/factory/runtime_test.dart b/tests/language/factory/runtime_test.dart
deleted file mode 100644
index bac5c66..0000000
--- a/tests/language/factory/runtime_test.dart
+++ /dev/null
@@ -1,54 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test program for testing factories.
-
-import "package:expect/expect.dart";
-
-class A {
-  factory A(n) {
-    return new A.internal(n);
-  }
-  A.internal(n) : n_ = n {}
-  var n_;
-}
-
-class B {
-  factory B.my() {
-    return new B(3);
-  }
-  B(n) : n_ = n {}
-  var n_;
-}
-
-class FactoryTest {
-  static testMain() {
-    new B.my();
-    var b = new B.my();
-    Expect.equals(3, b.n_);
-    var a = new A(5);
-    Expect.equals(5, a.n_);
-  }
-}
-
-// Test compile time error for factories with parameterized types.
-
-
-
-
-
-
-  //   Compile time error: should be LinkFactory<T> to match abstract class above
-
-
-
-
-
-
-main() {
-  FactoryTest.testMain();
-
-}
diff --git a/tests/language/field/decl_missing_var_type_runtime_test.dart b/tests/language/field/decl_missing_var_type_runtime_test.dart
deleted file mode 100644
index 3d31ad0..0000000
--- a/tests/language/field/decl_missing_var_type_runtime_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test program for constructors and initializers.
-
-// Exercises issue 2997, missing var or type on field declarations should
-// generate a compile-time error.
-
-class A {
-
-
-}
-
-main() {
-
-}
diff --git a/tests/language/field/type_check_runtime_test.dart b/tests/language/field/type_check_runtime_test.dart
deleted file mode 100644
index 367e950..0000000
--- a/tests/language/field/type_check_runtime_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class A {
-  int e = -1;
-}
-
-void main() {
-
-}
diff --git a/tests/language/final/attempt_reinitialization_runtime_test.dart b/tests/language/final/attempt_reinitialization_runtime_test.dart
deleted file mode 100644
index b16a2c7..0000000
--- a/tests/language/final/attempt_reinitialization_runtime_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class Foo {
-
-
-}
-
-class CoffeeShop {
-
-
-
-}
-
-void main() {
-
-
-
-}
diff --git a/tests/language/final/variable_assignment_runtime_test.dart b/tests/language/final/variable_assignment_runtime_test.dart
deleted file mode 100644
index 1fabb8b..0000000
--- a/tests/language/final/variable_assignment_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test to make sure we catch assignments to final local variables.
-
-main() {
-  final x = 30;
-
-
-
-
-}
diff --git a/tests/language/function/malformed_result_type_runtime_test.dart b/tests/language/function/malformed_result_type_runtime_test.dart
deleted file mode 100644
index 02b26b4..0000000
--- a/tests/language/function/malformed_result_type_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Dart test for a function with a malformed result type.
-
-import "package:expect/expect.dart";
-
-class C<T, U> {}
-
-main() {
-
-}
diff --git a/tests/language/function/type_alias6_runtime_test.dart b/tests/language/function/type_alias6_runtime_test.dart
deleted file mode 100644
index 362fccf..0000000
--- a/tests/language/function/type_alias6_runtime_test.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test for legally self referencing function type alias.
-
-import "package:expect/expect.dart";
-
-typedef F(
-    List
-
-        x);
-
-typedef D C();
-
-class D {
-  C foo() => throw "uncalled";
-  D bar() => throw "uncalled";
-}
-
-main() {
-  var f = (List x) {};
-  Expect.isTrue(f is F);
-  var g = (List<F> x) {};
-  Expect.isFalse(g is F);
-  var d = new D();
-  Expect.isTrue(d.foo is! C);
-  Expect.isTrue(d.bar is C);
-}
diff --git a/tests/language/function/type_alias9_runtime_test.dart b/tests/language/function/type_alias9_runtime_test.dart
deleted file mode 100644
index 1aa72a3..0000000
--- a/tests/language/function/type_alias9_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test for legally self referencing function type alias.
-
-typedef void F(
-    List
-
-        l);
-typedef void G(List<F> l);
-
-main() {
-  F? foo(G? g) => g as F?;
-  foo(null);
-}
diff --git a/tests/language/function/type_call_getter2_runtime_test.dart b/tests/language/function/type_call_getter2_runtime_test.dart
deleted file mode 100644
index 8eba2dc..0000000
--- a/tests/language/function/type_call_getter2_runtime_test.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-import "package:expect/variations.dart" as v;
-
-class A {
-  final call = null;
-}
-
-class B {
-  get call => null;
-}
-
-class C {
-  set call(x) {}
-}
-
-typedef int F(String str);
-
-main() {
-  A a = new A();
-  B b = new B();
-  C c = new C();
-
-  Expect.throwsTypeErrorWhen(v.checkedImplicitDowncasts, () {
-    Function a1 = a as dynamic;
-  });
-
-  Expect.throwsTypeErrorWhen(v.checkedImplicitDowncasts, () {
-    F a2 = a as dynamic;
-  });
-
-  Expect.throwsTypeErrorWhen(v.checkedImplicitDowncasts, () {
-    Function b1 = b as dynamic;
-  });
-
-  Expect.throwsTypeErrorWhen(v.checkedImplicitDowncasts, () {
-    F b2 = b as dynamic;
-  });
-
-  Expect.throwsTypeErrorWhen(v.checkedImplicitDowncasts, () {
-    Function c1 = c as dynamic;
-  });
-
-  Expect.throwsTypeErrorWhen(v.checkedImplicitDowncasts, () {
-    F c2 = c as dynamic;
-  });
-}
diff --git a/tests/language/generic/constructor_mixin2_runtime_test.dart b/tests/language/generic/constructor_mixin2_runtime_test.dart
deleted file mode 100644
index 9cdc717..0000000
--- a/tests/language/generic/constructor_mixin2_runtime_test.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that parameter types are checked correctly in the face of
-// mixin application upon a generic constructor.
-
-import '../dynamic_type_helper.dart';
-
-class A<X> {
-  A(X x);
-}
-
-mixin B {}
-
-mixin C {}
-
-class D<Y> = A<Y> with B, C;
-
-void main() {
-  var v = 0;
-  checkNoDynamicTypeError(() => new D<int>(v));
-}
diff --git a/tests/language/generic/constructor_mixin3_runtime_test.dart b/tests/language/generic/constructor_mixin3_runtime_test.dart
deleted file mode 100644
index af5685b..0000000
--- a/tests/language/generic/constructor_mixin3_runtime_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that parameter types are checked correctly in the face of
-// mixin application upon a generic constructor.
-
-import '../dynamic_type_helper.dart';
-
-class A<X> {
-  A(X x);
-}
-
-mixin B {}
-
-class C1 = A<int> with B;
-class C2 = A<String> with B;
-
-void main() {
-  var v = 0;
-  checkNoDynamicTypeError(() => new C1(v));
-}
diff --git a/tests/language/generic/constructor_mixin_runtime_test.dart b/tests/language/generic/constructor_mixin_runtime_test.dart
deleted file mode 100644
index 68508c2..0000000
--- a/tests/language/generic/constructor_mixin_runtime_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that parameter types are checked correctly in the face of
-// mixin application upon a generic constructor.
-
-import '../dynamic_type_helper.dart';
-
-class A<X> {
-  A(X x);
-}
-
-mixin B {}
-
-class C<Y> = A<Y> with B;
-
-void main() {
-  var v = 0;
-  checkNoDynamicTypeError(() => new C<int>(v));
-}
diff --git a/tests/language/generic/f_bounded_quantification_runtime_test.dart b/tests/language/generic/f_bounded_quantification_runtime_test.dart
deleted file mode 100644
index b0fd399..0000000
--- a/tests/language/generic/f_bounded_quantification_runtime_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test for F-Bounded Quantification.
-
-class FBound<F extends FBound<F>> {}
-
-class Bar extends FBound<Bar> {}
-
-class SubBar extends Bar {}
-
-class Baz<T> extends FBound<Baz<T>> {}
-
-class SubBaz<T> extends Baz<T> {}
-
-main() {
-  FBound<Bar> fb = new FBound<Bar>();
-
-  FBound<Baz<Bar>> fbb = new FBound<Baz<Bar>>();
-}
diff --git a/tests/language/generic/field_mixin6_runtime_test.dart b/tests/language/generic/field_mixin6_runtime_test.dart
deleted file mode 100644
index 6164cae..0000000
--- a/tests/language/generic/field_mixin6_runtime_test.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that generic types in mixins are handled.
-
-import 'package:expect/expect.dart';
-
-mixin M<T> {
-  T field2 = 0 as dynamic;
-}
-
-class A<U> {}
-
-class C1<V> = Object with M<V>;
-class C2 = Object with M<int>;
-class C3 = Object with M<String>;
-
-main() {
-  // no error: 0 is an int
-  new C1<int>();
-  new C2();
-
-  // type error: 0 is not a string
-  Expect.throwsTypeError(() => new C1<String>());
-  Expect.throws(() => new C3());
-}
diff --git a/tests/language/generic/function_subtype_parametrized_typedef_runtime_1_test.dart b/tests/language/generic/function_subtype_parametrized_typedef_runtime_1_test.dart
deleted file mode 100644
index 38200de..0000000
--- a/tests/language/generic/function_subtype_parametrized_typedef_runtime_1_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Test of the subtype relationship that includes parametrized typedefs and
-// invariant occurrences of types.
-
-typedef H<X> = void Function<Y extends X>();
-
-class A {}
-
-class B extends A {}
-
-class C extends B {}
-
-void foo(H<A> ha, H<B> hb, H<C> hc) {
-  H<A> haa = ha;
-}
-
-main() {}
diff --git a/tests/language/generic/function_subtype_parametrized_typedef_runtime_2_test.dart b/tests/language/generic/function_subtype_parametrized_typedef_runtime_2_test.dart
deleted file mode 100644
index 3d49737..0000000
--- a/tests/language/generic/function_subtype_parametrized_typedef_runtime_2_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Test of the subtype relationship that includes parametrized typedefs and
-// invariant occurrences of types.
-
-typedef H<X> = void Function<Y extends X>();
-
-class A {}
-
-class B extends A {}
-
-class C extends B {}
-
-void foo(H<A> ha, H<B> hb, H<C> hc) {
-  H<B> hbb = hb;
-}
-
-main() {}
diff --git a/tests/language/generic/function_subtype_parametrized_typedef_runtime_3_test.dart b/tests/language/generic/function_subtype_parametrized_typedef_runtime_3_test.dart
deleted file mode 100644
index fe06976..0000000
--- a/tests/language/generic/function_subtype_parametrized_typedef_runtime_3_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Test of the subtype relationship that includes parametrized typedefs and
-// invariant occurrences of types.
-
-typedef H<X> = void Function<Y extends X>();
-
-class A {}
-
-class B extends A {}
-
-class C extends B {}
-
-void foo(H<A> ha, H<B> hb, H<C> hc) {
-  H<C> hcc = hc;
-}
-
-main() {}
diff --git a/tests/language/generic/function_subtype_parametrized_typedef_runtime_test.dart b/tests/language/generic/function_subtype_parametrized_typedef_runtime_test.dart
deleted file mode 100644
index d3b24e6..0000000
--- a/tests/language/generic/function_subtype_parametrized_typedef_runtime_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Test of the subtype relationship that includes parametrized typedefs and
-// invariant occurrences of types.
-
-typedef H<X> = void Function<Y extends X>();
-
-class A {}
-
-class B extends A {}
-
-class C extends B {}
-
-void foo(H<A> ha, H<B> hb, H<C> hc) {}
-
-main() {}
diff --git a/tests/language/generic/function_subtype_runtime_1_test.dart b/tests/language/generic/function_subtype_runtime_1_test.dart
deleted file mode 100644
index 80a2fd2..0000000
--- a/tests/language/generic/function_subtype_runtime_1_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Simple test of the subtype relationship on generic function types.
-
-typedef F1 = void Function<X1 extends num>();
-typedef F2 = void Function<X2 extends String>();
-
-void f1<Y1 extends num>() {}
-void f2<Y2 extends String>() {}
-
-void foo() {
-  F1 f11 = f1;
-}
-
-main() {}
diff --git a/tests/language/generic/function_subtype_runtime_2_test.dart b/tests/language/generic/function_subtype_runtime_2_test.dart
deleted file mode 100644
index f71199e..0000000
--- a/tests/language/generic/function_subtype_runtime_2_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Simple test of the subtype relationship on generic function types.
-
-typedef F1 = void Function<X1 extends num>();
-typedef F2 = void Function<X2 extends String>();
-
-void f1<Y1 extends num>() {}
-void f2<Y2 extends String>() {}
-
-void foo() {
-  F2 f22 = f2;
-}
-
-main() {}
diff --git a/tests/language/generic/function_subtype_runtime_test.dart b/tests/language/generic/function_subtype_runtime_test.dart
deleted file mode 100644
index cbfcb15..0000000
--- a/tests/language/generic/function_subtype_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-// Simple test of the subtype relationship on generic function types.
-
-typedef F1 = void Function<X1 extends num>();
-typedef F2 = void Function<X2 extends String>();
-
-void f1<Y1 extends num>() {}
-void f2<Y2 extends String>() {}
-
-void foo() {}
-
-main() {}
diff --git a/tests/language/generic/function_type_as_type_argument_runtime_1_test.dart b/tests/language/generic/function_type_as_type_argument_runtime_1_test.dart
deleted file mode 100644
index 5017cd3..0000000
--- a/tests/language/generic/function_type_as_type_argument_runtime_1_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// VMOptions=--reify-generic-functions
-
-import "package:expect/expect.dart";
-
-T foo<T>(T i) => i;
-
-void main() {
-  Expect.equals(42, foo<int>(42));
-
-  var bar = foo;
-  Expect.equals(42, bar<int>(42));
-
-  // Generic function types are not allowed as type arguments.
-
-  // Type inference must also give an error.
-
-  // No error if illegal type cannot be inferred.
-  var dynamicList = <dynamic>[foo];
-  Expect.equals(42, (dynamicList[0] as T Function<T>(T))<int>(42));
-}
diff --git a/tests/language/generic/function_type_as_type_argument_runtime_test.dart b/tests/language/generic/function_type_as_type_argument_runtime_test.dart
deleted file mode 100644
index c262f729..0000000
--- a/tests/language/generic/function_type_as_type_argument_runtime_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// VMOptions=--reify-generic-functions
-
-import "package:expect/expect.dart";
-
-T foo<T>(T i) => i;
-
-void main() {
-  Expect.equals(42, foo<int>(42));
-
-  var bar = foo;
-  Expect.equals(42, bar<int>(42));
-
-  // Generic function types are not allowed as type arguments.
-
-  // Type inference must also give an error.
-
-  // No error if illegal type cannot be inferred.
-}
diff --git a/tests/language/generic/function_typedef2_runtime_test.dart b/tests/language/generic/function_typedef2_runtime_test.dart
deleted file mode 100644
index 657f046..0000000
--- a/tests/language/generic/function_typedef2_runtime_test.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test for a function type test that cannot be eliminated at compile time.
-
-import "package:expect/expect.dart";
-
-class A {}
-
-typedef int F();
-
-typedef K = Function(Function<A>(A));
-typedef L = Function({bool x});
-
-typedef M = Function({bool int});
-
-foo({bool int = false}) {}
-main() {
-  bool b = true;
-  Expect.isFalse(b is L);
-  Expect.isFalse(b is M);
-  Expect.isTrue(foo is M);
-}
diff --git a/tests/language/generic/instantiate_type_variable_runtime_test.dart b/tests/language/generic/instantiate_type_variable_runtime_test.dart
deleted file mode 100644
index d91a010..0000000
--- a/tests/language/generic/instantiate_type_variable_runtime_test.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that you cannot instantiate a type variable.
-
-class Foo<T> {
-  Foo() {}
-  dynamic make() {}
-}
-
-main() {
-  new Foo<Object>().make();
-}
diff --git a/tests/language/generic/metadata_runtime_1_test.dart b/tests/language/generic/metadata_runtime_1_test.dart
deleted file mode 100644
index 1467008..0000000
--- a/tests/language/generic/metadata_runtime_1_test.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Check that annotations cannot use type arguments, but can be raw.
-
-class C<T> {
-  const C();
-}
-
-@C()
-main() {}
diff --git a/tests/language/generic/metadata_runtime_test.dart b/tests/language/generic/metadata_runtime_test.dart
deleted file mode 100644
index f5c8a92..0000000
--- a/tests/language/generic/metadata_runtime_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Check that annotations cannot use type arguments, but can be raw.
-
-class C<T> {
-  const C();
-}
-
-main() {}
diff --git a/tests/language/generic/reify_typevar_runtime_1_test.dart b/tests/language/generic/reify_typevar_runtime_1_test.dart
deleted file mode 100644
index bd16972..0000000
--- a/tests/language/generic/reify_typevar_runtime_1_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class C<T> {
-  final x;
-  C([this.x]);
-
-  static staticFunction(bool b) => null;
-  factory C.factoryConstructor(bool b) => new C(b ? T : null);
-  C.redirectingConstructor(bool b) : this(null);
-  C.ordinaryConstructor(bool b) : x = null;
-}
-
-main() {
-  Expect.equals(null, C.staticFunction(false));
-  Expect.equals(null, new C.factoryConstructor(false).x);
-  Expect.equals(null, new C.redirectingConstructor(false).x);
-  Expect.equals(null, new C.ordinaryConstructor(false).x);
-}
diff --git a/tests/language/generic/reify_typevar_runtime_2_test.dart b/tests/language/generic/reify_typevar_runtime_2_test.dart
deleted file mode 100644
index 2f52155..0000000
--- a/tests/language/generic/reify_typevar_runtime_2_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class C<T> {
-  final x;
-  C([this.x]);
-
-  static staticFunction(bool b) => null;
-  factory C.factoryConstructor(bool b) => new C(null);
-  C.redirectingConstructor(bool b) : this(b ? T : null);
-  C.ordinaryConstructor(bool b) : x = null;
-}
-
-main() {
-  Expect.equals(null, C.staticFunction(false));
-  Expect.equals(null, new C.factoryConstructor(false).x);
-  Expect.equals(null, new C.redirectingConstructor(false).x);
-  Expect.equals(null, new C.ordinaryConstructor(false).x);
-}
diff --git a/tests/language/generic/reify_typevar_runtime_3_test.dart b/tests/language/generic/reify_typevar_runtime_3_test.dart
deleted file mode 100644
index 4db97c1..0000000
--- a/tests/language/generic/reify_typevar_runtime_3_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class C<T> {
-  final x;
-  C([this.x]);
-
-  static staticFunction(bool b) => null;
-  factory C.factoryConstructor(bool b) => new C(null);
-  C.redirectingConstructor(bool b) : this(null);
-  C.ordinaryConstructor(bool b) : x = b ? T : null;
-}
-
-main() {
-  Expect.equals(null, C.staticFunction(false));
-  Expect.equals(null, new C.factoryConstructor(false).x);
-  Expect.equals(null, new C.redirectingConstructor(false).x);
-  Expect.equals(null, new C.ordinaryConstructor(false).x);
-}
diff --git a/tests/language/generic/reify_typevar_runtime_test.dart b/tests/language/generic/reify_typevar_runtime_test.dart
deleted file mode 100644
index 9fce4be..0000000
--- a/tests/language/generic/reify_typevar_runtime_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class C<T> {
-  final x;
-  C([this.x]);
-
-  static staticFunction(bool b) => null;
-  factory C.factoryConstructor(bool b) => new C(null);
-  C.redirectingConstructor(bool b) : this(null);
-  C.ordinaryConstructor(bool b) : x = null;
-}
-
-main() {
-  Expect.equals(null, C.staticFunction(false));
-  Expect.equals(null, new C.factoryConstructor(false).x);
-  Expect.equals(null, new C.redirectingConstructor(false).x);
-  Expect.equals(null, new C.ordinaryConstructor(false).x);
-}
diff --git a/tests/language/generic/wrong_number_type_arguments_runtime_test.dart b/tests/language/generic/wrong_number_type_arguments_runtime_test.dart
deleted file mode 100644
index 1bb5173..0000000
--- a/tests/language/generic/wrong_number_type_arguments_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-// Map takes 2 type arguments.
-Map foo = {};
-Map baz = {};
-
-main() {
-  var bar = new Map();
-}
diff --git a/tests/language/generic_methods/generic_function_result_runtime_test.dart b/tests/language/generic_methods/generic_function_result_runtime_test.dart
deleted file mode 100644
index 3f29f89..0000000
--- a/tests/language/generic_methods/generic_function_result_runtime_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify that function type parameter S can be resolved in bar's result type.
-// Verify that generic function types are not allowed as type arguments.
-
-import "package:expect/expect.dart";
-
-int foo(int i, int j) => i + j;
-
-List<int Function(S, int)> bar<S extends int>() {
-  return <int Function(S, int)>[foo, foo];
-}
-
-void main() {
-  var list = bar<int>();
-  print(list[0].runtimeType);
-  Expect.equals(123, list[1](100, 23));
-}
diff --git a/tests/language/getter/no_setter2_runtime_test.dart b/tests/language/getter/no_setter2_runtime_test.dart
deleted file mode 100644
index 74873f3..0000000
--- a/tests/language/getter/no_setter2_runtime_test.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Verifies behavior with a static getter, but no field and no setter.
-
-import "package:expect/expect.dart";
-
-class Example {
-  static int _var = 1;
-  static int get nextVar => _var++;
-  Example() {}
-  static test() {}
-}
-
-class Example1 {
-  Example1(int i) {}
-}
-
-class Example2 extends Example1 {
-  static int _var = 1;
-  static int get nextVar => _var++;
-  Example2() : super(nextVar) {} // No 'this' in scope.
-}
-
-void main() {
-  Example x = new Example();
-  Example.test();
-  Example2 x2 = new Example2();
-}
diff --git a/tests/language/getter/no_setter_runtime_test.dart b/tests/language/getter/no_setter_runtime_test.dart
deleted file mode 100644
index 74873f3..0000000
--- a/tests/language/getter/no_setter_runtime_test.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Verifies behavior with a static getter, but no field and no setter.
-
-import "package:expect/expect.dart";
-
-class Example {
-  static int _var = 1;
-  static int get nextVar => _var++;
-  Example() {}
-  static test() {}
-}
-
-class Example1 {
-  Example1(int i) {}
-}
-
-class Example2 extends Example1 {
-  static int _var = 1;
-  static int get nextVar => _var++;
-  Example2() : super(nextVar) {} // No 'this' in scope.
-}
-
-void main() {
-  Example x = new Example();
-  Example.test();
-  Example2 x2 = new Example2();
-}
diff --git a/tests/language/getter/parameters_runtime_test.dart b/tests/language/getter/parameters_runtime_test.dart
deleted file mode 100644
index 8deff3a..0000000
--- a/tests/language/getter/parameters_runtime_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// Test that a getter has no parameters.
-
-get f1 => null;
-get f2 => null;
-get f3 => null;
-get f4 => null;
-get f5 => null;
-
-main() {
-  f1;
-  f2;
-  f3;
-  f4;
-  f5;
-}
diff --git a/tests/language/getter/setter_type_runtime_test.dart b/tests/language/getter/setter_type_runtime_test.dart
deleted file mode 100644
index f2cdeaa..0000000
--- a/tests/language/getter/setter_type_runtime_test.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Getters and setters can have different types, but it is a warning if the
-// two types are not assignable.
-
-import "package:expect/expect.dart";
-
-int bar = 499;
-
-get foo => bar;
-
-void set foo(str) {
-  bar = str.length;
-}
-
-main() {
-  int x = foo;
-  Expect.equals(499, x);
-  foo = "1234";
-  int y = foo;
-  Expect.equals(4, y);
-}
diff --git a/tests/language/getter/syntax_runtime_1_test.dart b/tests/language/getter/syntax_runtime_1_test.dart
deleted file mode 100644
index 44e8176..0000000
--- a/tests/language/getter/syntax_runtime_1_test.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-var get;
-
-var set;
-
-class C0 {
-  var get;
-
-  var set;
-}
-
-class C1 {
-  List? get;
-  List? get a => null;
-
-  List? set;
-}
-
-class C2 {
-  List<int>? get;
-  List<int>? get a => null;
-
-  List<int>? set;
-}
-
-main() {
-  new C0();
-  new C1();
-  new C2();
-}
diff --git a/tests/language/getter/syntax_runtime_test.dart b/tests/language/getter/syntax_runtime_test.dart
deleted file mode 100644
index 37e07d0..0000000
--- a/tests/language/getter/syntax_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class C0 {}
-
-class C1 {}
-
-class C2 {}
-
-main() {
-  new C0();
-  new C1();
-  new C2();
-}
diff --git a/tests/language/identifier/built_in_illegal_runtime_test.dart b/tests/language/identifier/built_in_illegal_runtime_test.dart
deleted file mode 100644
index 8b3ba13..0000000
--- a/tests/language/identifier/built_in_illegal_runtime_test.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Check that we cannot use a pseudo keyword at the class level code.
-
-// Pseudo keywords are not allowed to be used as class names.
-
-main() {}
diff --git a/tests/language/identifier/known_prefix_error_runtime_test.dart b/tests/language/identifier/known_prefix_error_runtime_test.dart
deleted file mode 100644
index ebcab63..0000000
--- a/tests/language/identifier/known_prefix_error_runtime_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that identifiers which are used explicitly in the grammar but are
-// not built-in identifiers can be used as library prefixes.
-
-// The identifiers listed below are mentioned in the grammar, but none of
-// them is a reserved word or a built-in identifier. Such an identifier can
-// be used as a library prefix; this test puts such prefixes in wrong
-// locations to verify that this is being handled. Here are the 'known'
-// identifiers: `async`, `await`, `hide`, `of`, `on`, `show`, `sync`, `yield`.
-
-import "package:expect/expect.dart";
-import 'built_in_prefix_library_async.dart' as async;
-import 'built_in_prefix_library_await.dart' as await;
-import 'built_in_prefix_library_hide.dart' as hide;
-import 'built_in_prefix_library_of.dart' as of;
-import 'built_in_prefix_library_on.dart' as on;
-import 'built_in_prefix_library_show.dart' as show;
-import 'built_in_prefix_library_sync.dart' as sync;
-import 'built_in_prefix_library_yield.dart' as yield;
-
-main() {}
diff --git a/tests/language/identifier/known_usage_error_runtime_test.dart b/tests/language/identifier/known_usage_error_runtime_test.dart
deleted file mode 100644
index badc14c..0000000
--- a/tests/language/identifier/known_usage_error_runtime_test.dart
+++ /dev/null
@@ -1,63 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// The identifiers listed below are mentioned in the grammar, but none of
-// them is a reserved word or a built-in identifier. Such an identifier can
-// be used just like all other identifiers, with the exceptions mentioned
-// below. Here are said 'known' identifiers:
-//
-//   `async`, `await`, `hide`, `of`, `on`, `show`, `sync`, `yield`
-//
-// The following exceptions apply:
-//
-//   It is a compile-time error to use `await` or `yield` as an identifier in
-//   the body of a function marked `async`, `async*`, or `sync*`.
-//
-//   It is a compile-time error if an asynchronous for-in appears inside a
-//   synchronous function.
-
-import 'dart:async';
-
-Future<void> f1() async {
-  // Allowed:
-  int async = 1;
-
-  Stream<int> s = new Stream<int>.fromFuture(new Future<int>.value(1));
-  await for (int i in s) {
-    return;
-  }
-}
-
-Stream<int> f2() async* {
-  int async = 1;
-
-  Stream<int> s = new Stream<int>.fromFuture(new Future<int>.value(1));
-  await for (var i in s) {
-    yield i + 1;
-  }
-}
-
-Iterable<int> f3() sync* {
-  int async = 1;
-
-  Stream<int> s = new Stream<int>.fromFuture(new Future<int>.value(1));
-}
-
-void f4() {
-  int async = 1;
-  int await = 1;
-  int yield = 1;
-
-  Stream s = new Stream<int>.fromFuture(new Future<int>.value(1));
-}
-
-main() {
-  Future<void> f = f1();
-  Stream s = f2();
-  Iterable<int> i = f3();
-  f4();
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_10_test.dart b/tests/language/if_null/assignment_behavior_runtime_10_test.dart
deleted file mode 100644
index 6c3710a..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_10_test.dart
+++ /dev/null
@@ -1,173 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  {
-    var l;
-    yGetValue = 1;
-    check(1, () => l ??= y, ['y']);
-    Expect.equals(1, l);
-  }
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_13_test.dart b/tests/language/if_null/assignment_behavior_runtime_13_test.dart
deleted file mode 100644
index ec57802..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_13_test.dart
+++ /dev/null
@@ -1,168 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-  C.xGetValue = 1;
-  check(1, () => C.x ??= bad(), ['C.x']);
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_14_test.dart b/tests/language/if_null/assignment_behavior_runtime_14_test.dart
deleted file mode 100644
index 7999a21..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_14_test.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  yGetValue = 1;
-  check(1, () => C.x ??= y, ['C.x', 'y', 'C.x=1']);
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_15_test.dart b/tests/language/if_null/assignment_behavior_runtime_15_test.dart
deleted file mode 100644
index 125d9f9..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_15_test.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  h.C.xGetValue = 1;
-  check(1, () => h.C.x ??= bad(), ['h.C.x']);
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_16_test.dart b/tests/language/if_null/assignment_behavior_runtime_16_test.dart
deleted file mode 100644
index 5f5693b..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_16_test.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  yGetValue = 1;
-  check(1, () => h.C.x ??= y, ['h.C.x', 'y', 'h.C.x=1']);
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_17_test.dart b/tests/language/if_null/assignment_behavior_runtime_17_test.dart
deleted file mode 100644
index ca6593f..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_17_test.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-  xGetValue = new C('x');
-  xGetValue.vGetValue = 1;
-  check(1, () => x.v ??= bad(), ['x', 'x.v']);
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_18_test.dart b/tests/language/if_null/assignment_behavior_runtime_18_test.dart
deleted file mode 100644
index f1b0695..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_18_test.dart
+++ /dev/null
@@ -1,170 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  xGetValue = new C('x');
-  yGetValue = 1;
-  check(1, () => x.v ??= y, ['x', 'x.v', 'y', 'x.v=1']);
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_19_test.dart b/tests/language/if_null/assignment_behavior_runtime_19_test.dart
deleted file mode 100644
index 2f0e1d9..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_19_test.dart
+++ /dev/null
@@ -1,170 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  fValue = new C('f()');
-  fValue.vGetValue = 1;
-  check(1, () => f().v ??= bad(), ['f()', 'f().v']);
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_1_test.dart b/tests/language/if_null/assignment_behavior_runtime_1_test.dart
deleted file mode 100644
index d9e815b..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_1_test.dart
+++ /dev/null
@@ -1,168 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-    vGetValue = 1;
-    check(1, () => v ??= bad(), ['$s.v']);
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_20_test.dart b/tests/language/if_null/assignment_behavior_runtime_20_test.dart
deleted file mode 100644
index 2defe71..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_20_test.dart
+++ /dev/null
@@ -1,170 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  fValue = new C('f()');
-  yGetValue = 1;
-  check(1, () => f().v ??= y, ['f()', 'f().v', 'y', 'f().v=1']);
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_21_test.dart b/tests/language/if_null/assignment_behavior_runtime_21_test.dart
deleted file mode 100644
index a7de055..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_21_test.dart
+++ /dev/null
@@ -1,170 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-  xGetValue = new C('x');
-  yGetValue = 1;
-  xGetValue.indexGetValue = 2;
-  check(2, () => x[y] ??= bad(), ['x', 'y', 'x[1]']);
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_22_test.dart b/tests/language/if_null/assignment_behavior_runtime_22_test.dart
deleted file mode 100644
index 17826a60..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_22_test.dart
+++ /dev/null
@@ -1,171 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  xGetValue = new C('x');
-  yGetValue = 1;
-  zGetValue = 2;
-  check(2, () => x[y] ??= z, ['x', 'y', 'x[1]', 'z', 'x[1]=2']);
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_23_test.dart b/tests/language/if_null/assignment_behavior_runtime_23_test.dart
deleted file mode 100644
index 5f0049f..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_23_test.dart
+++ /dev/null
@@ -1,167 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-  check(null, () => x?.v ??= bad(), ['x']);
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_24_test.dart b/tests/language/if_null/assignment_behavior_runtime_24_test.dart
deleted file mode 100644
index a4dc06f..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_24_test.dart
+++ /dev/null
@@ -1,170 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  xGetValue = new C('x');
-  xGetValue.vGetValue = 1;
-  check(1, () => x?.v ??= bad(), ['x', 'x.v']);
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_25_test.dart b/tests/language/if_null/assignment_behavior_runtime_25_test.dart
deleted file mode 100644
index 3b3b434..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_25_test.dart
+++ /dev/null
@@ -1,170 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  xGetValue = new C('x');
-  yGetValue = 1;
-  check(1, () => x?.v ??= y, ['x', 'x.v', 'y', 'x.v=1']);
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_26_test.dart b/tests/language/if_null/assignment_behavior_runtime_26_test.dart
deleted file mode 100644
index 526c411..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_26_test.dart
+++ /dev/null
@@ -1,171 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-
-  yGetValue = 1;
-  check(1, () => C?.x ??= y, ['C.x', 'y', 'C.x=1']);
-  //              ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_27_test.dart b/tests/language/if_null/assignment_behavior_runtime_27_test.dart
deleted file mode 100644
index a049746..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_27_test.dart
+++ /dev/null
@@ -1,171 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-
-  yGetValue = 1;
-  check(1, () => h.C?.x ??= y, ['h.C.x', 'y', 'h.C.x=1']);
-  //                ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_2_test.dart b/tests/language/if_null/assignment_behavior_runtime_2_test.dart
deleted file mode 100644
index d99044a..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_2_test.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-    check(1, () => v ??= y, ['$s.v', 'y', '$s.v=1']);
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_3_test.dart b/tests/language/if_null/assignment_behavior_runtime_3_test.dart
deleted file mode 100644
index eae75f4..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_3_test.dart
+++ /dev/null
@@ -1,168 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-    vGetValue = 1;
-    check(1, () => super.v ??= bad(), ['$s.v']);
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_4_test.dart b/tests/language/if_null/assignment_behavior_runtime_4_test.dart
deleted file mode 100644
index 3037611..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_4_test.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-
-    yGetValue = 1;
-    check(1, () => super.v ??= y, ['$s.v', 'y', '$s.v=1']);
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_5_test.dart b/tests/language/if_null/assignment_behavior_runtime_5_test.dart
deleted file mode 100644
index e8721a1..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_5_test.dart
+++ /dev/null
@@ -1,168 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-  xGetValue = 1;
-  check(1, () => x ??= bad(), ['x']);
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_6_test.dart b/tests/language/if_null/assignment_behavior_runtime_6_test.dart
deleted file mode 100644
index b5b3af1..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_6_test.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  yGetValue = 1;
-  check(1, () => x ??= y, ['x', 'y', 'x=1']);
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_7_test.dart b/tests/language/if_null/assignment_behavior_runtime_7_test.dart
deleted file mode 100644
index 152362c..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_7_test.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  h.xGetValue = 1;
-  check(1, () => h.x ??= bad(), ['h.x']);
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_8_test.dart b/tests/language/if_null/assignment_behavior_runtime_8_test.dart
deleted file mode 100644
index ccd9242..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_8_test.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  yGetValue = 1;
-  check(1, () => h.x ??= y, ['h.x', 'y', 'h.x=1']);
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_9_test.dart b/tests/language/if_null/assignment_behavior_runtime_9_test.dart
deleted file mode 100644
index e9e454e..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_9_test.dart
+++ /dev/null
@@ -1,171 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  {
-    dynamic l = 1;
-    check(1, () => l ??= bad(), []);
-  }
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/assignment_behavior_runtime_test.dart b/tests/language/if_null/assignment_behavior_runtime_test.dart
deleted file mode 100644
index 2341966..0000000
--- a/tests/language/if_null/assignment_behavior_runtime_test.dart
+++ /dev/null
@@ -1,166 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ??= operator, including order of operations, by
-// keeping track of the operations performed.
-
-import "package:expect/expect.dart";
-import "assignment_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-var xGetValue = null;
-
-get x {
-  h.operations.add('x');
-  var tmp = xGetValue;
-  xGetValue = null;
-  return tmp;
-}
-
-void set x(value) {
-  h.operations.add('x=$value');
-}
-
-var yGetValue = null;
-
-get y {
-  h.operations.add('y');
-  var tmp = yGetValue;
-  yGetValue = null;
-  return tmp;
-}
-
-void set y(value) {
-  h.operations.add('y=$value');
-}
-
-var zGetValue = null;
-
-get z {
-  h.operations.add('z');
-  var tmp = zGetValue;
-  zGetValue = null;
-  return tmp;
-}
-
-void set z(value) {
-  h.operations.add('z=$value');
-}
-
-var fValue = null;
-
-f() {
-  h.operations.add('f()');
-  var tmp = fValue;
-  fValue = null;
-  return tmp;
-}
-
-void check(expectedValue, f(), expectedOperations) {
-  Expect.equals(expectedValue, f());
-  Expect.listEquals(expectedOperations, h.operations);
-  h.operations = [];
-}
-
-class C {
-  final String s;
-
-  C(this.s);
-
-  @override
-  String toString() => s;
-
-  static var xGetValue = null;
-
-  static get x {
-    h.operations.add('C.x');
-    var tmp = xGetValue;
-    xGetValue = null;
-    return tmp;
-  }
-
-  static void set x(value) {
-    h.operations.add('C.x=$value');
-  }
-
-  var vGetValue = null;
-
-  get v {
-    h.operations.add('$s.v');
-    var tmp = vGetValue;
-    vGetValue = null;
-    return tmp;
-  }
-
-  void set v(value) {
-    h.operations.add('$s.v=$value');
-  }
-
-  var indexGetValue = null;
-
-  operator [](index) {
-    h.operations.add('$s[$index]');
-    var tmp = indexGetValue;
-    indexGetValue = null;
-    return tmp;
-  }
-
-  void operator []=(index, value) {
-    h.operations.add('$s[$index]=$value');
-  }
-
-  final finalOne = 1;
-  final finalNull = null;
-
-  void instanceTest() {
-    // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-    yGetValue = 1;
-  }
-}
-
-class D extends C {
-  D(String s) : super(s);
-
-  get v => bad();
-
-  void set v(value) {
-    bad();
-  }
-
-  void derivedInstanceTest() {
-    // super.v ??= e is equivalent to
-    // ((x) => x == null ? super.v = e : x)(super.v)
-  }
-}
-
-main() {
-  // Make sure the "none" test fails if "??=" is not implemented.  This makes
-  // status files easier to maintain.
-  var noneTest;
-  noneTest ??= null;
-
-  new C('c').instanceTest();
-  new D('d').derivedInstanceTest();
-
-  // v ??= e is equivalent to ((x) => x == null ? v = e : x)(v)
-
-  // C.v ??= e is equivalent to ((x) => x == null ? C.v = e : x)(C.v)
-
-  // e1.v ??= e2 is equivalent to
-  // ((x) => ((y) => y == null ? x.v = e2 : y)(x.v))(e1)
-
-  // e1[e2] ??= e3 is equivalent to
-  // ((a, i) => ((x) => x == null ? a[i] = e3 : x)(a[i]))(e1, e2)
-
-  // e1?.v ??= e2 is equivalent to ((x) => x == null ? null : x.v ??= e2)(e1).
-
-  // C?.v ??= e2 is equivalent to C.v ??= e2.
-}
diff --git a/tests/language/if_null/precedence_runtime_test.dart b/tests/language/if_null/precedence_runtime_test.dart
deleted file mode 100644
index 8f65cfc..0000000
--- a/tests/language/if_null/precedence_runtime_test.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify that '??' binds tighter than '?:' and less tightly than '||'.
-
-import "package:expect/expect.dart";
-
-main() {
-  // Make sure the "none" test fails if "??" is not implemented.  This makes
-  // status files easier to maintain.
-  var _ = null ?? null;
-
-  dynamic falsity = false;
-  dynamic truth = true;
-  dynamic one = 1;
-  dynamic two = 2;
-  dynamic nil = null;
-
-  // "a ?? b ?? c" should be legal, and should evaluate to the first non-null
-  // value (or null if there are no non-null values).
-  Expect.equals(1, one ?? 2 ?? 3);
-  Expect.equals(2, null ?? two ?? 3);
-  Expect.equals(3, null ?? null ?? 3);
-  Expect.equals(null, null ?? null ?? null);
-
-  // "a ?? b ? c : d" should parse as "(a ?? b) ? c : d", therefore provided
-  // that a is true, b need not be a bool.  An incorrect parse of
-  // "a ?? (b ? c : d)" would require b to be a bool to avoid a static type
-  // warning.
-  Expect.equals(2, truth ?? one ? 2 : 3);
-}
diff --git a/tests/language/import/combinators2_runtime_test.dart b/tests/language/import/combinators2_runtime_test.dart
deleted file mode 100644
index 7bdfbc7..0000000
--- a/tests/language/import/combinators2_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Dart test program importing with show/hide combinators.
-
-// Show "hide" and "show", hide "ugly".
-import "import1_lib.dart" show hide, show hide ugly;
-
-main() {
-  print(hide);
-  print(show);
-
-  // Ugly is hidden.
-}
diff --git a/tests/language/import/hidden_runtime_test.dart b/tests/language/import/hidden_runtime_test.dart
deleted file mode 100644
index 41dc0ec..0000000
--- a/tests/language/import/hidden_runtime_test.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Tests that dart: imports are implicitly hidden and cause warning on use.
-
-library hidden_import;
-
-import 'hidden_lib.dart';
-import 'hidden_lib.dart' as prefix;
-import 'dart:async';
-import 'dart:async' as prefix;
-
-main() {}
diff --git a/tests/language/import/internal_library_runtime_test.dart b/tests/language/import/internal_library_runtime_test.dart
deleted file mode 100644
index afa7395..0000000
--- a/tests/language/import/internal_library_runtime_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test that a private library cannot be accessed from outside the platform.
-
-library internal_library_test;
-
-import 'dart:core'; // This loads 'dart:_foreign_helper' and 'patch:core'.
-
-void main() {}
diff --git a/tests/language/import/nonexisting_dart_uri_runtime_test.dart b/tests/language/import/nonexisting_dart_uri_runtime_test.dart
deleted file mode 100644
index 1268945..0000000
--- a/tests/language/import/nonexisting_dart_uri_runtime_test.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-main() {}
diff --git a/tests/language/import/private_runtime_test.dart b/tests/language/import/private_runtime_test.dart
deleted file mode 100644
index 46ddc45..0000000
--- a/tests/language/import/private_runtime_test.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Check that private dart:_ libraries cannot be imported.
-
-main() {
-  print("Done.");
-}
diff --git a/tests/language/import/self_runtime_test.dart b/tests/language/import/self_runtime_test.dart
deleted file mode 100644
index b44b2e5..0000000
--- a/tests/language/import/self_runtime_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// Check that private names cannot be imported even if the library imports
-// itself.
-
-library import_self;
-
-import "package:expect/expect.dart";
-
-// Eliminate the import of the unmodified file or else the analyzer
-// will generate the static error in the import_self_test_none case.
-
-var _x = "The quick brown fox jumps over the dazy log";
-
-main() {}
diff --git a/tests/language/inference/accessor_ref_runtime_1_test.dart b/tests/language/inference/accessor_ref_runtime_1_test.dart
deleted file mode 100644
index f7d87b9..0000000
--- a/tests/language/inference/accessor_ref_runtime_1_test.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-/*@testedFeatures=inference*/
-library test;
-
-class A {
-  late B b;
-}
-
-class B {
-  C? get c => null;
-  void set c(C? value) {}
-}
-
-class C {}
-
-class D extends C {}
-
-class E extends C {}
-
-// Inferred type: A
-var a = new A();
-
-// Inferred type: C?
-var x = a.b.c;
-
-// Inferred type: C
-var y = a.b.c ??= new D();
-
-test() {
-  // Verify the types of x and y by trying to assign to them.
-  x = new C();
-  x = null;
-}
-
-main() {}
diff --git a/tests/language/inference/accessor_ref_runtime_2_test.dart b/tests/language/inference/accessor_ref_runtime_2_test.dart
deleted file mode 100644
index 26fcb0d..0000000
--- a/tests/language/inference/accessor_ref_runtime_2_test.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-/*@testedFeatures=inference*/
-library test;
-
-class A {
-  late B b;
-}
-
-class B {
-  C? get c => null;
-  void set c(C? value) {}
-}
-
-class C {}
-
-class D extends C {}
-
-class E extends C {}
-
-// Inferred type: A
-var a = new A();
-
-// Inferred type: C?
-var x = a.b.c;
-
-// Inferred type: C
-var y = a.b.c ??= new D();
-
-test() {
-  // Verify the types of x and y by trying to assign to them.
-
-  x = new E();
-}
-
-main() {}
diff --git a/tests/language/inference/accessor_ref_runtime_3_test.dart b/tests/language/inference/accessor_ref_runtime_3_test.dart
deleted file mode 100644
index d241ac7..0000000
--- a/tests/language/inference/accessor_ref_runtime_3_test.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-/*@testedFeatures=inference*/
-library test;
-
-class A {
-  late B b;
-}
-
-class B {
-  C? get c => null;
-  void set c(C? value) {}
-}
-
-class C {}
-
-class D extends C {}
-
-class E extends C {}
-
-// Inferred type: A
-var a = new A();
-
-// Inferred type: C?
-var x = a.b.c;
-
-// Inferred type: C
-var y = a.b.c ??= new D();
-
-test() {
-  // Verify the types of x and y by trying to assign to them.
-
-  y = new C();
-}
-
-main() {}
diff --git a/tests/language/inference/accessor_ref_runtime_4_test.dart b/tests/language/inference/accessor_ref_runtime_4_test.dart
deleted file mode 100644
index 4e29fee..0000000
--- a/tests/language/inference/accessor_ref_runtime_4_test.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-/*@testedFeatures=inference*/
-library test;
-
-class A {
-  late B b;
-}
-
-class B {
-  C? get c => null;
-  void set c(C? value) {}
-}
-
-class C {}
-
-class D extends C {}
-
-class E extends C {}
-
-// Inferred type: A
-var a = new A();
-
-// Inferred type: C?
-var x = a.b.c;
-
-// Inferred type: C
-var y = a.b.c ??= new D();
-
-test() {
-  // Verify the types of x and y by trying to assign to them.
-
-  y = new E();
-}
-
-main() {}
diff --git a/tests/language/inference/accessor_ref_runtime_test.dart b/tests/language/inference/accessor_ref_runtime_test.dart
deleted file mode 100644
index 58137a6..0000000
--- a/tests/language/inference/accessor_ref_runtime_test.dart
+++ /dev/null
@@ -1,39 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-/*@testedFeatures=inference*/
-library test;
-
-class A {
-  late B b;
-}
-
-class B {
-  C? get c => null;
-  void set c(C? value) {}
-}
-
-class C {}
-
-class D extends C {}
-
-class E extends C {}
-
-// Inferred type: A
-var a = new A();
-
-// Inferred type: C?
-var x = a.b.c;
-
-// Inferred type: C
-var y = a.b.c ??= new D();
-
-test() {
-  // Verify the types of x and y by trying to assign to them.
-}
-
-main() {}
diff --git a/tests/language/initializing_formal/type_annotation_runtime_test.dart b/tests/language/initializing_formal/type_annotation_runtime_test.dart
deleted file mode 100644
index 053fd34..0000000
--- a/tests/language/initializing_formal/type_annotation_runtime_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Testing the static checks for type annotations on initializing formals.
-
-class C {
-  num a;
-  C.sameType(num this.a);
-  C.subType(int this.a);
-}
-
-main() {
-  new C.sameType(3.14);
-  new C.subType(42);
-}
diff --git a/tests/language/interface/duplicate_interface_implements_runtime_test.dart b/tests/language/interface/duplicate_interface_implements_runtime_test.dart
deleted file mode 100644
index c4c09ae..0000000
--- a/tests/language/interface/duplicate_interface_implements_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "duplicate_interface_lib.dart" as alib;
-import "duplicate_interface_lib.dart" show InterfA;
-
-// Expect error since InterfA and alib.InterfA refer to the same interface.
-class Foo implements InterfA {}
-
-main() {
-  new Foo();
-}
diff --git a/tests/language/interface/implements_futureor_runtime_test.dart b/tests/language/interface/implements_futureor_runtime_test.dart
deleted file mode 100644
index b503984..0000000
--- a/tests/language/interface/implements_futureor_runtime_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'dart:async';
-
-class A<T> {}
-
-void main() {
-  A a = new A();
-}
diff --git a/tests/language/interface/injection1_runtime_test.dart b/tests/language/interface/injection1_runtime_test.dart
deleted file mode 100644
index 9943b98..0000000
--- a/tests/language/interface/injection1_runtime_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// The removed language feature "interface injection" is now a syntax error.
-
-import "package:expect/expect.dart";
-
-abstract class S {}
-
-abstract class I {}
-
-class C implements I {}
-
-main() {
-  Expect.isFalse(new C() is S);
-}
diff --git a/tests/language/interface/injection2_runtime_test.dart b/tests/language/interface/injection2_runtime_test.dart
deleted file mode 100644
index 52168e2..0000000
--- a/tests/language/interface/injection2_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// The removed language feature "interface injection" is now a syntax error.
-
-import "package:expect/expect.dart";
-
-abstract class S {}
-
-class C {}
-
-main() {
-  Expect.isFalse(new C() is S);
-}
diff --git a/tests/language/interface/runtime_test.dart b/tests/language/interface/runtime_test.dart
deleted file mode 100644
index 7edcb00..0000000
--- a/tests/language/interface/runtime_test.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test program for testing Interfaces.
-
-abstract class Ai {
-  int foo();
-}
-
-abstract class Bi implements Ai {}
-
-abstract class Simple implements Ai {}
-
-abstract class Aai {}
-
-abstract class Abi {}
-
-abstract class Bar {}
-
-abstract class Foo implements Bar {}
-
-abstract class Baz implements Bar, Foo {}
-
-abstract class InterfaceTest implements Ai, Aai, Abi, Baz, Bi {
-  var f;
-
-  InterfaceTest() {}
-  int foo() {
-    return 1;
-  }
-
-  // intentionally unimplemented methods
-  beta(); // Abstract.
-  String beta1(); // Abstract.
-  String beta2(double d); // Abstract.
-}
-
-main() {}
diff --git a/tests/language/is/isnot_malformed_type_runtime_test.dart b/tests/language/is/isnot_malformed_type_runtime_test.dart
deleted file mode 100644
index 435fcc2..0000000
--- a/tests/language/is/isnot_malformed_type_runtime_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:expect/expect.dart';
-
-f(obj) {
-  // 'Baz' is not loaded, throws a type error on test.
-}
-
-main() {}
diff --git a/tests/language/is/malformed_type_runtime_test.dart b/tests/language/is/malformed_type_runtime_test.dart
deleted file mode 100644
index 19543e5..0000000
--- a/tests/language/is/malformed_type_runtime_test.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test program for the "is" and "as" operator with malformed type.
-
-import "package:expect/expect.dart";
-
-testEval(x) {
-  return x;
-}
-
-test99(e) {
-  // Test that a runtime error is thrown when the 'is' operator checks for a
-  // malformed type.
-}
-
-test98(e) {
-  // Test that a runtime error is thrown when the 'as' operator checks for a
-  // malformed type.
-}
-
-test97(e) {
-  // Check that the remaining expression after the type test
-  // with malformed type is parsed, but not executed at runtime.
-  // Regression test for issue 16985.
-}
-
-test96(e) {
-  // Check that the remaining expression after the type test
-  // with malformed type is parsed, but not executed at runtime.
-  // Regression test for issue 16985.
-}
-
-test95(e) {
-  // Check that the type-tested expression is evaluated before the
-  // runtime error is thrown.
-}
-
-test94(e) {
-  // Check that the type-tested expression is evaluated before the
-  // runtime error is thrown.
-}
-
-main() {}
diff --git a/tests/language/label/label3_runtime_1_test.dart b/tests/language/label/label3_runtime_1_test.dart
deleted file mode 100644
index 6e05ee2..0000000
--- a/tests/language/label/label3_runtime_1_test.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-main() {
-  L:
-  while (false) {
-    if (true) break L;
-  }
-  // Illegal: L is out of scope.
-}
diff --git a/tests/language/label/label3_runtime_test.dart b/tests/language/label/label3_runtime_test.dart
deleted file mode 100644
index 401d018..0000000
--- a/tests/language/label/label3_runtime_test.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-main() {
-  L:
-  while (false) {}
-  // Illegal: L is out of scope.
-}
diff --git a/tests/language/label/label5_runtime_test.dart b/tests/language/label/label5_runtime_test.dart
deleted file mode 100644
index 29945c0..0000000
--- a/tests/language/label/label5_runtime_test.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-main() {
-  var L = 33;
-  while (false) {
-    // Illegal: L is not a label.
-  }
-}
diff --git a/tests/language/label/label6_runtime_1_test.dart b/tests/language/label/label6_runtime_1_test.dart
deleted file mode 100644
index 6a6d1ac..0000000
--- a/tests/language/label/label6_runtime_1_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-main() {
-  L:
-  while (false) {
-    break;
-
-    void innerfunc() {
-      // Illegal: jump target is outside of function
-    }
-
-    innerfunc();
-  }
-}
diff --git a/tests/language/label/label6_runtime_2_test.dart b/tests/language/label/label6_runtime_2_test.dart
deleted file mode 100644
index e03bc21..0000000
--- a/tests/language/label/label6_runtime_2_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-main() {
-  L:
-  while (false) {
-    break L;
-    void innerfunc() {
-      // Illegal: jump target is outside of function
-    }
-
-    innerfunc();
-  }
-}
diff --git a/tests/language/label/label6_runtime_test.dart b/tests/language/label/label6_runtime_test.dart
deleted file mode 100644
index bc10408..0000000
--- a/tests/language/label/label6_runtime_test.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-main() {
-  L:
-  while (false) {
-    void innerfunc() {
-      // Illegal: jump target is outside of function
-    }
-
-    innerfunc();
-  }
-}
diff --git a/tests/language/label/label8_runtime_test.dart b/tests/language/label/label8_runtime_test.dart
deleted file mode 100644
index f068887..0000000
--- a/tests/language/label/label8_runtime_test.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-main() {
-  int i = 0;
-  // Grammar doesn't allow label on block for switch statement.
-  switch (i) {
-    case 111:
-      while (false) {}
-      i++;
-  }
-}
diff --git a/tests/language/least_upper_bound/expansive_runtime_test.dart b/tests/language/least_upper_bound/expansive_runtime_test.dart
deleted file mode 100644
index 8338bdd..0000000
--- a/tests/language/least_upper_bound/expansive_runtime_test.dart
+++ /dev/null
@@ -1,102 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class N<T> {
-  T get n => throw "uncalled";
-}
-
-class C1<T> extends N<N<C1<T>>> {
-  T get c1 => throw "uncalled";
-}
-
-class C2<T> extends N<N<C2<N<C2<T>>>>> {
-  T get c2 => throw "uncalled";
-}
-
-/**
- * Test that we don't try to find the least upper bound by applying the
- * algorithm for finding the most specific common declaration recursively on
- * type arguments.
- *
- * For C1<int> and N<C1<String>> this would result in this infinite chain of
- * computations:
- *
- * lub(C1<int>, N<C1<String>>) = lub(N<N<C1<int>>>, N<C1<String>>)
- * =>
- * lub(N<C1<int>>, C1<String>) = lub(N<C1<int>>, N<N<C1<String>>>)
- * =>
- * lub(C1<int>, N<C1<String>>) = lub(N<N<C1<int>>>, N<C1<String>>>)
- * => ...
- */
-void testC1(bool z, C1<int> a, N<C1<String>> b) {
-  if (z) {
-    // The least upper bound of C1<int> and N<C1<String>> is Object since the
-    // supertypes are
-    //     {C1<int>, N<N<C1<int>>>, Object} for C1<int> and
-    //     {N<C1<String>>, Object} for N<C1<String>> and
-    // Object is the most specific type in the intersection of the supertypes.
-
-    // Is least upper bound dynamic?
-
-    // Is least upper bound N<...> ?
-
-    // Is least upper bound C1<...> ?
-
-    // Is least upper bound N<dynamic> ?
-
-    // Is least upper bound N<N<...>> ?
-
-    // Is least upper bound N<C1<...>> ?
-  }
-}
-
-/**
- * Test that we don't try to find the least upper bound by applying the
- * algorithm for finding the most specific common declaration recursively on
- * type arguments.
- *
- * For C1<int> and N<C1<String>> this would result in this infinite and
- * expanding chain of computations:
- *
- * lub(C2<int>, N<C2<String>>) = lub(N<N<C2<N<C2<int>>>>>, N<C2<String>>)
- * =>
- * lub(N<C2<N<C2<int>>>>, C2<String>) =
- *                               lub(N<C2<N<C2<int>>>>, N<N<C2<N<C2<String>>>>>)
- * =>
- * lub(C2<N<C2<int>>>, N<C2<N<C2<String>>>>) =
- *                              lub(N<N<C2<N<C2<int>>>>>, N<C2<N<C2<String>>>>>)
- * => ...
- */
-
-void testC2(bool z, C2<int> a, N<C2<String>> b) {
-  if (z) {
-    // The least upper bound of C2<int> and N<C2<String>> is Object since the
-    // supertypes are
-    //     {C2<int>, N<N<C2<N<C2<int>>>>>, Object} for C1<int> and
-    //     {N<C2<String>>, Object} for N<C1<String>> and
-    // Object is the most specific type in the intersection of the supertypes.
-
-    // Is least upper bound dynamic?
-
-    // Is least upper bound N<...> ?
-
-    // Is least upper bound C2<...> ?
-
-    // Is least upper bound N<dynamic> ?
-
-    // Is least upper bound N<N<...>> ?
-
-    // Is least upper bound N<C2<...>> ?
-  }
-}
-
-void main() {
-  testC1(false, C1<int>(), N<C1<String>>());
-  testC2(false, C2<int>(), N<C2<String>>());
-}
diff --git a/tests/language/least_upper_bound/runtime_10_test.dart b/tests/language/least_upper_bound/runtime_10_test.dart
deleted file mode 100644
index 9d48715..0000000
--- a/tests/language/least_upper_bound/runtime_10_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-
-  (true ? c : a).b = 0;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_11_test.dart b/tests/language/least_upper_bound/runtime_11_test.dart
deleted file mode 100644
index 39aa269..0000000
--- a/tests/language/least_upper_bound/runtime_11_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-
-  (false ? a : c).c = 0;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_14_test.dart b/tests/language/least_upper_bound/runtime_14_test.dart
deleted file mode 100644
index 5b1cfb0..0000000
--- a/tests/language/least_upper_bound/runtime_14_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-}
-
-void testCD(C c, D d) {
-  (true ? c : d).b = 0;
-}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_15_test.dart b/tests/language/least_upper_bound/runtime_15_test.dart
deleted file mode 100644
index 7976cde..0000000
--- a/tests/language/least_upper_bound/runtime_15_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-}
-
-void testCD(C c, D d) {
-  (false ? c : d).b = 0;
-}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_16_test.dart b/tests/language/least_upper_bound/runtime_16_test.dart
deleted file mode 100644
index 6bfd772..0000000
--- a/tests/language/least_upper_bound/runtime_16_test.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-  E<B> r1 = true ? e : f;
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_18_test.dart b/tests/language/least_upper_bound/runtime_18_test.dart
deleted file mode 100644
index fef8816..0000000
--- a/tests/language/least_upper_bound/runtime_18_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-
-  (true ? e : f).e = C();
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_19_test.dart b/tests/language/least_upper_bound/runtime_19_test.dart
deleted file mode 100644
index afc876a..0000000
--- a/tests/language/least_upper_bound/runtime_19_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-
-  (false ? e : f).e = C();
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_20_test.dart b/tests/language/least_upper_bound/runtime_20_test.dart
deleted file mode 100644
index d68fc97..0000000
--- a/tests/language/least_upper_bound/runtime_20_test.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-  E<B> r1 = true ? e : f;
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_22_test.dart b/tests/language/least_upper_bound/runtime_22_test.dart
deleted file mode 100644
index 6d662ec..0000000
--- a/tests/language/least_upper_bound/runtime_22_test.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-  r5 = (true ? e : f).e;
-}
diff --git a/tests/language/least_upper_bound/runtime_3_test.dart b/tests/language/least_upper_bound/runtime_3_test.dart
deleted file mode 100644
index 5f65a4a..0000000
--- a/tests/language/least_upper_bound/runtime_3_test.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-  (true ? a as dynamic : c).a = 0;
-}
-
-void testBC(B b, C c) {
-  var a = null;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_4_test.dart b/tests/language/least_upper_bound/runtime_4_test.dart
deleted file mode 100644
index 7846a2b..0000000
--- a/tests/language/least_upper_bound/runtime_4_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-
-  (false ? c : b).b = 0;
-}
-
-void testBC(B b, C c) {
-  var a = null;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_5_test.dart b/tests/language/least_upper_bound/runtime_5_test.dart
deleted file mode 100644
index 328f5ee..0000000
--- a/tests/language/least_upper_bound/runtime_5_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  B r1 = true ? b : c;
-
-  var a = null;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_7_test.dart b/tests/language/least_upper_bound/runtime_7_test.dart
deleted file mode 100644
index 45d1193..0000000
--- a/tests/language/least_upper_bound/runtime_7_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  (true ? b : c).b = 0;
-
-  var a = null;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_8_test.dart b/tests/language/least_upper_bound/runtime_8_test.dart
deleted file mode 100644
index c26fb59..0000000
--- a/tests/language/least_upper_bound/runtime_8_test.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-  (true ? b : a).b = 0;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_9_test.dart b/tests/language/least_upper_bound/runtime_9_test.dart
deleted file mode 100644
index 41db9bc..0000000
--- a/tests/language/least_upper_bound/runtime_9_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-
-class A {
-  var a;
-}
-
-class B {
-  var b;
-}
-
-class C extends B {
-  var c;
-}
-
-class D extends B {
-  var d;
-}
-
-class E<T> {
-  T e;
-
-  E(this.e);
-}
-
-class F<T> extends E<T> {
-  T f;
-
-  F(T f) : this.f = f, super(f);
-}
-
-void main() {
-  testAB(new A(), new B());
-  testBC(new C(), new C());
-  testCD(new C(), new D());
-  testEE(new F<C>(new C()), new F<C>(new C()));
-  testEF(new F<C>(new C()), new F<C>(new C()));
-}
-
-void testAB(A a, B b) {
-  var c = new C();
-}
-
-void testBC(B b, C c) {
-  var a = null;
-
-  (false ? a : b).c = 0;
-}
-
-void testCD(C c, D d) {}
-
-void testEE(E<B> e, E<C> f) {
-  // The least upper bound of E<B> and E<C> is E<B>.
-}
-
-void testEF(E<B> e, F<C> f) {
-  // The least upper bound of E<B> and F<C> is E<B>.
-
-  var r5;
-}
diff --git a/tests/language/least_upper_bound/runtime_test.dart b/tests/language/least_upper_bound/runtime_test.dart
deleted file mode 100644
index b4e77e2..0000000
--- a/tests/language/least_upper_bound/runtime_test.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test least upper bound through type checking of conditionals.
-import 'package:expect/expect.dart';
-
-class A {}
-
-class B {}
-
-class C extends B {}
-
-class D extends B {}
-
-class E<T> {}
-
-class F<T> extends E<T> {}
-
-void main() {
-  checkType(true ? A() : B())<Object>();
-  checkType(true ? B() : C())<B>();
-  checkType(true ? C() : D())<B>();
-  checkType(true ? E<B>() : E<C>())<E<B>>();
-  checkType(true ? E<B>() : F<C>())<E<B>>();
-}
-
-/// Tests that [A] (which should be inferred from the expression for [actual]
-/// is the same as [E].
-void Function<E>() checkType<A>(A actual) {
-  return <E>() {
-    Expect.isTrue(
-      <E>[] is List<A> && <A>[] is List<E>,
-      "Argument expression should have inferred type '$E' but was '$A'.",
-    );
-  };
-}
diff --git a/tests/language/list/literal1_runtime_test.dart b/tests/language/list/literal1_runtime_test.dart
deleted file mode 100644
index 90fb631..0000000
--- a/tests/language/list/literal1_runtime_test.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// A type mismatch in a list literal is a compile-time error
-
-main() {
-  var m = const [0, 1];
-}
diff --git a/tests/language/loop/break_outside_loop_runtime_test.dart b/tests/language/loop/break_outside_loop_runtime_test.dart
deleted file mode 100644
index 8f7db08..0000000
--- a/tests/language/loop/break_outside_loop_runtime_test.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-// Dart test program to test check that we catch label errors.
-
-main() {
-  if (true) {}
-}
diff --git a/tests/language/loop/for_runtime_test.dart b/tests/language/loop/for_runtime_test.dart
deleted file mode 100644
index 21abffe..0000000
--- a/tests/language/loop/for_runtime_test.dart
+++ /dev/null
@@ -1,92 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test program for testing for statement.
-
-import "package:expect/expect.dart";
-
-class Helper {
-  static int f1() {
-    for (;;) return 1;
-  }
-
-  static int f2(var n) {
-    int i = 0;
-    for (; i < n; i++) ;
-    return i;
-  }
-
-  static int f3(int n) {
-    int i = 0;
-    for (int j = 0; j < n; j++) i = i + j + 1;
-    return i;
-  }
-
-  static int f4(n) {
-    int i = 0;
-    for (bool stop = false; (i < n) && !stop; i++) {
-      if (i >= 5) {
-        stop = true;
-      }
-    }
-    return i;
-  }
-
-  static var status;
-  static void f5() {
-    status = 0;
-    for (var stop = false; ;) {
-      if (stop) {
-        break;
-      } else {
-        stop = true;
-        continue;
-      }
-    }
-    status = 1;
-  }
-
-  static int f6() {
-    // Verify that side effects in the condition are visible after the loop.
-    int i = 0;
-    for (; ++i < 3;) {}
-    return i;
-  }
-}
-
-class ForTest {
-  static testMain() {
-    Expect.equals(1, Helper.f1());
-    Expect.equals(0, Helper.f2(-1));
-    Expect.equals(0, Helper.f2(0));
-    Expect.equals(10, Helper.f2(10));
-    Expect.equals(0, Helper.f3(-1));
-    Expect.equals(0, Helper.f3(0));
-    Expect.equals(1, Helper.f3(1));
-    Expect.equals(3, Helper.f3(2));
-    Expect.equals(6, Helper.f3(3));
-    Expect.equals(10, Helper.f3(4));
-    Expect.equals(0, Helper.f4(-1));
-    Expect.equals(0, Helper.f4(0));
-    Expect.equals(1, Helper.f4(1));
-    Expect.equals(6, Helper.f4(6));
-    Expect.equals(6, Helper.f4(10));
-
-    Helper.f5();
-    Expect.equals(1, Helper.status);
-
-    Expect.equals(3, Helper.f6());
-  }
-}
-
-main() {
-  ForTest.testMain();
-  testShadowLocal();
-}
-
-void testShadowLocal() {
-  List<int> x = [1, 2, 3];
-}
diff --git a/tests/language/malbounded/instantiation_runtime_test.dart b/tests/language/malbounded/instantiation_runtime_test.dart
deleted file mode 100644
index a0b24b3..0000000
--- a/tests/language/malbounded/instantiation_runtime_test.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class Super<T extends num> {}
-
-main() {}
diff --git a/tests/language/malbounded/type_cast_runtime_test.dart b/tests/language/malbounded/type_cast_runtime_test.dart
deleted file mode 100644
index 4c77cb4..0000000
--- a/tests/language/malbounded/type_cast_runtime_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:expect/expect.dart';
-
-class Super<T extends num> {}
-
-class Malbounded1 implements Super {}
-
-class Malbounded2 extends Super {}
-
-main() {
-  var m = new Malbounded1();
-  Expect.throwsTypeError(() => m as Super<int>);
-  var s = new Super<int>();
-  Expect.throwsTypeError(() => s as Malbounded1);
-  Expect.throwsTypeError(() => s as Malbounded2);
-  s as Super;
-}
diff --git a/tests/language/malbounded/type_literal_runtime_test.dart b/tests/language/malbounded/type_literal_runtime_test.dart
deleted file mode 100644
index 5d45c01..0000000
--- a/tests/language/malbounded/type_literal_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:expect/expect.dart';
-
-class Super<T extends num> {}
-
-class Malbounded extends Super {}
-
-main() {
-  Type t = Malbounded;
-  Expect.isNotNull(t);
-  Expect.isTrue(t is Type);
-}
diff --git a/tests/language/malbounded/type_test2_runtime_test.dart b/tests/language/malbounded/type_test2_runtime_test.dart
deleted file mode 100644
index 84e028b..0000000
--- a/tests/language/malbounded/type_test2_runtime_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class A<T extends num> {}
-
-class B<T> {
-  test() {
-    new A() is A;
-  }
-}
-
-main() {
-  var b = new B<String>();
-  b.test();
-}
diff --git a/tests/language/malbounded/type_test_runtime_test.dart b/tests/language/malbounded/type_test_runtime_test.dart
deleted file mode 100644
index b8f26c7..0000000
--- a/tests/language/malbounded/type_test_runtime_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:expect/expect.dart';
-
-class Super<T extends num> {}
-
-class Malbounded1 implements Super {}
-
-class Malbounded2 extends Super {}
-
-main() {
-  var m = new Malbounded1();
-  Expect.isFalse(m is Super<int>);
-  var s = new Super<int>();
-  Expect.isFalse(s is Malbounded1);
-  Expect.isFalse(s is Malbounded2);
-  Expect.isTrue(s is Super);
-}
diff --git a/tests/language/malformed/inheritance_runtime_test.dart b/tests/language/malformed/inheritance_runtime_test.dart
deleted file mode 100644
index bfb5e51..0000000
--- a/tests/language/malformed/inheritance_runtime_test.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Tests that malformed types used in extends, implements, and with clauses
-// cause compile-time errors.
-
-class A<T> {}
-
-class C {}
-
-class C1 {}
-
-class C2 {}
-
-class C3 {}
-
-class C4 {}
-
-class C5 {}
-
-class C6<A> {}
-
-class C7<A> {}
-
-class C8<A> {}
-
-class C9<A> {}
-
-class C10<A> {}
-
-class C11<A> {}
-
-void main() {
-  new C();
-  new C1();
-  new C2();
-  new C3();
-  new C4();
-  new C5();
-  new C6<Object>();
-  new C7<Object>();
-  new C8<Object>();
-  new C9<Object>();
-  new C10<Object>();
-  new C11<Object>();
-}
diff --git a/tests/language/malformed/runtime_test.dart b/tests/language/malformed/runtime_test.dart
deleted file mode 100644
index 4757466..0000000
--- a/tests/language/malformed/runtime_test.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:expect/expect.dart';
-import 'package:expect/expect.dart' as prefix; // Define 'prefix'.
-
-checkIsUnresolved(var v) {}
-
-checkIsListUnresolved(var v) {}
-
-checkAsUnresolved(var v) {}
-
-checkAsListUnresolved(var v) {}
-
-void main() {
-  checkIsUnresolved('');
-  checkAsUnresolved('');
-  checkIsListUnresolved([]);
-  checkAsListUnresolved([]);
-
-  try {
-    throw 'foo';
-  } catch (e) {}
-
-  try {
-    throw 'foo';
-  } catch (e) {}
-
-  try {
-    throw 'foo';
-  } catch (e) {}
-
-  try {
-    throw 'foo';
-  } catch (e) {}
-
-  try {
-    throw 'foo';
-  } catch (e) {}
-}
diff --git a/tests/language/map/literal1_runtime_test.dart b/tests/language/map/literal1_runtime_test.dart
deleted file mode 100644
index 13532c5..0000000
--- a/tests/language/map/literal1_runtime_test.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// A type mismatch in a constant map literal is a compile-time error.
-
-main() {
-  var m = const {"a": 0};
-}
diff --git a/tests/language/method/not_found_runtime_test.dart b/tests/language/method/not_found_runtime_test.dart
deleted file mode 100644
index 58e1c66..0000000
--- a/tests/language/method/not_found_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class A {
-  static const field = const B();
-}
-
-class B {
-  const B();
-}
-
-main() {
-  print(A.field);
-}
diff --git a/tests/language/method/override3_runtime_test.dart b/tests/language/method/override3_runtime_test.dart
deleted file mode 100644
index 048f5b6..0000000
--- a/tests/language/method/override3_runtime_test.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:expect/expect.dart';
-
-class A {
-  foo(required1, {named1 = 499}) => -(required1 + named1 * 3);
-  bar(required1, required2, {named1 = 13, named2 = 17}) =>
-      -(required1 + required2 * 3 + named1 * 5 + named2 * 7);
-  gee({named1 = 31}) => -named1;
-}
-
-class B extends A {
-  foo(required1, {named1 = 499}) {
-    return required1;
-  }
-
-  bar(required1, required2, {named1 = 13, named2 = 17}) {
-    return required1 + required2 * 3 + named1 * 5;
-  }
-
-  gee({named2 = 11, named1 = 31}) {
-    return named2 * 99;
-  }
-}
-
-main() {
-  // Ensure that compile-time errors are reached.
-  var b = new B();
-  b.foo(499);
-  b.bar(1, 3, named1: 5);
-  b.gee(named2: 3);
-}
diff --git a/tests/language/mixin/cyclic_runtime_test.dart b/tests/language/mixin/cyclic_runtime_test.dart
deleted file mode 100644
index 6afb24e..0000000
--- a/tests/language/mixin/cyclic_runtime_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test for cyclicity check on named mixin applications.
-
-class A<T> {}
-
-class S {}
-
-mixin M<T> {}
-
-class C1 = S with M;
-
-class C3 = S with M implements A;
-
-void main() {
-  new C1();
-
-  new C3();
-}
diff --git a/tests/language/mixin/illegal_constructor_runtime_test.dart b/tests/language/mixin/illegal_constructor_runtime_test.dart
deleted file mode 100644
index 8b5162d..0000000
--- a/tests/language/mixin/illegal_constructor_runtime_test.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-mixin class M0 {
-  factory M0(a, b, c) => throw "uncalled";
-  factory M0.named() => throw "uncalled";
-}
-
-class M1 {
-  M1();
-}
-
-class M2 {
-  M2.named();
-}
-
-class C0 = Object with M0;
-
-class D0 extends Object with M0 {}
-
-main() {
-  new C0();
-
-  new D0();
-}
diff --git a/tests/language/mixin/illegal_static_access_runtime_test.dart b/tests/language/mixin/illegal_static_access_runtime_test.dart
deleted file mode 100644
index c170e56..0000000
--- a/tests/language/mixin/illegal_static_access_runtime_test.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class S {
-  static foo() => 42;
-}
-
-mixin M {
-  static bar() => 87;
-}
-
-class C = S with M;
-
-main() {
-  Expect.equals(42, S.foo());
-  Expect.equals(87, M.bar());
-}
diff --git a/tests/language/mixin/illegal_super_use_runtime_test.dart b/tests/language/mixin/illegal_super_use_runtime_test.dart
deleted file mode 100644
index 9aa00c8..0000000
--- a/tests/language/mixin/illegal_super_use_runtime_test.dart
+++ /dev/null
@@ -1,59 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-mixin M {}
-
-mixin P0 {
-  foo() {
-    void inner() {}
-    inner();
-
-    (() {})();
-
-    return 42;
-  }
-}
-
-mixin class P1 {
-  bar() {
-    return 87;
-  }
-
-  // The test method is strategically placed here to try to force the
-  // P1 class and its bar method to be resolved before resolving the
-  // mixin applications.
-  test() {
-    new C();
-    var d = new D();
-    var e = new E();
-    var f = new F();
-    Expect.equals(42, d.foo());
-    Expect.equals(87, e.bar());
-    Expect.equals(99, f.baz());
-  }
-}
-
-mixin class P2 {
-  baz() {
-    return 99;
-  }
-}
-
-class C = Object with M;
-class D = Object with P0;
-class E = Object with M, P1;
-class F = Object with P2, M;
-
-main() {
-  var p1 = new P1();
-  var p2 = new P2();
-  Expect.equals(87, p1.bar());
-  p1.test();
-  Expect.equals(99, p2.baz());
-}
diff --git a/tests/language/mixin/illegal_superclass_runtime_test.dart b/tests/language/mixin/illegal_superclass_runtime_test.dart
deleted file mode 100644
index 413e9bb..0000000
--- a/tests/language/mixin/illegal_superclass_runtime_test.dart
+++ /dev/null
@@ -1,83 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-class S0 {}
-
-class S1 extends Object {}
-
-class S2 extends S0 {}
-
-mixin class M0 {}
-
-mixin class M1 extends Object {}
-
-class M2 extends M0 {}
-
-class C00 = S0 with M0;
-class C01 = S0 with M1;
-
-class C03 = S0 with M0, M1;
-
-class C10 = S1 with M0;
-class C11 = S1 with M1;
-
-class C13 = S1 with M0, M1;
-
-class C20 = S2 with M0;
-class C21 = S2 with M1;
-
-class C23 = S2 with M0, M1;
-
-class D00 extends S0 with M0 {}
-
-class D01 extends S0 with M1 {}
-
-class D03 extends S0 with M0, M1 {}
-
-class D10 extends S1 with M0 {}
-
-class D11 extends S1 with M1 {}
-
-class D13 extends S1 with M0, M1 {}
-
-class D20 extends S2 with M0 {}
-
-class D21 extends S2 with M1 {}
-
-class D23 extends S2 with M0, M1 {}
-
-main() {
-  new C00();
-  new C01();
-
-  new C03();
-
-  new C10();
-  new C11();
-
-  new C13();
-
-  new C20();
-  new C21();
-
-  new C23();
-
-  new D00();
-  new D01();
-
-  new D03();
-
-  new D10();
-  new D11();
-
-  new D13();
-
-  new D20();
-  new D21();
-
-  new D23();
-}
diff --git a/tests/language/mixin/interface_check_runtime_test.dart b/tests/language/mixin/interface_check_runtime_test.dart
deleted file mode 100644
index 79b0a4e..0000000
--- a/tests/language/mixin/interface_check_runtime_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-class Thing {}
-
-class SubThing extends Thing {
-  void sub() {}
-}
-
-class A {
-  Thing get thing => new Thing();
-}
-
-abstract class B implements A {
-  @override
-  SubThing get thing;
-}
-
-class C extends A {}
-
-main() {
-  new C().thing;
-}
diff --git a/tests/language/mixin_legacy/cyclic_runtime_test.dart b/tests/language/mixin_legacy/cyclic_runtime_test.dart
deleted file mode 100644
index 310c824..0000000
--- a/tests/language/mixin_legacy/cyclic_runtime_test.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// @dart=2.19
-
-// Test for cyclicity check on named mixin applications.
-
-class A<T> {}
-
-class S {}
-
-class M<T> {}
-
-class C1 = S with M;
-
-class C3 = S with M implements A;
-
-void main() {
-  new C1();
-
-  new C3();
-}
diff --git a/tests/language/mixin_legacy/illegal_constructor_runtime_test.dart b/tests/language/mixin_legacy/illegal_constructor_runtime_test.dart
deleted file mode 100644
index 688d1a4..0000000
--- a/tests/language/mixin_legacy/illegal_constructor_runtime_test.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// @dart=2.19
-
-class M0 {
-  factory M0(a, b, c) => throw "uncalled";
-  factory M0.named() => throw "uncalled";
-}
-
-class M1 {
-  M1();
-}
-
-class M2 {
-  M2.named();
-}
-
-class C0 = Object with M0;
-
-class D0 extends Object with M0 {}
-
-main() {
-  new C0();
-
-  new D0();
-}
diff --git a/tests/language/mixin_legacy/illegal_static_access_runtime_test.dart b/tests/language/mixin_legacy/illegal_static_access_runtime_test.dart
deleted file mode 100644
index 8f92f28..0000000
--- a/tests/language/mixin_legacy/illegal_static_access_runtime_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// @dart=2.19
-
-import "package:expect/expect.dart";
-
-class S {
-  static foo() => 42;
-}
-
-class M {
-  static bar() => 87;
-}
-
-class C = S with M;
-
-main() {
-  Expect.equals(42, S.foo());
-  Expect.equals(87, M.bar());
-}
diff --git a/tests/language/mixin_legacy/illegal_super_use_runtime_test.dart b/tests/language/mixin_legacy/illegal_super_use_runtime_test.dart
deleted file mode 100644
index 9af3bf3..0000000
--- a/tests/language/mixin_legacy/illegal_super_use_runtime_test.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// @dart=2.19
-
-import "package:expect/expect.dart";
-
-class M {}
-
-class P0 {
-  foo() {
-    void inner() {}
-    inner();
-
-    (() {})();
-
-    return 42;
-  }
-}
-
-class P1 {
-  bar() {
-    return 87;
-  }
-
-  // The test method is strategically placed here to try to force the
-  // P1 class and its bar method to be resolved before resolving the
-  // mixin applications.
-  test() {
-    new C();
-    var d = new D();
-    var e = new E();
-    var f = new F();
-    Expect.equals(42, d.foo());
-    Expect.equals(87, e.bar());
-    Expect.equals(99, f.baz());
-  }
-}
-
-class P2 {
-  baz() {
-    return 99;
-  }
-}
-
-class C = Object with M;
-class D = Object with P0;
-class E = Object with M, P1;
-class F = Object with P2, M;
-
-main() {
-  var p1 = new P1();
-  var p2 = new P2();
-  Expect.equals(87, p1.bar());
-  p1.test();
-  Expect.equals(99, p2.baz());
-}
diff --git a/tests/language/mixin_legacy/illegal_superclass_runtime_test.dart b/tests/language/mixin_legacy/illegal_superclass_runtime_test.dart
deleted file mode 100644
index 11b0bce..0000000
--- a/tests/language/mixin_legacy/illegal_superclass_runtime_test.dart
+++ /dev/null
@@ -1,85 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// @dart=2.19
-
-class S0 {}
-
-class S1 extends Object {}
-
-class S2 extends S0 {}
-
-class M0 {}
-
-class M1 extends Object {}
-
-class M2 extends M0 {}
-
-class C00 = S0 with M0;
-class C01 = S0 with M1;
-
-class C03 = S0 with M0, M1;
-
-class C10 = S1 with M0;
-class C11 = S1 with M1;
-
-class C13 = S1 with M0, M1;
-
-class C20 = S2 with M0;
-class C21 = S2 with M1;
-
-class C23 = S2 with M0, M1;
-
-class D00 extends S0 with M0 {}
-
-class D01 extends S0 with M1 {}
-
-class D03 extends S0 with M0, M1 {}
-
-class D10 extends S1 with M0 {}
-
-class D11 extends S1 with M1 {}
-
-class D13 extends S1 with M0, M1 {}
-
-class D20 extends S2 with M0 {}
-
-class D21 extends S2 with M1 {}
-
-class D23 extends S2 with M0, M1 {}
-
-main() {
-  new C00();
-  new C01();
-
-  new C03();
-
-  new C10();
-  new C11();
-
-  new C13();
-
-  new C20();
-  new C21();
-
-  new C23();
-
-  new D00();
-  new D01();
-
-  new D03();
-
-  new D10();
-  new D11();
-
-  new D13();
-
-  new D20();
-  new D21();
-
-  new D23();
-}
diff --git a/tests/language/mixin_legacy/interface_check_runtime_test.dart b/tests/language/mixin_legacy/interface_check_runtime_test.dart
deleted file mode 100644
index 4d4a19a..0000000
--- a/tests/language/mixin_legacy/interface_check_runtime_test.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// @dart=2.19
-
-class Thing {}
-
-class SubThing extends Thing {
-  void sub() {}
-}
-
-class A {
-  Thing get thing => new Thing();
-}
-
-abstract class B implements A {
-  @override
-  SubThing get thing;
-}
-
-class C extends A //
-
-{}
-
-main() {
-  new C().thing //
-
-      ;
-}
diff --git a/tests/language/mixin_legacy/invalid_override_in_mixin_runtime_test.dart b/tests/language/mixin_legacy/invalid_override_in_mixin_runtime_test.dart
deleted file mode 100644
index 4263428..0000000
--- a/tests/language/mixin_legacy/invalid_override_in_mixin_runtime_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// @dart=2.19
-
-import 'package:expect/expect.dart';
-
-class A {}
-
-class C extends Object with A {
-  test() {
-    print("Hello from test");
-  }
-}
-
-main() {
-  C c = new C();
-  c.test();
-  dynamic cc = c;
-  Expect.throwsNoSuchMethodError(() => cc.doesntExist());
-}
diff --git a/tests/language/mixin_legacy/method_override_runtime_test.dart b/tests/language/mixin_legacy/method_override_runtime_test.dart
deleted file mode 100644
index f365d07..0000000
--- a/tests/language/mixin_legacy/method_override_runtime_test.dart
+++ /dev/null
@@ -1,150 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// @dart=2.19
-
-// Signature conformance test.
-abstract class CII {
-  int id(int x);
-}
-
-class CSI {
-  String id(int x) => "$x";
-}
-
-class CIS {
-  int id(String x) => 0;
-}
-
-class CTT<T> {
-  T id(T x) => x;
-}
-
-// Wrong return type.
-
-// Wrong argument type.
-
-// Similar as the above but using an instantiated class instead.
-abstract class C5 = CII with CTT<int>;
-
-abstract class C6 extends CII with CTT<int> {}
-
-// Named parameters
-abstract class NIIx {
-  int? id({int? x}) => x;
-}
-
-class NIIxy {
-  int? id({int? x, int? y}) => y;
-}
-
-class NIIy {
-  int? id({int? y}) => y;
-}
-
-class NII {
-  int? id(int? x) => x;
-}
-
-// It's OK to introduce more named parameters.
-abstract class N1 = NIIx with NIIxy;
-
-abstract class N2 extends NIIx with NIIxy {}
-// It's NOT OK to rename named parameters.
-
-// It's NOT OK to drop named parameters.
-
-class NBABxy<A, B> {
-  B? id({A? x, B? y}) => y;
-}
-
-class NTTy<T> {
-  T? id({T? y}) => y;
-}
-
-class NTTx<T> {
-  T? id(T? x) => x;
-}
-
-// Same as above but with generic classes.
-abstract class N7 = NIIx with NBABxy<int, int>;
-
-abstract class N8 extends NIIx with NBABxy<int, int> {}
-
-// Optional positional parameters
-abstract class OII {
-  int? id([int? x]) => x;
-}
-
-class OIII {
-  int? id([int? x, int? y]) => y;
-}
-
-class OIIy {
-  int? id([int? y]) => y;
-}
-
-class PII {
-  int? id(int? x) => x;
-}
-
-// It's OK to introduce more optional parameters.
-abstract class O1 = OII with OIII;
-
-abstract class O2 extends OII with OIII {}
-
-// It's OK to rename optional parameters.
-abstract class O3 = OII with OIIy;
-
-abstract class O4 extends OII with OIIy {}
-// It's NOT OK to drop optional parameters.
-
-class OBAB<A, B> {
-  B? id([A? x, B? y]) => y;
-}
-
-class OTTy<T> {
-  T? id([T? y]) => y;
-}
-
-class PTT<T> {
-  T? id(T? x) => x;
-}
-
-// Same as above but with generic classes.
-abstract class O7 = OII with OBAB<int, int>;
-
-abstract class O8 extends OII with OBAB<int, int> {}
-
-abstract class O11 = OII with OTTy<int>;
-
-abstract class O12 extends OII with OTTy<int> {}
-
-// More tests with generic classes.
-abstract class GTTnum {
-  T id<T extends num>(x);
-}
-
-class MTTnum {
-  T id<T extends num>(x) => x;
-}
-
-class MTTint {
-  T id<T extends int>(x) => x;
-}
-
-class MTT {
-  T id<T>(x) => x;
-}
-
-class MTTnumR {
-  T id<T extends num, R>(x) => x;
-}
-
-class G1 = GTTnum with MTTnum;
-
-void main() {}
diff --git a/tests/language/new/create_unresolved_type_runtime_test.dart b/tests/language/new/create_unresolved_type_runtime_test.dart
deleted file mode 100644
index b072289..0000000
--- a/tests/language/new/create_unresolved_type_runtime_test.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-main() {}
diff --git a/tests/language/new/expression_type_args_runtime_test.dart b/tests/language/new/expression_type_args_runtime_test.dart
deleted file mode 100644
index 18737db..0000000
--- a/tests/language/new/expression_type_args_runtime_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Tests showing errors using type-arguments in new expressions:
-class A<T> {
-  // Can't instantiate type parameter (within static or instance method).
-
-  // OK when used within instance method, but not in static method.
-  m3() => new A<T>();
-}
-
-main() {
-  A a = new A();
-
-  a.m3();
-}
diff --git a/tests/language/null/checked_runtime_test.dart b/tests/language/null/checked_runtime_test.dart
deleted file mode 100644
index 699c4fd..0000000
--- a/tests/language/null/checked_runtime_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class A {
-  Map? a;
-  Comparator? b;
-  // This code exhibited a bug in dart2js, where the type of [a] was inferred to
-  // be [Comparator] or null;
-  A() : b = null, a = null;
-}
-
-main() {}
-
-bar() {
-  // We would create a typed selector for the call to foo, where the
-  // receiver type is a typedef. Some code in the dart2js backend were
-  // not dealing correctly with typedefs and lead the compiler to
-  // crash.
-}
diff --git a/tests/language/null_aware/access_runtime_test.dart b/tests/language/null_aware/access_runtime_test.dart
deleted file mode 100644
index 4149a30..0000000
--- a/tests/language/null_aware/access_runtime_test.dart
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ?. operator when it does not appear on the LHS of an
-// assignment.
-
-import "package:expect/expect.dart";
-import "conditional_access_helper.dart" as h;
-
-class B {}
-
-class C extends B {
-  int? v;
-  C(this.v);
-  static int? staticInt;
-}
-
-C? nullC() => null;
-
-main() {
-  // e1?.id is equivalent to ((x) => x == null ? null : x.id)(e1).
-  Expect.equals(null, nullC()?.v);
-
-  C? c = new C(1) as dynamic;
-  Expect.equals(1, c?.v);
-
-  // C?.id is equivalent to C.id.
-  C.staticInt = 1;
-  Expect.equals(1, C?.staticInt);
-  //                ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-
-  h.C.staticInt = 1;
-  Expect.equals(1, h.C?.staticInt);
-  //                  ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-
-  // The static type of e1?.id is the static type of e1.id.
-  {
-    int? i = c?.v;
-    Expect.equals(1, i);
-  }
-
-  {
-    C.staticInt = 1;
-    int? i = C?.staticInt;
-    //        ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(1, i);
-  }
-
-  {
-    h.C.staticInt = 1;
-    int? i = h.C?.staticInt;
-    //          ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(1, i);
-  }
-}
diff --git a/tests/language/null_aware/assignment_runtime_test.dart b/tests/language/null_aware/assignment_runtime_test.dart
deleted file mode 100644
index 2f82ee1..0000000
--- a/tests/language/null_aware/assignment_runtime_test.dart
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ?. operator when it appears on the LHS of an
-// assignment.
-
-import "package:expect/expect.dart";
-import "conditional_access_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-class B {}
-
-class C extends B {
-  num v;
-  C(this.v);
-  static late int staticInt;
-}
-
-class D {
-  E v;
-  D(this.v);
-  static late E staticE;
-}
-
-class E {
-  G operator +(int i) => new I();
-}
-
-class F {}
-
-class G extends E implements F {}
-
-class H {}
-
-class I extends G implements H {}
-
-C? nullC() => null;
-
-main() {
-  // e1?.v = e2 is equivalent to ((x) => x == null ? null : x.v = e2)(e1).
-  Expect.equals(null, nullC()?.v = bad());
-  {
-    C? c = new C(1) as dynamic;
-    Expect.equals(2, c?.v = 2);
-    Expect.equals(2, c!.v);
-  }
-
-  // C?.v = e2 is equivalent to C.v = e2.
-  C.staticInt = 1;
-  Expect.equals(2, C?.staticInt = 2);
-  //                ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-  Expect.equals(2, C.staticInt);
-
-  h.C.staticInt = 1;
-  Expect.equals(2, h.C?.staticInt = 2);
-  //                  ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-  Expect.equals(2, h.C.staticInt);
-
-  // The static type of e1?.v = e2 is the static type of e2.
-  {
-    D? d = new D(new E()) as dynamic;
-    G g = new G();
-    F? f = (d?.v = g);
-    Expect.identical(f, g);
-  }
-
-  {
-    D.staticE = new E();
-    G g = new G();
-    F? f = (D?.staticE = g);
-    //       ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.identical(f, g);
-  }
-
-  h.D.staticE = new h.E();
-  h.G g = new h.G();
-  h.F? f = (h.D?.staticE = g);
-  //           ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-  Expect.identical(f, g);
-
-  // Exactly the same errors that would be caused by e1.v = e2 are
-  // also generated in the case of e1?.v = e2.
-
-  // e1?.v op= e2 is equivalent to ((x) => x?.v = x.v op e2)(e1).
-  Expect.equals(null, nullC()?.v += bad());
-  {
-    C? c = new C(1) as dynamic;
-    Expect.equals(3, c?.v += 2);
-    Expect.equals(3, c!.v);
-  }
-
-  // C?.v op= e2 is equivalent to C.v op= e2.
-  C.staticInt = 1;
-  Expect.equals(3, C?.staticInt += 2);
-  //                ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-  Expect.equals(3, C?.staticInt);
-  //                ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-
-  // The static type of e1?.v op= e2 is the static type of e1.v op e2.
-  {
-    D? d = new D(new E()) as dynamic;
-    F? f = (d?.v += 1);
-    Expect.identical(d!.v, f);
-  }
-
-  {
-    D.staticE = new E();
-    F? f = (D?.staticE += 1);
-    //       ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.identical(D.staticE, f);
-  }
-
-  {
-    h.D.staticE = new h.E();
-    h.F? f = (h.D?.staticE += 1);
-    //           ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.identical(h.D.staticE, f);
-  }
-}
diff --git a/tests/language/null_aware/increment_decrement_runtime_test.dart b/tests/language/null_aware/increment_decrement_runtime_test.dart
deleted file mode 100644
index 2b30572..0000000
--- a/tests/language/null_aware/increment_decrement_runtime_test.dart
+++ /dev/null
@@ -1,234 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ?. operator when it appears in a postincrement or
-// preincrement expression (or a postdecrement or predecrement expression).
-
-import "package:expect/expect.dart";
-import "conditional_access_helper.dart" as h;
-
-class C {
-  int v;
-  C(this.v);
-  static late int staticInt;
-}
-
-class D {
-  E v;
-  D(this.v);
-  static late E staticE;
-}
-
-class E {
-  G operator +(int i) => new I();
-  G operator -(int i) => new I();
-}
-
-class F {}
-
-class G extends E implements F {}
-
-class H {}
-
-class I extends G implements H {}
-
-C? nullC() => null;
-
-main() {
-  // Make sure the "none" test fails if assignment to "?." is not implemented.
-  // This makes status files easier to maintain.
-  nullC()?.v = 1;
-
-  // e1?.v++ is equivalent to ((x) => x == null ? null : x.v++)(e1).
-  Expect.equals(null, nullC()?.v++);
-  {
-    C? c = new C(1) as dynamic;
-    Expect.equals(1, c?.v++);
-    Expect.equals(2, c!.v);
-  }
-
-  // C?.v++ is equivalent to C.v++.
-  {
-    C.staticInt = 1;
-    Expect.equals(1, C?.staticInt++);
-    //                ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(2, C.staticInt);
-  }
-  {
-    h.C.staticInt = 1;
-    Expect.equals(1, h.C?.staticInt++);
-    //                  ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(2, h.C.staticInt);
-  }
-
-  // The static type of e1?.v++ is the same as the static type of e1.v.
-  {
-    E e1 = new E();
-    D? d = new D(e1) as dynamic;
-    E? e2 = d?.v++;
-    Expect.identical(e1, e2);
-  }
-
-  {
-    E e1 = new E();
-    D.staticE = e1;
-    E? e2 = D?.staticE++;
-    //       ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.identical(e1, e2);
-  }
-  {
-    h.E e1 = new h.E();
-    h.D.staticE = e1;
-    h.E? e2 = h.D?.staticE++;
-    //           ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.identical(e1, e2);
-  }
-
-  // e1?.v-- is equivalent to ((x) => x == null ? null : x.v--)(e1).
-  Expect.equals(null, nullC()?.v--);
-  {
-    C? c = new C(1) as dynamic;
-    Expect.equals(1, c?.v--);
-    Expect.equals(0, c!.v);
-  }
-
-  // C?.v-- is equivalent to C.v--.
-  {
-    C.staticInt = 1;
-    Expect.equals(1, C?.staticInt--);
-    //                ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(0, C.staticInt);
-  }
-  {
-    h.C.staticInt = 1;
-    Expect.equals(1, h.C?.staticInt--);
-    //                  ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(0, h.C.staticInt);
-  }
-
-  // The static type of e1?.v-- is the same as the static type of e1.v.
-  {
-    E e1 = new E();
-    D? d = new D(e1) as dynamic;
-    E? e2 = d?.v--;
-    Expect.identical(e1, e2);
-  }
-
-  {
-    E e1 = new E();
-    D.staticE = e1;
-    E? e2 = D?.staticE--;
-    //       ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.identical(e1, e2);
-  }
-  {
-    h.E e1 = new h.E();
-    h.D.staticE = e1;
-    h.E? e2 = h.D?.staticE--;
-    //           ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.identical(e1, e2);
-  }
-
-  // ++e1?.v is equivalent to e1?.v += 1.
-  Expect.equals(null, ++nullC()?.v);
-  {
-    C? c = new C(1) as dynamic;
-    Expect.equals(2, ++c?.v);
-    Expect.equals(2, c!.v);
-  }
-
-  // ++C?.v is equivalent to C?.v += 1.
-  {
-    C.staticInt = 1;
-    Expect.equals(2, ++C?.staticInt);
-    //                  ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(2, C.staticInt);
-  }
-  {
-    h.C.staticInt = 1;
-    Expect.equals(2, ++h.C?.staticInt);
-    //                    ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(2, h.C.staticInt);
-  }
-
-  // The static type of ++e1?.v is the same as the static type of e1.v + 1.
-  {
-    D? d = new D(new E()) as dynamic;
-    F? f = ++d?.v;
-    Expect.identical(d!.v, f);
-  }
-
-  {
-    D? d = new D(new E()) as dynamic;
-    F? f = ++d?.v;
-    Expect.identical(d!.v, f);
-  }
-  {
-    h.D.staticE = new h.E();
-    h.F? f = ++h.D?.staticE;
-    //            ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.identical(h.D.staticE, f);
-  }
-
-  // --e1?.v is equivalent to e1?.v -= 1.
-  Expect.equals(null, --nullC()?.v);
-  {
-    C? c = new C(1) as dynamic;
-    Expect.equals(0, --c?.v);
-    Expect.equals(0, c!.v);
-  }
-
-  // --C?.v is equivalent to C?.v -= 1.
-  {
-    C.staticInt = 1;
-    Expect.equals(0, --C?.staticInt);
-    //                  ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(0, C.staticInt);
-  }
-  {
-    h.C.staticInt = 1;
-    Expect.equals(0, --h.C?.staticInt);
-    //                    ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(0, h.C.staticInt);
-  }
-
-  // The static type of --e1?.v is the same as the static type of e1.v - 1.
-  {
-    D? d = new D(new E()) as dynamic;
-    F? f = --d?.v;
-    Expect.identical(d!.v, f);
-  }
-
-  {
-    D.staticE = new E();
-    F? f = --D?.staticE;
-    //        ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.identical(D.staticE, f);
-  }
-
-  {
-    h.D.staticE = new h.E();
-    h.F? f = --h.D?.staticE;
-    //            ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.identical(h.D.staticE, f);
-  }
-}
diff --git a/tests/language/null_aware/invocation_runtime_test.dart b/tests/language/null_aware/invocation_runtime_test.dart
deleted file mode 100644
index 72d6942..0000000
--- a/tests/language/null_aware/invocation_runtime_test.dart
+++ /dev/null
@@ -1,63 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Verify semantics of the ?. operator when it is used to invoke a method.
-
-import "package:expect/expect.dart";
-import "conditional_access_helper.dart" as h;
-
-bad() {
-  Expect.fail('Should not be executed');
-}
-
-class B {}
-
-class C extends B {
-  f(callback()?) => callback!();
-  int g(int callback()) => callback();
-  static staticF(callback()) => callback();
-  static int staticG(int callback()) => callback();
-}
-
-C? nullC() => null;
-
-main() {
-  // o?.m(...) is equivalent to ((x) => x == null ? null : x.m(...))(o).
-  Expect.equals(null, nullC()?.f(bad()));
-  C? c = C() as dynamic;
-  Expect.equals(1, c?.f(() => 1));
-  // C?.m(...) is equivalent to C.m(...).
-  Expect.equals(1, C?.staticF(() => 1));
-  //                ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-  Expect.equals(1, h.C?.staticF(() => 1));
-  //                  ^^
-  // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-
-  // The static type of o?.m(...) is the same as the static type of
-  // o.m(...).
-  {
-    int? i = nullC()?.g(bad());
-    Expect.equals(null, i);
-  }
-  {
-    int? i = c?.g(() => 1);
-    Expect.equals(1, i);
-  }
-  {
-    int? i = C?.staticG(() => 1);
-    //        ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(1, i);
-  }
-  {
-    int? i = h.C?.staticG(() => 1);
-    //          ^^
-    // [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
-    Expect.equals(1, i);
-  }
-}
diff --git a/tests/language/number/identifier_runtime_test.dart b/tests/language/number/identifier_runtime_test.dart
deleted file mode 100644
index efabade..0000000
--- a/tests/language/number/identifier_runtime_test.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-main() {
-  // Integer literals.
-  Expect.isTrue(2 is int);
-  Expect.equals(2, 2 as int);
-  Expect.isTrue(-2 is int);
-  Expect.equals(-2, -2 as int);
-  Expect.isTrue(0x10 is int);
-  Expect.isTrue(-0x10 is int);
-
-  // Double literals.
-  Expect.isTrue(2.0 is double);
-  Expect.equals(2.0, 2.0 as double);
-  Expect.isTrue(-2.0 is double);
-  Expect.equals(-2.0, -2.0 as double);
-  Expect.isTrue(.2 is double);
-  Expect.equals(0.2, .2 as double);
-  Expect.isTrue(1e2 is double);
-  Expect.equals(1e2, 1e2 as double);
-  Expect.isTrue(1e-2 is double);
-  Expect.equals(1e-2, 1e-2 as double);
-  Expect.isTrue(1e+2 is double);
-  Expect.equals(1e+2, 1e+2 as double);
-
-  // `1.e`, etc. are parsed as a property / method access on int.
-  Expect.equals(3, 1.e + 2);
-  Expect.equals(3, 1.d + 2);
-  Expect.equals(3, 1.D + 2);
-  Expect.equals(3, 1._0e + 2);
-}
-
-extension on int {
-  int get e => this;
-  int get d => this;
-  int get D => this;
-
-  int get _0e => this;
-}
diff --git a/tests/language/number/int64_literal_runtime_10_test.dart b/tests/language/number/int64_literal_runtime_10_test.dart
deleted file mode 100644
index 8f7e0ee..0000000
--- a/tests/language/number/int64_literal_runtime_10_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  maxInt64Value = -0x8000000000000000 - 1;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_11_test.dart b/tests/language/number/int64_literal_runtime_11_test.dart
deleted file mode 100644
index 7945650..0000000
--- a/tests/language/number/int64_literal_runtime_11_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  maxInt64Value = -(0x8000000000000001);
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_1_test.dart b/tests/language/number/int64_literal_runtime_1_test.dart
deleted file mode 100644
index c5c0651..0000000
--- a/tests/language/number/int64_literal_runtime_1_test.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-  minInt64Value = -9223372036854775807 - 1;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_2_test.dart b/tests/language/number/int64_literal_runtime_2_test.dart
deleted file mode 100644
index dd92b85..0000000
--- a/tests/language/number/int64_literal_runtime_2_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  minInt64Value = -9223372036854775808;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_3_test.dart b/tests/language/number/int64_literal_runtime_3_test.dart
deleted file mode 100644
index 741f81e..0000000
--- a/tests/language/number/int64_literal_runtime_3_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  minInt64Value = -(0x8000000000000000);
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_4_test.dart b/tests/language/number/int64_literal_runtime_4_test.dart
deleted file mode 100644
index d7df159..0000000
--- a/tests/language/number/int64_literal_runtime_4_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  minInt64Value = 0x8000000000000000;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_5_test.dart b/tests/language/number/int64_literal_runtime_5_test.dart
deleted file mode 100644
index f08c9b2..0000000
--- a/tests/language/number/int64_literal_runtime_5_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  minInt64Value = -0x8000000000000000;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_6_test.dart b/tests/language/number/int64_literal_runtime_6_test.dart
deleted file mode 100644
index d2bda18..0000000
--- a/tests/language/number/int64_literal_runtime_6_test.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-  maxInt64Value = 9223372036854775807;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_7_test.dart b/tests/language/number/int64_literal_runtime_7_test.dart
deleted file mode 100644
index aae70fe..0000000
--- a/tests/language/number/int64_literal_runtime_7_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  maxInt64Value = 9223372036854775807;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_8_test.dart b/tests/language/number/int64_literal_runtime_8_test.dart
deleted file mode 100644
index 124026e..0000000
--- a/tests/language/number/int64_literal_runtime_8_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  maxInt64Value = -9223372036854775808 - 1;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_9_test.dart b/tests/language/number/int64_literal_runtime_9_test.dart
deleted file mode 100644
index b835c35..0000000
--- a/tests/language/number/int64_literal_runtime_9_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  maxInt64Value = 0x8000000000000000 - 1;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/number/int64_literal_runtime_test.dart b/tests/language/number/int64_literal_runtime_test.dart
deleted file mode 100644
index 4e9d5d4..0000000
--- a/tests/language/number/int64_literal_runtime_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-import 'package:expect/expect.dart';
-
-const String realMaxInt64Value = '9223372036854775807';
-const String realMinInt64Value = '-9223372036854775808';
-
-const int i21 = 2097152;
-
-main() {
-  int minInt64Value = -1 * i21 * i21 * i21;
-
-  Expect.equals('$minInt64Value', realMinInt64Value);
-  Expect.equals('${minInt64Value - 1}', realMaxInt64Value);
-
-  int maxInt64Value = 1 * i21 * i21 * i21 - 1;
-
-  Expect.equals('$maxInt64Value', realMaxInt64Value);
-  Expect.equals('${maxInt64Value + 1}', realMinInt64Value);
-}
diff --git a/tests/language/operator/invalid_assignment_to_postfix_increment_runtime_test.dart b/tests/language/operator/invalid_assignment_to_postfix_increment_runtime_test.dart
deleted file mode 100644
index 922df8f..0000000
--- a/tests/language/operator/invalid_assignment_to_postfix_increment_runtime_test.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// 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.
-
-void f(int x, int y) {}
-
-main() {
-  f(1, 2);
-}
diff --git a/tests/language/operator/unsupported_runtime_test.dart b/tests/language/operator/unsupported_runtime_test.dart
deleted file mode 100644
index 92ccbdb..0000000
--- a/tests/language/operator/unsupported_runtime_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// Test handling of unsupported operators.
-
-library unsupported_operators;
-
-class C {
-  m() {
-    print(null);
-    print(null);
-  }
-}
-
-void main() {
-  new C().m();
-  new C().m();
-  print(null);
-  print(null);
-}
diff --git a/tests/language/optimize/inferrer_constructor5_runtime_test.dart b/tests/language/optimize/inferrer_constructor5_runtime_test.dart
deleted file mode 100644
index ff8892c..0000000
--- a/tests/language/optimize/inferrer_constructor5_runtime_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-class A {
-  A() {}
-}
-
-class B extends A {
-  var field;
-  B() {
-    field = 42;
-  }
-}
-
-main() {}
diff --git a/tests/language/override/inheritance_abstract_runtime_1_test.dart b/tests/language/override/inheritance_abstract_runtime_1_test.dart
deleted file mode 100644
index 96cc8b2..0000000
--- a/tests/language/override/inheritance_abstract_runtime_1_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-abstract class A {
-  method1();
-}
-
-abstract class I {}
-
-abstract class J {}
-
-class Class extends A implements I, J {
-  method1() {}
-}
-
-main() {
-  new Class();
-}
diff --git a/tests/language/override/inheritance_abstract_runtime_2_test.dart b/tests/language/override/inheritance_abstract_runtime_2_test.dart
deleted file mode 100644
index 5da0e45..0000000
--- a/tests/language/override/inheritance_abstract_runtime_2_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-abstract class A {
-  method5();
-}
-
-abstract class I {}
-
-abstract class J {}
-
-class Class extends A implements I, J {
-  method5() {}
-}
-
-main() {
-  new Class();
-}
diff --git a/tests/language/override/inheritance_abstract_runtime_3_test.dart b/tests/language/override/inheritance_abstract_runtime_3_test.dart
deleted file mode 100644
index e736420..0000000
--- a/tests/language/override/inheritance_abstract_runtime_3_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-abstract class A {
-  method6();
-}
-
-abstract class I {}
-
-abstract class J {}
-
-class Class extends A implements I, J {
-  method6([a]) {}
-}
-
-main() {
-  new Class();
-}
diff --git a/tests/language/override/inheritance_abstract_runtime_4_test.dart b/tests/language/override/inheritance_abstract_runtime_4_test.dart
deleted file mode 100644
index ade2b01..0000000
--- a/tests/language/override/inheritance_abstract_runtime_4_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-abstract class A {
-  method18() {}
-}
-
-abstract class I {
-  method18() {}
-}
-
-abstract class J {}
-
-class Class extends A implements I, J {}
-
-main() {
-  new Class();
-}
diff --git a/tests/language/override/inheritance_abstract_runtime_5_test.dart b/tests/language/override/inheritance_abstract_runtime_5_test.dart
deleted file mode 100644
index e4397b2..0000000
--- a/tests/language/override/inheritance_abstract_runtime_5_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-abstract class A {
-  method27() {}
-}
-
-abstract class I {}
-
-abstract class J {}
-
-class Class extends A implements I, J {
-  method27();
-}
-
-main() {
-  new Class();
-}
diff --git a/tests/language/override/inheritance_abstract_runtime_6_test.dart b/tests/language/override/inheritance_abstract_runtime_6_test.dart
deleted file mode 100644
index 72de3b6..0000000
--- a/tests/language/override/inheritance_abstract_runtime_6_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-abstract class A {}
-
-abstract class I {
-  method15() {}
-}
-
-abstract class J {}
-
-class Class extends A implements I, J {
-  method15() {}
-}
-
-main() {
-  new Class();
-}
diff --git a/tests/language/override/inheritance_abstract_runtime_7_test.dart b/tests/language/override/inheritance_abstract_runtime_7_test.dart
deleted file mode 100644
index 1b1dd06..0000000
--- a/tests/language/override/inheritance_abstract_runtime_7_test.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-abstract class A {}
-
-abstract class I {
-  method16() {}
-}
-
-abstract class J {}
-
-class Class extends A implements I, J {
-  method16([a]) {}
-}
-
-main() {
-  new Class();
-}
diff --git a/tests/language/override/inheritance_abstract_runtime_test.dart b/tests/language/override/inheritance_abstract_runtime_test.dart
deleted file mode 100644
index 78bca16..0000000
--- a/tests/language/override/inheritance_abstract_runtime_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-abstract class A {}
-
-abstract class I {}
-
-abstract class J {}
-
-class Class extends A implements I, J {}
-
-main() {
-  new Class();
-}
diff --git a/tests/language/override/method_with_field_runtime_test.dart b/tests/language/override/method_with_field_runtime_test.dart
deleted file mode 100644
index 60b82fd..0000000
--- a/tests/language/override/method_with_field_runtime_test.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import "package:expect/expect.dart";
-
-// Test overriding a method with a field.
-
-class Super {
-  Super() : super();
-
-  instanceMethod() => 42;
-}
-
-class Sub extends Super {
-  Sub() : super();
-
-  superInstanceMethod() => super.instanceMethod();
-}
-
-main() {
-  var s = new Sub();
-  Super sup = s;
-  Sub sub = s;
-  print(s.instanceMethod);
-  Expect.equals(42, s.superInstanceMethod());
-
-  Expect.equals(42, sub.superInstanceMethod());
-}
diff --git a/tests/language/parameter/bad_named2_runtime_test.dart b/tests/language/parameter/bad_named2_runtime_test.dart
deleted file mode 100644
index be1ed23..0000000
--- a/tests/language/parameter/bad_named2_runtime_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test program for testing bad named parameters.
-
-class BadNamedParameters2Test {
-  int foo(int a) {
-    // Although no optional named parameters are declared, we must check that
-    // no named arguments are passed in, either here or in the resolving stub.
-    return a;
-  }
-}
-
-main() {
-  BadNamedParameters2Test np = new BadNamedParameters2Test();
-
-  // No formal parameter named b.
-}
diff --git a/tests/language/parameter/bad_named_runtime_test.dart b/tests/language/parameter/bad_named_runtime_test.dart
deleted file mode 100644
index e971498..0000000
--- a/tests/language/parameter/bad_named_runtime_test.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test program for testing bad named parameters.
-
-import "package:expect/expect.dart";
-
-class BadNamedParametersTest {
-  int f42(int a, {int b = 20, int c = 30}) {
-    return 100 * (100 * a + b) + c;
-  }
-
-  int f52(int a, {int b = 20, int? c, int d = 40}) {
-    return 100 * (100 * (100 * a + b) + (c == null ? 0 : c)) + d;
-  }
-}
-
-main() {
-  BadNamedParametersTest np = new BadNamedParametersTest();
-
-  // Parameter b passed twice.
-
-  // Parameter x does not exist.
-
-  // Parameter b1 does not exist.
-
-  // Too many parameters.
-
-  // Too few parameters.
-}
diff --git a/tests/language/parameter/named_aggregated_runtime_test.dart b/tests/language/parameter/named_aggregated_runtime_test.dart
deleted file mode 100644
index 0a7b7f2..0000000
--- a/tests/language/parameter/named_aggregated_runtime_test.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-// Dart test program for testing named parameters.
-
-class TypeTester<T> {}
-
-// Expect compile-time error as no default values are allowed
-// in closure type definitions.
-typedef void Callback([String msg]);
-
-class NamedParametersAggregatedTests {
-  static int F31(int a, {int b = 20, int c = 30}) {
-    return 100 * (100 * a + b) + c;
-  }
-
-  static int f_missing_comma(a) => a;
-
-  var _handler = null;
-
-  // Expect compile-time error as no default values
-  // are allowed in closure type.
-  void InstallCallback(void cb({String msg})?) {
-    _handler = cb;
-  }
-}
-
-main() {
-  // Expect compile-time error due to missing comma in function definition.
-  NamedParametersAggregatedTests.f_missing_comma(10);
-
-  // Expect compile-time error due to duplicate named argument.
-  NamedParametersAggregatedTests.F31(10, b: 25);
-
-  // Expect compile-time error due to missing positional argument.
-
-  new TypeTester<Callback>();
-
-  (new NamedParametersAggregatedTests()).InstallCallback(null);
-}
diff --git a/tests/language/parameter/named_default_eq_runtime_test.dart b/tests/language/parameter/named_default_eq_runtime_test.dart
index 2373555..fdf8b3c 100644
--- a/tests/language/parameter/named_default_eq_runtime_test.dart
+++ b/tests/language/parameter/named_default_eq_runtime_test.dart
@@ -1,6 +1,3 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
@@ -33,7 +30,7 @@
   int instanceF({x = 3, y = 5, z}) => x * y * (z ?? 2);
 }
 
-main() {
+void main() {
   // Reference the type, or dart2js won't see that the declaration is invalid
 
   var a = new A();
diff --git a/tests/language/parameter/named_runtime_test.dart b/tests/language/parameter/named_runtime_test.dart
index 8478a28..49bc228 100644
--- a/tests/language/parameter/named_runtime_test.dart
+++ b/tests/language/parameter/named_runtime_test.dart
@@ -1,6 +1,3 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
@@ -97,10 +94,10 @@
   }
 }
 
-hello(msg, to, {from}) => '${from} sent ${msg} to ${to}';
-message() => hello("gladiolas", "possums", from: "Edna");
+String hello(msg, to, {from}) => '${from} sent ${msg} to ${to}';
+String message() => hello("gladiolas", "possums", from: "Edna");
 
-main() {
+void main() {
   NamedParametersTest.testMain();
   var i = new I();
   Expect.equals(100, i.mul(10));
diff --git a/tests/language/parameter/named_type_runtime_test.dart b/tests/language/parameter/named_type_runtime_test.dart
deleted file mode 100644
index 37f6fe2..0000000
--- a/tests/language/parameter/named_type_runtime_test.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// Dart test program for testing optional named parameters in type tests.
-
-main() {
-  Function anyFunction;
-  void acceptFunNumOptBool(void funNumOptBool(num n, {bool b})) {}
-  ;
-  void funNum(num n) {}
-  ;
-  void funNumBool(num n, bool b) {}
-  ;
-  void funNumOptBool(num n, {bool b = true}) {}
-  ;
-  void funNumOptBoolX(num n, {bool x = true}) {}
-  ;
-  anyFunction = funNum;
-  anyFunction = funNumBool;
-  anyFunction = funNumOptBool;
-  anyFunction = funNumOptBoolX;
-  acceptFunNumOptBool(funNumOptBool);
-}
diff --git a/tests/language/parameter/positional_type_runtime_test.dart b/tests/language/parameter/positional_type_runtime_test.dart
deleted file mode 100644
index 4198800..0000000
--- a/tests/language/parameter/positional_type_runtime_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// TODO(multitest): This was automatically migrated from a multitest and may
-// contain strange or dead code.
-
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-//
-// Dart test program for testing optional positional parameters in type tests.
-
-main() {
-  Function anyFunction;
-  void acceptFunNumOptBool(void funNumOptBool(num n, [bool b])) {}
-  void funNum(num n) {}
-  void funNumBool(num n, bool b) {}
-  void funNumOptBool(num n, [bool b = true]) {}
-  void funNumOptBoolX(num n, [bool x = true]) {}
-
-  anyFunction = funNum;
-  anyFunction = funNumBool;
-  anyFunction = funNumOptBool;
-  anyFunction = funNumOptBoolX;
-  acceptFunNumOptBool(funNumOptBool);
-  acceptFunNumOptBool(funNumOptBoolX);
-}