diff --git a/tests/standalone/io/regress_10026_test.dart b/tests/standalone/io/regress_10026_test.dart
deleted file mode 100644
index 1d5fae8e72b..00000000000
--- a/tests/standalone/io/regress_10026_test.dart
+++ /dev/null
@@ -1,703 +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.
-
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-
-import "package:async_helper/async_helper.dart";
-import "package:expect/expect.dart";
-
-void testZLibInflate_regress10026() {
-  test(data, expect) {
-    asyncStart();
-    var controller = new StreamController(sync: true);
-    controller.stream
-        .transform(ZLIB.decoder)
-        .transform(UTF8.decoder)
-        .fold(new StringBuffer(), (buffer, s) {
-      buffer.write(s);
-      return buffer;
-    }).then((out) {
-      Expect.equals(out.toString(), expect);
-      asyncEnd();
-    });
-    controller.add(data);
-    controller.close();
-  }
-
-  // Generated by using 'gzip -c | od -v -tu1 -An -w12' and adding commas.
-  test(
-      [
-        31,
-        139,
-        8,
-        8,
-        238,
-        42,
-        167,
-        81,
-        0,
-        3,
-        116,
-        101,
-        120,
-        116,
-        46,
-        116,
-        120,
-        116,
-        0,
-        125,
-        84,
-        79,
-        175,
-        147,
-        64,
-        16,
-        63,
-        183,
-        159,
-        98,
-        196,
-        139,
-        38,
-        165,
-        244,
-        249,
-        212,
-        52,
-        20,
-        136,
-        70,
-        77,
-        188,
-        168,
-        7,
-        189,
-        120,
-        156,
-        178,
-        67,
-        153,
-        20,
-        118,
-        113,
-        119,
-        161,
-        109,
-        140,
-        223,
-        221,
-        97,
-        105,
-        251,
-        170,
-        47,
-        154,
-        54,
-        41,
-        51,
-        195,
-        254,
-        254,
-        49,
-        52,
-        123,
-        162,
-        76,
-        233,
-        79,
-        29,
-        65,
-        237,
-        219,
-        166,
-        152,
-        103,
-        151,
-        31,
-        66,
-        85,
-        204,
-        103,
-        153,
-        103,
-        223,
-        80,
-        241,
-        225,
-        136,
-        109,
-        215,
-        16,
-        188,
-        55,
-        45,
-        178,
-        206,
-        146,
-        169,
-        59,
-        151,
-        121,
-        75,
-        30,
-        161,
-        172,
-        209,
-        58,
-        242,
-        121,
-        212,
-        251,
-        42,
-        94,
-        71,
-        144,
-        20,
-        151,
-        73,
-        237,
-        125,
-        23,
-        211,
-        143,
-        158,
-        135,
-        60,
-        122,
-        103,
-        180,
-        39,
-        237,
-        227,
-        145,
-        45,
-        130,
-        114,
-        170,
-        242,
-        200,
-        211,
-        209,
-        39,
-        35,
-        235,
-        230,
-        138,
-        243,
-        8,
-        70,
-        99,
-        75,
-        121,
-        52,
-        48,
-        29,
-        58,
-        99,
-        253,
-        205,
-        225,
-        3,
-        43,
-        95,
-        231,
-        138,
-        6,
-        46,
-        41,
-        14,
-        197,
-        2,
-        88,
-        179,
-        103,
-        108,
-        98,
-        87,
-        98,
-        67,
-        249,
-        221,
-        25,
-        199,
-        249,
-        147,
-        24,
-        24,
-        185,
-        207,
-        148,
-        165,
-        115,
-        145,
-        12,
-        182,
-        70,
-        157,
-        224,
-        231,
-        124,
-        54,
-        219,
-        98,
-        185,
-        223,
-        89,
-        211,
-        107,
-        21,
-        151,
-        166,
-        49,
-        54,
-        133,
-        167,
-        213,
-        74,
-        62,
-        47,
-        54,
-        50,
-        108,
-        209,
-        238,
-        88,
-        167,
-        176,
-        26,
-        139,
-        14,
-        149,
-        98,
-        189,
-        59,
-        87,
-        149,
-        104,
-        137,
-        43,
-        108,
-        185,
-        57,
-        165,
-        16,
-        125,
-        233,
-        72,
-        195,
-        87,
-        212,
-        46,
-        90,
-        64,
-        244,
-        145,
-        154,
-        129,
-        60,
-        151,
-        8,
-        159,
-        169,
-        39,
-        233,
-        92,
-        27,
-        11,
-        120,
-        107,
-        69,
-        227,
-        2,
-        156,
-        220,
-        26,
-        59,
-        178,
-        92,
-        109,
-        36,
-        206,
-        95,
-        243,
-        153,
-        226,
-        33,
-        200,
-        9,
-        102,
-        82,
-        120,
-        189,
-        90,
-        117,
-        199,
-        91,
-        5,
-        175,
-        168,
-        5,
-        236,
-        189,
-        249,
-        67,
-        200,
-        61,
-        181,
-        155,
-        127,
-        88,
-        168,
-        170,
-        48,
-        49,
-        86,
-        145,
-        141,
-        45,
-        42,
-        238,
-        93,
-        10,
-        119,
-        225,
-        126,
-        97,
-        195,
-        180,
-        97,
-        189,
-        95,
-        0,
-        166,
-        3,
-        59,
-        246,
-        164,
-        2,
-        247,
-        229,
-        240,
-        253,
-        250,
-        229,
-        122,
-        29,
-        206,
-        143,
-        137,
-        197,
-        138,
-        74,
-        99,
-        209,
-        179,
-        17,
-        25,
-        218,
-        104,
-        154,
-        32,
-        222,
-        180,
-        164,
-        24,
-        225,
-        89,
-        139,
-        199,
-        248,
-        86,
-        244,
-        243,
-        41,
-        213,
-        75,
-        188,
-        255,
-        17,
-        39,
-        32,
-        87,
-        219,
-        23,
-        223,
-        23,
-        139,
-        15,
-        201,
-        63,
-        180,
-        254,
-        50,
-        19,
-        158,
-        194,
-        67,
-        22,
-        147,
-        183,
-        17,
-        84,
-        190,
-        89,
-        18,
-        158,
-        187,
-        44,
-        116,
-        50,
-        109,
-        244,
-        60,
-        27,
-        21,
-        73,
-        45,
-        132,
-        227,
-        90,
-        212,
-        119,
-        143,
-        150,
-        91,
-        90,
-        50,
-        232,
-        138,
-        111,
-        53,
-        59,
-        80,
-        161,
-        9,
-        114,
-        69,
-        206,
-        227,
-        182,
-        97,
-        87,
-        75,
-        72,
-        222,
-        192,
-        150,
-        160,
-        119,
-        114,
-        89,
-        25,
-        11,
-        220,
-        52,
-        189,
-        243,
-        99,
-        52,
-        3,
-        1,
-        77,
-        112,
-        78,
-        246,
-        80,
-        78,
-        151,
-        125,
-        43,
-        139,
-        234,
-        150,
-        240,
-        221,
-        244,
-        82,
-        74,
-        110,
-        30,
-        52,
-        5,
-        136,
-        16,
-        180,
-        88,
-        97,
-        141,
-        158,
-        64,
-        96,
-        208,
-        237,
-        3,
-        92,
-        71,
-        182,
-        101,
-        231,
-        36,
-        231,
-        145,
-        72,
-        88,
-        192,
-        223,
-        74,
-        209,
-        87,
-        10,
-        121,
-        110,
-        90,
-        1,
-        251,
-        81,
-        222,
-        8,
-        140,
-        3,
-        114,
-        35,
-        34,
-        105,
-        132,
-        17,
-        120,
-        75,
-        59,
-        158,
-        116,
-        25,
-        189,
-        204,
-        146,
-        110,
-        242,
-        149,
-        201,
-        107,
-        105,
-        169,
-        202,
-        163,
-        241,
-        229,
-        76,
-        147,
-        228,
-        112,
-        56,
-        44,
-        25,
-        53,
-        46,
-        141,
-        221,
-        37,
-        19,
-        137,
-        75,
-        92,
-        71,
-        165,
-        44,
-        104,
-        84,
-        124,
-        50,
-        150,
-        132,
-        83,
-        0,
-        219,
-        9,
-        103,
-        41,
-        72,
-        88,
-        4,
-        180,
-        44,
-        9,
-        41,
-        102,
-        201,
-        57,
-        211,
-        100,
-        250,
-        243,
-        248,
-        13,
-        215,
-        32,
-        235,
-        247,
-        84,
-        4,
-        0,
-        0
-      ],
-      '''
-<!doctype html>
-<html>
-<head>
-	<title>Example Domain</title>
-
-	<meta charset="utf-8" />
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<style type="text/css">
-	body {
-		background-color: #f0f0f2;
-		margin: 0;
-		padding: 0;
-		font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-	}
-	div {
-		width: 600px;
-		margin: 5em auto;
-		padding: 3em;
-		background-color: #fff;
-		border-radius: 1em;
-	}
-	a:link, a:visited {
-		color: #38488f;
-		text-decoration: none;
-	}
-	@media (max-width: 600px) {
-		body {
-			background-color: #fff;
-		}
-		div {
-			width: auto;
-			margin: 0 auto;
-			border-radius: 0;
-			padding: 1em;
-		}
-	}
-	</style>
-</head>
-
-<body>
-<div>
-	<h1>Example Domain</h1>
-	<p>This domain is established to be used for illustrative examples in documents. You do not need to
-		coordinate or ask for permission to use this domain in examples, and it is not available for
-		registration.</p>
-	<p><a href="http://www.iana.org/domains/special">More information...</a></p>
-</div>
-</body>
-</html>
-''');
-}
-
-void main() {
-  testZLibInflate_regress10026();
-}
diff --git a/tests/standalone/standalone.status b/tests/standalone/standalone.status
index 5b5d61b22de..6029c9c726f 100644
--- a/tests/standalone/standalone.status
+++ b/tests/standalone/standalone.status
@@ -7,33 +7,23 @@
 # listed in tests/lib/analyzer/analyze_tests.status without the "standalone"
 # prefix.
 
-io/raw_socket_test: Pass, RuntimeError # Issue 28288
-io/http_close_test: Pass, RuntimeError # Issue 28380
-packages_file_test: Skip # Issue 26715
-packages_file_test/none: Skip   # contains no tests.
+[ $compiler == dart2js || $compiler == dartdevc ]
+*: SkipByDesign
 
-package/invalid_uri_test: Fail, OK # CompileTimeErrors intentionally
-package/scenarios/packages_file_strange_formatting/empty_package_dir_test: Fail, OK # CompileTimeErrors intentionally
-package/scenarios/empty_packages_file/empty_packages_file_discovery_test: Fail, OK # CompileTimeErrors intentionally
-package/scenarios/empty_packages_file/empty_packages_file_option_test: Fail, OK # CompileTimeErrors intentionally
-package/scenarios/invalid/invalid_package_name_test: RuntimeError, CompileTimeError # Errors intentionally
-package/scenarios/invalid/same_package_twice_test.dart: RuntimeError, CompileTimeError # Errors intentionally
-
-issue14236_test: Pass # Do not remove this line. It serves as a marker for Issue 14516 comment #4.
+[ $compiler == dart2analyzer && $builder_tag == strong ]
+*: Skip # Issue 28649
 
 [$runtime == vm && $compiler == none && $system == fuchsia]
 *: Skip  # Not yet triaged.
 
 [ ($runtime != vm && $runtime != dart_precompiled) && ($compiler != none) ]
 no_assert_test: Fail, OK # This is testing a vm flag.
-env_test: Skip # This is testing a vm command line parsing scenario.
 
-[ $runtime == vm || $runtime == dart_precompiled || $runtime == flutter ]
-package/package_isolate_test: Fail # Issue 12474
-package/scenarios/invalid/same_package_twice_test: Pass # Issue 24119
-# This test checks that the test runner correctly detects and reports non-utf8
-# output from a test.
-io/non_utf8_output_test: NonUtf8Output, OK
+[ $runtime != vm || $compiler != none ]
+script_snapshot_not_executed_test: SkipByDesign # Only makes sense running from source.
+
+[ $system == macos && $builder_tag == swarming ]
+io/*: Skip # Issue 30618
 
 [ ($runtime == vm || $runtime == flutter || $runtime == dart_precompiled) && $checked ]
 # These tests have type errors on purpose.
@@ -43,440 +33,58 @@ io/file_invalid_arguments_test: Fail, OK
 io/internet_address_invalid_arguments_test: Fail, OK
 io/socket_invalid_arguments_test: Fail, OK
 io/stdout_bad_argument_test: Fail, OK
+
 # These test have type errors on purpose and take very long to run in
 # checked mode with no benefit. Skip.
 io/file_fuzz_test: Skip
 io/directory_fuzz_test: Skip
 
 [ ($runtime == vm || $runtime == dart_precompiled) && $system == macos ]
-# This test fails with "Too many open files" on the Mac OS buildbot.
-# This is expected as MacOS by default runs with a very low number
-# of allowed open files ('ulimit -n' says something like 256).
-io/socket_many_connections_test: Skip
-# Re-enable once the bots have been updated. Issue #26057
-io/secure_server_client_certificate_test: Skip
-io/socket_test: Pass, Timeout # Issue 27453
-
-# This test sometimes hangs on Mac.
-io/raw_server_socket_cancel_test: Skip # Issue 28182
 io/raw_secure_server_socket_test: Pass, Crash # Issue 29524
 
-[ ($runtime == vm || $runtime == flutter) && $system == linux ]
-# These tests have started timing out and issue 25649 has been filed to
-# investigate, skipping these tests temporarily to get the bots to be
-# green again.
-io/http_proxy_test: Skip
-io/secure_builtin_roots_test: Skip
-
-# These tests might be slow on an opt counter threshold bot.
-# They also time out on the bot occasionally => flaky test issue 28046
-io/http_basic_test: Pass, Slow, Timeout  # Issue 28046
-io/http_launch_test: Pass, Slow, Timeout  # Issue 28046
-
 [ $compiler == dart2analyzer ]
-issue14236_test: Skip # Analyzer can't handle Script snapshots.
-
 # test issue https://code.google.com/p/dart/issues/detail?id=11518
 io/file_constructor_test: fail
-
-# This is runtime test.
-io/process_exit_negative_test: Skip
-
-io/http_parser_test: Pass, StaticWarning, CompileTimeError # Issue 28843
-io/http_headers_test: Pass, StaticWarning, CompileTimeError # Issue 28843
-io/http_cookie_date_test: Pass, StaticWarning, CompileTimeError # Issue 28843
-io/web_socket_protocol_processor_test: Pass, StaticWarning, CompileTimeError # Issue 28843
-
-[ $compiler == dart2analyzer && $builder_tag == strong ]
-*: Skip # Issue 28649
-
-[ $compiler == dart2js ]
-*: SkipByDesign
-
-[ $runtime == vm && ($arch == arm || $arch == arm64) ]
-io/file_stream_test: Skip # Issue 26109
-io/file_typed_data_test: Skip # Issue 26109
-io/file_input_stream_test: Skip # Issue 26109
-
-[ $runtime != vm || $arch == arm || $arch == arm64 || ($system == windows && $mode == debug) ]
-fragmentation_test: Skip # VM test uses too much memory for small systems.
-
-[ $runtime != vm || $compiler != none ]
-script_snapshot_not_executed_test: SkipByDesign # Only makes sense running from source.
-
-[ $hot_reload || $hot_reload_rollback ]
-script_snapshot_not_executed_test: SkipByDesign # False positive because child process doesn't execute Dart.
-
-[ $arch == simarm || $arch == simarmv6 || $arch == simarmv5te ]
-out_of_memory_test: Skip # passes on Mac, crashes on Linux
-oom_error_stacktrace_test: Skip # Fails on Linux
-
-[ ($arch == simarm || $arch == simdbc || $arch == simdbc64) && $mode == debug && $checked ]
-io/web_socket_test: Pass, Fail # Issue 26814
-
-[ $compiler == dart2analyzer ]
-io/directory_invalid_arguments_test: StaticWarning
-io/process_invalid_arguments_test: StaticWarning
 io/raw_secure_server_socket_argument_test: StaticWarning
-io/secure_socket_argument_test: StaticWarning
 io/stdout_bad_argument_test: StaticWarning
-package/package1_test: StaticWarning
-package/package_test: StaticWarning
-package/scenarios/packages_dir_only/packages_dir_only_test: StaticWarning
-package/scenarios/packages_file_only/packages_file_only_test: StaticWarning
-package/scenarios/both_dir_and_file/prefers_packages_file_test: StaticWarning
-package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_test: StaticWarning
-typed_data_test: StaticWarning
-typed_data_view_test: StaticWarning
-deferred_transitive_import_error_test: Skip # Contains intentional errors.
-
-[ $compiler == dart2analyzer ]
-package/package1_test: CompileTimeError
-package/package_test: CompileTimeError
-package/package_isolate_test: CompileTimeError
-package/scenarios/packages_dir_only/packages_dir_only_test: CompileTimeError
-package/scenarios/packages_file_only/packages_file_only_test: CompileTimeError
-package/scenarios/both_dir_and_file/prefers_packages_file_test: CompileTimeError
-package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_test: CompileTimeError
-package/scenarios/invalid/non_existent_packages_file_test: Crash, OK # Analyzer exits on invalid package config
-package/scenarios/invalid/invalid_utf8_test: Crash, OK # Analyzer exits on invalid package config
-package/scenarios/invalid/invalid_package_name_test: Crash, OK # Analyzer exits on invalid package config
-package/scenarios/invalid/same_package_twice_test: Crash, OK # Analyzer exits on invalid package config
+io/process_invalid_arguments_test: StaticWarning
+io/directory_invalid_arguments_test: StaticWarning
 
 [ $system == windows ]
 verbose_gc_to_bmu_test: Skip
-io/process_sync_test: Pass, Timeout # Issue 24596
 io/sleep_test: Pass, Fail # Issue 25757
-io/http_server_early_client_close2_test: Pass, Crash  # Issue 28197
-io/process_stdin_transform_unsubscribe_test: Pass, Timeout # Issue #28558
-
-[ $system == windows && $compiler != dart2analyzer ]
-io/platform_resolved_executable_test/06: RuntimeError  # Issue 23641
-io/skipping_dart2js_compilations_test: Fail # Issue 19551.
-io/socket_info_ipv6_test: RuntimeError # Issue 27876
-
-[ $system == windows && $compiler == dart2analyzer ]
-package/package_isolate_test: Crash # Issue 28645
-package/scenarios/empty_packages_file/empty_packages_file_noimports_test: Crash # Issue 28645
-package/scenarios/empty_packages_file/empty_packages_file_option_test: Crash, Pass # Issue 28645
-package/scenarios/packages_file_strange_formatting/empty_lines_test: Crash # Issue 28645
-package/scenarios/packages_file_strange_formatting/empty_package_dir_test: Crash # Issue 28645
-package/scenarios/packages_file_strange_formatting/mixed_line_ends_test: Crash # Issue 28645
-package/scenarios/packages_option_only/packages_option_only_noimports_test: Crash # Issue 28645
-package/scenarios/packages_option_only/packages_option_only_test: Crash, CompileTimeError # Issue 28645
-
-[ $compiler == dartk && $mode == debug ]
-io/file_lock_test: Slow, Pass
-
-[ ($runtime == vm || $runtime == dart_precompiled) && $mode == debug && $builder_tag == asan ]
-io/file_lock_test: Skip  # Timeout.
-io/test_runner_test: Skip  # Timeout.
-io/http_client_stays_alive_test: Skip  # Timeout.
 
 [ $runtime == vm || $runtime == dart_precompiled || $runtime == flutter ]
 # Failures in secure networking while NSS is replaced with BoringSSL
-io/https_client_certificate_test: RuntimeError # Issue 24070
-io/secure_socket_renegotiate_test: RuntimeError
 io/secure_socket_bad_data_test: RuntimeError  # An error in a secure connection just puts a READ_CLOSED on the stream, rather than signaling an error on the stream.
 
-[ $arch == ia32 ]
-no_allow_absolute_addresses_test: SkipByDesign # Not supported.
-link_natives_lazily_test: SkipByDesign # Not supported.
-
-[ $compiler == precompiler ]
-map_insert_remove_oom_test: Skip # Heap limit too low. Increasing iteration count to make a higher limit a meaningful test makes it too slow for simarm[64] bots.
-io/web_socket_test: Pass, RuntimeError # Issue 24674
-
 [ $compiler == precompiler || $compiler == app_jit ]
 io/compile_all_test: Skip # Incompatible flag --compile_all
 
-[ $compiler == app_jit ]
-io/stdout_bad_argument_test: Skip # Test exits and so can't generate snapshot.
-io/directory_list_sync_test: Skip # Snapshot path differs from script path.
-io/test_extension_test: Skip # Snapshot path differs from script path.
-io/test_extension_fail_test: Skip # Snapshot path differs from script path.
-io/platform_test: Skip # Snapshot path differs from script path.
-
 [ $runtime == dart_precompiled ]
 # These tests attempt to spawn another script using the precompiled runtime.
-http_launch_test: Skip
-io/addlatexhash_test: Skip
-io/dart_std_io_pipe_test: Skip
-io/dart_std_io_pipe_test: Skip
-io/file_blocking_lock_test: Skip
-io/file_lock_test: Skip
-io/file_read_special_device_test: Skip
-io/http_client_stays_alive_test: Skip
-io/http_response_deadline_test: Skip
-io/http_server_close_response_after_error_test: Skip
-io/https_unauthorized_test: Skip
-io/named_pipe_script_test: Skip
-io/platform_resolved_executable_test: Skip
-io/print_sync_test: Skip
-io/process_check_arguments_test: Skip
-io/process_detached_test: Skip
-io/process_environment_test: Skip
-io/process_non_ascii_test: Skip
-io/process_run_output_test: Skip
-io/process_set_exit_code_test: Skip
-io/process_shell_test: Skip
-io/process_stderr_test: Skip
-io/process_stdin_transform_unsubscribe_test: Skip
-io/process_stdout_test: Skip
-io/process_sync_test: Skip
-io/raw_datagram_socket_test: Skip
-io/regress_7191_test: Skip
-io/regress_7679_test: Skip
-io/secure_unauthorized_test: Skip
-io/signals_test: Skip
-io/stdin_sync_test: Skip
-io/stdio_implicit_close_test: Skip
-io/stdio_nonblocking_test: Skip
-io/test_extension_fail_test: Skip
-io/test_extension_test: Skip
-io/windows_environment_test: Skip
 verbose_gc_to_bmu_test: Skip
 
-io/platform_test: RuntimeError # Expects to be running from 'dart' instead of 'dart_precompiled_runtime'
-io/directory_list_sync_test: Timeout, Skip # Expects to find the test directory relative to the script.
-
-[ $runtime == vm && $system == windows && $mode == release ]
-io/http_server_close_response_after_error_test: Pass, Timeout # Issue 28370: timeout.
-io/regress_7191_test: Pass, Timeout # Issue 28374: timeout.
-
-[ $runtime == vm && $system == macos && $mode == release ]
-io/named_pipe_script_test: Pass, RuntimeError # Issue 28737
 
 [ $system == macos && $builder_tag == swarming ]
 io/*: Skip # Issue 30618
 
-[ $runtime == vm && $system == linux && $mode == release && $arch == ia32 && $builder_tag == asan ]
-io/socket_close_test: Pass, Timeout # Issue 28502: timeout.
-
-[ $runtime == dart_precompiled ]
-io/skipping_dart2js_compilations_test: RuntimeError # Issue 30008
-
-[ $compiler == app_jit ]
-assert_test: RuntimeError # Script name change?
-
 [ $runtime == dart_precompiled || $mode == product ]
-assert_test: SkipByDesign # Requires checked mode.
 no_assert_test: SkipByDesign # Requires checked mode.
-io/code_collection_test: Skip # Incompatible flags
 
 # Overriding these flags are not supported in product mode.
 [ $mode == product ]
-no_profiler_test: SkipByDesign
-no_support_coverage_test: SkipByDesign
-no_support_debugger_test: SkipByDesign
-no_support_disassembler_test: SkipByDesign
-no_support_il_printer_test: SkipByDesign
-no_support_service_test: SkipByDesign
-no_support_timeline_test: SkipByDesign
-io/stdio_implicit_close_test: Skip # SkipByDesign
-dart_developer_env_test: SkipByDesign
 verbose_gc_to_bmu_test: SkipByDesign  # No verbose_gc in product mode
 
-# Following tests are skipped on dart_app as package mapping is not supported.
-[ $runtime == dart_precompiled || $compiler == app_jit ]
-package/scenarios/packages_file_strange_formatting/mixed_line_ends_test: Skip
-package/scenarios/packages_file_strange_formatting/empty_lines_test: Skip
-package/scenarios/invalid/invalid_utf8_test: Skip
-package/scenarios/invalid/same_package_twice_test: Skip
-package/scenarios/invalid/non_existent_packages_file_test: Skip
-package/scenarios/empty_packages_file/empty_packages_file_noimports_test: Skip
-package/scenarios/packages_option_only/packages_option_only_noimports_test: Skip
-package/scenarios/packages_option_only/packages_option_only_test: Skip
-
 [ $runtime == dart_precompiled && $mode == product ]
 dwarf_stack_trace_test: Pass, RuntimeError # Results will flake due to identical code folding
 
-[ $arch == simdbc || $arch == simdbc64 ]
-# SIMDBC interpreter doesn't support lazy linking of natives.
-link_natives_lazily_test: SkipByDesign
-
-# SIMDBC interpreter doesn't support --no_lazy_dispatchers
-no_lazy_dispatchers_test: SkipByDesign
-
-io/secure_unauthorized_test: Pass, RuntimeError # Issue 28719
-
-[ $system == android ]
-io/process_exit_test: RuntimeError # Issue 29578
-io/process_path_test: RuntimeError # Issue 26376
-io/file_test: RuntimeError # Issue 26376
-io/process_path_environment_test: RuntimeError # Issue 26376
-io/file_system_watcher_test: RuntimeError # Issue 26376
-io/resolve_symbolic_links_test: RuntimeError # Issue 26376
-io/file_stat_test: RuntimeError # Issue 26376
-io/raw_datagram_socket_test: RuntimeError # Issue 27638
-io/http_proxy_advanced_test: RuntimeError # Issue 27638
-io/regress_21160_test: RuntimeError # Issue 27638
-io/secure_multiple_client_server_test: RuntimeError # Issue 27638
-io/http_proxy_test: RuntimeError # Issue 27638
-io/secure_session_resume_test: RuntimeError # Issue 27638
-io/raw_secure_server_socket_test: RuntimeError # Issue 27638
-io/raw_secure_server_closing_test: RuntimeError # Issue 27638
-io/raw_secure_socket_pause_test: RuntimeError # Issue 27638
-io/https_server_test: RuntimeError # Issue 27638
-io/secure_server_client_certificate_test: RuntimeError # Issue 27638
-io/secure_socket_alpn_test: RuntimeError # Issue 27638
-io/secure_bad_certificate_test: RuntimeError # Issue 27638
-io/secure_server_socket_test: RuntimeError # Issue 27638
-io/secure_client_server_test: RuntimeError # Issue 27638
-io/socket_upgrade_to_secure_test: RuntimeError # Issue 27638
-io/secure_client_raw_server_test: RuntimeError # Issue 27638
-io/secure_socket_test: RuntimeError # Issue 27638
-io/raw_secure_socket_test: RuntimeError # Issue 27638
-io/https_bad_certificate_test: RuntimeError # Issue 27638
-io/secure_server_closing_test: RuntimeError # Issue 27638
-io/non_utf8_output_test: Skip # The Android command runner doesn't correctly handle non-UTF8 formatted output. https://github.com/dart-lang/sdk/issues/28872
-
-[ $system == android && $runtime == dart_precompiled && $mode == release && $arch == arm]
-io/stdout_stderr_non_blocking_test: Pass, Timeout # Issue 28426
-
-[ $runtime == vm || $runtime == dart_precompiled || $runtime == flutter ]
-deferred_transitive_import_error_test: Skip # Contains intentional errors.
-
-[ $hot_reload || $hot_reload_rollback ]
-deferred_transitive_import_error_test: Crash # Uses deferred imports.
-package/*: SkipByDesign # Launches VMs in interesting ways.
-io/raw_datagram_read_all_test: Pass, Fail # Timing dependent.
-io/test_runner_test: Pass, Slow # Slow.
-io/skipping_dart2js_compilations_test: Pass, Slow # Slow.
-
 [ $builder_tag == no_ipv6 ]
 io/raw_datagram_socket_test: SkipByDesign
-io/socket_source_address_test: SkipByDesign
-io/socket_bind_test: SkipByDesign
-io/http_loopback_test: SkipByDesign
-io/http_proxy_advanced_test: SkipByDesign
-io/http_ipv6_test: SkipByDesign
-io/socket_ipv6_test: SkipByDesign
-io/socket_info_ipv6_test: SkipByDesign
-
-[ $builder_tag == asan ]
-io/process_detached_test: Pass, Slow
-io/named_pipe_script_test: RuntimeError
 
 [ $compiler == dartk || $compiler == dartkp ]
-io/http_client_connect_test: Skip # Flaky.
-io/http_content_length_test: Skip # Flaky.
-io/http_proxy_test: Skip # Flaky.
-io/http_response_deadline_test: Skip # Flaky.
-io/http_reuse_server_port_test: Skip # Flaky.
-io/http_server_close_response_after_error_test: Skip # Flaky.
-io/http_shutdown_test: Skip # Flaky.
 io/raw_datagram_socket_test: Skip # Flaky.
-io/raw_secure_server_closing_test: Skip # Flaky
-io/raw_secure_server_closing_test: Skip # Flaky.
-io/secure_multiple_client_server_test: Skip # Flaky.
-io/secure_server_closing_test: Skip # Flaky.
-io/secure_server_socket_test: Skip # Flaky.
-io/web_socket_error_test: Skip # Flaky
-io/web_socket_ping_test: Skip # Flaky.
-io/web_socket_test: Skip # Flaky.
-no_support_debugger_test: Skip # kernel-service snapshot not compatible with flag disabled
-
-regress_29350_test: MissingCompileTimeError
-assert_test: RuntimeError
-io/compile_all_test: Crash
-map_insert_remove_oom_test: Crash
-package/package1_test: CompileTimeError
-package/package_test: CompileTimeError
-package/scenarios/invalid/invalid_utf8_test: CompileTimeError
-package/scenarios/invalid/non_existent_packages_file_test: CompileTimeError
-package/scenarios/invalid/same_package_twice_test: CompileTimeError
 
 [ $compiler == dartkp ]
-causal_async_stack_test: Fail
 dwarf_stack_trace_test: RuntimeError
 
-[ $runtime == flutter ]
-io/raw_datagram_socket_test: Crash # Flutter Issue 9115
-verbose_gc_to_bmu_test: RuntimeError # Flutter Issue 9115
-io/process_check_arguments_test: RuntimeError # Flutter Issue 9115
-io/process_working_directory_test: RuntimeError # Flutter Issue 9115
-io/process_run_output_test: RuntimeError # Flutter Issue 9115
-io/process_run_test: RuntimeError # Flutter Issue 9115
-io/process_sync_test: RuntimeError # Flutter Issue 9115
-io/test_extension_test: RuntimeError # Flutter Issue 9115
-io/test_extension_fail_test: RuntimeError # Flutter Issue 9115
-oom_error_stacktrace_test: RuntimeError # Flutter Issue 9115
-io/raw_socket_cross_process_test: RuntimeError # Flutter Issue 9115
-io/process_exit_test: RuntimeError # Flutter Issue 9115
-io/uri_platform_test: RuntimeError # Flutter Issue 9115
-io/dart_std_io_pipe_test: RuntimeError # Flutter Issue 9115
-io/platform_test: RuntimeError # Flutter Issue 9115
-io/process_stderr_test: RuntimeError # Flutter Issue 9115
-io/process_segfault_test: RuntimeError # Flutter Issue 9115
-io/addlatexhash_test: RuntimeError # Flutter Issue 9115
-io/http_server_response_test: Skip # Flaky  # Flutter Issue 9115
-io/process_stdout_test: RuntimeError # Flutter Issue 9115
-io/http_cross_process_test: RuntimeError # Flutter Issue 9115
-io/process_set_exit_code_test: RuntimeError # Flutter Issue 9115
-io/stdin_sync_test: RuntimeError # Flutter Issue 9115
-io/raw_server_socket_cancel_test: RuntimeError # Flutter Issue 9115
-io/socket_cross_process_test: RuntimeError # Flutter Issue 9115
-io/arguments_test: RuntimeError # Flutter Issue 9115
-io/code_collection_test: RuntimeError # Flutter Issue 9115
-io/http_client_stays_alive_test: RuntimeError # Flutter Issue 9115
-io/locale_name_test: RuntimeError # Flutter Issue 9115
-out_of_memory_test: RuntimeError # Flutter Issue 9115
-
-io/process_pid_test: Skip # Timeout Flutter Issue 9115
-io/socket_info_ipv4_test: Skip # Timeout Flutter Issue 9115
-io/file_test: Skip # Timeout Flutter Issue 9115
-io/named_pipe_script_test: Skip # Timeout Flutter Issue 9115
-io/print_sync_test: Skip # Timeout Flutter Issue 9115
-io/file_uri_test: Skip # Timeout Flutter Issue 9115
-io/file_lock_test: Skip # Timeout Flutter Issue 9115
-io/socket_info_ipv6_test: Skip # Timeout Flutter Issue 9115
-io/stdio_implicit_close_test: Skip # Timeout Flutter Issue 9115
-io/process_environment_test: Skip # Timeout Flutter Issue 9115
-io/secure_socket_renegotiate_test: Skip # Timeout Flutter Issue 9115
-io/process_kill_test: Skip # Timeout Flutter Issue 9115
-io/directory_uri_test: Skip # Timeout Flutter Issue 9115
-io/raw_socket_test: Skip # Timeout Flutter Issue 9115
-io/http_connection_close_test: Skip # Timeout Flutter Issue 9115
-io/https_unauthorized_test: Skip # Timeout Flutter Issue 9115
-io/file_system_watcher_test: Skip # Timeout Flutter Issue 9115
-io/secure_unauthorized_test: Skip # Timeout Flutter Issue 9115
-io/secure_socket_bad_data_test: Skip # Timeout Flutter Issue 9115
-io/link_uri_test: Skip # Timeout Flutter Issue 9115
-io/file_stream_test: Skip # Timeout Flutter Issue 9115
-io/regress_7191_test: Skip # Timeout Flutter Issue 9115
-io/http_server_close_response_after_error_test: Skip #  Flutter Issue 9115Timeout
-io/signals_test: Skip # Timeout Flutter Issue 9115
-io/process_non_ascii_test: Skip # Timeout Flutter Issue 9115
-io/https_client_certificate_test: Skip # Timeout Flutter Issue 9115
-io/socket_finalizer_test: Skip # Timeout Flutter Issue 9115
-io/process_shell_test: Skip # Timeout Flutter Issue 9115
-io/file_blocking_lock_test: Skip # Timeout Flutter Issue 9115
-io/socket_invalid_arguments_test: Skip # Timeout Flutter Issue 9115
-io/process_detached_test: Skip # Timeout Flutter Issue 9115
-io/platform_resolved_executable_test/00: Skip # Timeout Flutter Issue 9115
-io/platform_resolved_executable_test/01: Skip # Timeout Flutter Issue 9115
-io/platform_resolved_executable_test/02: Skip # Timeout Flutter Issue 9115
-io/platform_resolved_executable_test/03: Skip # Timeout Flutter Issue 9115
-io/platform_resolved_executable_test/04: Skip # Timeout Flutter Issue 9115
-io/platform_resolved_executable_test/05: Skip # Timeout Flutter Issue 9115
-http_launch_test: Skip # Timeout Flutter Issue 9115
-dart_developer_disabled_env_test: RuntimeError # Flutter Issue 9115
-
-
-package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_test: Fail # Unable to parse package files Flutter Issue 9115
-package/package1_test: Fail # Unable to parse package files Flutter Issue 9115
-package/scenarios/packages_option_only/packages_option_only_test: Fail # Unable to parse package files Flutter Issue 9115
-package/scenarios/invalid/invalid_package_name_test: Fail # Unable to parse package files Flutter Issue 9115
-package/scenarios/invalid/same_package_twice_test: Fail # Unable to parse package files Flutter Issue 9115
-package/scenarios/packages_file_only/packages_file_only_test: Fail # Unable to parse package files Flutter Issue 9115
-package/scenarios/packages_dir_only/packages_dir_only_test: Fail # Unable to parse package files Flutter Issue 9115
-package/scenarios/both_dir_and_file/prefers_packages_file_test: Fail # Unable to parse package files Flutter Issue 9115
-package/package_test: Fail # Unable to parse package files Flutter Issue 9115
-#unboxed_int_converter_test: Fail # Unable to parse package files Flutter Issue 9115
-io/process_run_output_test: Fail # Unable to parse package files Flutter Issue 9115
-
-io/dependency_graph_test: CompileTimeError # Imports dart:mirrors
-io/skipping_dart2js_compilations_test: CompileTimeError # Uses mirrors
-io/test_harness_analyzer_test: CompileTimeError # Uses mirrors
-io/test_runner_test: CompileTimeError # Uses mirrors
diff --git a/tests/standalone/array_bounds_check_generalization_test.dart b/tests/standalone_2/array_bounds_check_generalization_test.dart
similarity index 100%
rename from tests/standalone/array_bounds_check_generalization_test.dart
rename to tests/standalone_2/array_bounds_check_generalization_test.dart
diff --git a/tests/standalone/black_listed_test.dart b/tests/standalone_2/black_listed_test.dart
similarity index 100%
rename from tests/standalone/black_listed_test.dart
rename to tests/standalone_2/black_listed_test.dart
diff --git a/tests/standalone/constant_left_shift_test.dart b/tests/standalone_2/constant_left_shift_test.dart
similarity index 100%
rename from tests/standalone/constant_left_shift_test.dart
rename to tests/standalone_2/constant_left_shift_test.dart
diff --git a/tests/standalone/io/ansi_supported_test.dart b/tests/standalone_2/io/ansi_supported_test.dart
similarity index 100%
rename from tests/standalone/io/ansi_supported_test.dart
rename to tests/standalone_2/io/ansi_supported_test.dart
diff --git a/tests/standalone/io/arguments_test.dart b/tests/standalone_2/io/arguments_test.dart
similarity index 100%
rename from tests/standalone/io/arguments_test.dart
rename to tests/standalone_2/io/arguments_test.dart
diff --git a/tests/standalone/io/async_catch_errors_test.dart b/tests/standalone_2/io/async_catch_errors_test.dart
similarity index 100%
rename from tests/standalone/io/async_catch_errors_test.dart
rename to tests/standalone_2/io/async_catch_errors_test.dart
diff --git a/tests/standalone/io/bytes_builder_test.dart b/tests/standalone_2/io/bytes_builder_test.dart
similarity index 100%
rename from tests/standalone/io/bytes_builder_test.dart
rename to tests/standalone_2/io/bytes_builder_test.dart
diff --git a/tests/standalone_2/io/certificates/README b/tests/standalone_2/io/certificates/README
new file mode 100644
index 00000000000..6ecd5189286
--- /dev/null
+++ b/tests/standalone_2/io/certificates/README
@@ -0,0 +1,70 @@
+    This directory, tests/standalone/io/certificates, contains the
+X509 TLS certificates and private keys needed to run tests of Dart's
+secure networking code.  The SecureSocket and SecureServer classes
+are tested by making TLS (formerly called SSL) connections, secured
+by certificates from a self-signed test root authority.
+
+The certificates are created by running ../create_sample_certificates.sh
+in a bash or sh shell, with the openssl tools installed.  Run the script
+twice to create the untrusted_* files.
+
+PEM files:
+
+server_chain.pem:
+  Contains the chain of certificates, from the self-signed
+test certificate authority, through the intermediate CA, to the server
+certificate, used on the server side of a test connection.
+
+server_key.pem:
+  Contains the private key for the server certificate
+
+trusted_certs.pem:
+  Contains the self-signed certificate of the test certificate authority.
+This certificate is set as "trusted" by the client side of the connection
+in its SecurityContext object, so that a verified TLS connection to the
+server can be made.
+
+untrusted_server_chain.pem:
+  Contains a chain of certificates, from a different self-signed
+test certificate authority, through an intermediate CA, to a server
+certificate, used on the server side of a test connection that is intended
+to fail because the client does not accept this certificate authority
+
+untrusted_server_key.pem:
+  Contains the private key for the untrusted server certificate
+in untrusted_server_chain.pem
+
+*_malformed.pem:
+  Truncated PEM formatted certificates used to test error handling.
+
+PKCS12 files:
+
+server_key.12:
+  Created with:
+  $ openssl pkcs12 -export -inkey server_key.pem -out server_key.p12 -nocerts
+  with password 'dartdart'
+
+server_chain.p12:
+  Created with:
+  $ openssl pkcs12 -export -in server_chain.pem -out server_chain.p12 -nokeys
+  with password 'dartdart'
+
+client1_key.p12:
+  Created with:
+  $ openssl pkcs12 -export -inkey client1_key.pem -out client1_key.p12 -nocerts
+  with password 'dartdart'
+
+client1.p12:
+  Created with:
+  $ openssl pkcs12 -export -in client1.pem -out client1.p12 -nokeys
+  with password 'dartdart'
+
+trusted_certs.p12:
+  Created with:
+  $ openssl pkcs12 -export -in trusted_certs.pem -out trusted_certs.p12 -nokeys
+  with password 'dartdart'
+
+client_authority.p12:
+  Created with:
+  $ openssl pkcs12 -export -in client_authority.pem -out client_authority.p12 -nokeys
+  with password 'dartdart'
diff --git a/tests/standalone_2/io/certificates/client1.p12 b/tests/standalone_2/io/certificates/client1.p12
new file mode 100644
index 00000000000..8d19d0495c0
Binary files /dev/null and b/tests/standalone_2/io/certificates/client1.p12 differ
diff --git a/tests/standalone_2/io/certificates/client1.pem b/tests/standalone_2/io/certificates/client1.pem
new file mode 100644
index 00000000000..429cd72ab19
--- /dev/null
+++ b/tests/standalone_2/io/certificates/client1.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDBzCCAe+gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9jbGll
+bnRhdXRob3JpdHkwHhcNMTUxMDI3MTAyNjM1WhcNMjUxMDI0MTAyNjM1WjAQMQ4w
+DAYDVQQDDAV1c2VyMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlg
+zRZlohMtAg44+kPk04G/gIkdeyh7toUA3nR/2sS11j8EutHewezvMV8YyxBxQn8f
+8x8FkDbrE/6GYg2Dsu6TxrXIFre9Lt5jLlJi/6qEaVtXNTdP3vKO87FJ7YVLCeYe
+MxuTCdHloeUICP5x3GJz3AVdcg/S9qRWrpm8LdRdFk66l8vD+aDf+Oqe+mLVtAr6
+kqkdq1nUJOkRBp+zFMmB3Zfm28aYew6BmFQSscxemZyJxiv4dB+EDr821kEjgGBY
+IQGpdADrfh3j9JAzEr30o6sjfr6QWKHG6ZD7xhSl7rIxmx1yoKoJh8vLpcQfdv79
+7VZZT5N7xjz0xkjqTA0CAwEAAaNiMGAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUMpcX
+0o3lu3BTmaKwCfIJMO5aMs4wHwYDVR0jBBgwFoAUtyLBueMoMi7TborRvM7CnwOi
+SQ4wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAAB1rNFg
+wdK79r7WO0OvE90uvtFf8sO2kqwW/7JIP/kcnIwIIkNiffUEfLfVr7aecK0rPer4
+DDZFAciuaOcts7dTxXRU+la1ZEPaEyx1mHaC6HJbgFYC9cG30L6GJGkZkIGOCTn+
+/yPxTM//dSc7YACc90GNTeUFVnAw6vskH91Ph4VYbdYxt7L1d1pzvBeun6Qi0eJq
+rkWQ2DOO9h9E6Rnt8Jea3w7WzX5P8pBjm74bv38YBKefawPeiiXck2Q/lUehLePV
+U1MRdy1QWC924+p6cXbR1GEhg0FZyvS/9WdpLMGIat/j/98juN6qyAbw7XXhlB1g
+fBHlfXbx+KMZAuY=
+-----END CERTIFICATE-----
diff --git a/tests/standalone_2/io/certificates/client1_key.p12 b/tests/standalone_2/io/certificates/client1_key.p12
new file mode 100644
index 00000000000..5d11e735e32
Binary files /dev/null and b/tests/standalone_2/io/certificates/client1_key.p12 differ
diff --git a/tests/standalone_2/io/certificates/client1_key.pem b/tests/standalone_2/io/certificates/client1_key.pem
new file mode 100644
index 00000000000..0e2ef5e6005
--- /dev/null
+++ b/tests/standalone_2/io/certificates/client1_key.pem
@@ -0,0 +1,29 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE4jAcBgoqhkiG9w0BDAEBMA4ECF4ZB27y60SWAgIIAASCBMCEL3ZCzfC0q+m+
+B8gM9jQe1JFRD5reAuwK6+3speBS4KE+wjbcyQq09/5UoQu3Dci1WG1nKLB1u0Bk
+w9NuRahWCpvVLzz/GQ6Psesixq3V69zD3N6iMl/XQKymQBwGK51xIkeJO+6Skh2d
++qoyBHINTlKY9+548Zgqu+Z3mI3pGmdhd7hCiamiffDwCLEqRxbXdZdLpC9GpAP5
+HOqXHzN2aZbAGHb1GkHVxskSNzAwlEEZhh4Ibe6o7U65hoL9borewT+gj6sQohI5
+/LHL0P2bVvtRZiwBVPUX8HZWuVYIFb6GEGTTqOofNhNHvHaKUlD8Uxi5/h/Xi8fq
+xpdkjIn7VXj9e+I3TkfiphDtk0+Q+f+UkuPyuzU1PafinPfRK1J6gk+ZqAQHW/sp
+g6GVr2r4PkOrBPsA6jmCnQhs2C4MlZyR2p65qjVutdkKU5NgftW+giK9shgglcza
+38RF8i01THOnD3j+2teM/t/Ziqb2PGWv/bmvhcYqt1aG186Pe3bBCxhh/L7bqNKD
+q7sxDmaDE2pTkfyvh07udarmBQc5gvfXYqwghbqP/n7wizqjeEJgAwwHyi8LLsFV
+XreBQ/8Z2gQwXurrh5WD+7KSgvgopW/oVC8a3++8Hmf5Nkj27lACzoDWTG2/Swah
+O1MmdtPyy/KCbf5ujt2BlXM9D206Rsr6hoO9UZ1s1ohRdJReVGc4NZ4XrVWc4TKT
+gUAFTaHIKgFe/DgLaQn8L8Pqb8B/JfoSgQ74r69S434Kc+EDKui8wnkgso5bqrr1
+M07H9Xo+OtG1D6rma2EUlpoU06CAIcyqNx5fHJ3xfk9GHScQi4U6vEDCAQTNTS65
+I5AOHthZ2kZzfXvP6TF39S5D37NrV7/WJu7ZFaJx3bUGwnS2HYTwjFPABHpVLMwJ
+nBylVJs+h7bCZdBNCWgTytcn1mYMCvXVmrW8VTwBRjUQsy4rgE2wjpZuIM9rx+gZ
+HtNvy5t2RlOSqVKapyvV0ll7qbT1lwGIePxjttiWmNbgbwRBQzjv6FZ1Yo331Fl4
+qgXGcvZWgsgQFPXviKmDx+9KJ2oL35cLnDcMCRN7lLPdAhk8J/XrUq/iIYXNxud6
+f9mfVOsd0LT030je/N25IdEoPimTnps/INGGNug+FuJ3dCeIQGwB7uQB5ozoHL5h
+hzdQYq5+FWksuHPCOL1YLRJux9sH6OYxlXy2oigLtA05EHhq83Wwb2oTW6boo+rs
+gKqzc7OtFgYDsV8R1raoqlzAv3GNgkzyuHTSUakDdnJYmfcoOuK+Ch+MjVeZW5bS
+Ir7uqugUqqI/AiO/eHkvoGpQs0c67ao0qPR7ZQna/1FBj1O8J/dI4JBUtPvDa0tW
+7U+Ja/twJWri+Nn6/iEEWEuM/xx/xFmxrTb4WYza1ysrCls5l6POjQu2n6dT52+o
+cobwltkJmSNoIT2SYRuvEfgGlwyzY5p5B8U24HIAkNJIkO7hc9oD1mbq+K526HNl
+h6TG7RGUOffXIYuykrMmCTRRnv3bXmjTgsvWhVFujpCSQf9PqkQpv+KQPeFmy12h
+TA1QNtdVOZlh2GLEUgZuJVytyEz4m+3BfvBql5K9rlAUSQqsLJDKVxsmBDl132o3
+yy9JR7iC
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/standalone_2/io/certificates/client1_key_malformed.pem b/tests/standalone_2/io/certificates/client1_key_malformed.pem
new file mode 100644
index 00000000000..8c1f7d8af7c
--- /dev/null
+++ b/tests/standalone_2/io/certificates/client1_key_malformed.pem
@@ -0,0 +1,17 @@
+MIIE4jAcBgoqhkiG9w0BDAEBMA4ECF4ZB27y60SWAgIIAASCBMCEL3ZCzfC0q+m+
+B8gM9jQe1JFRD5reAuwK6+3speBS4KE+wjbcyQq09/5UoQu3Dci1WG1nKLB1u0Bk
+w9NuRahWCpvVLzz/GQ6Psesixq3V69zD3N6iMl/XQKymQBwGK51xIkeJO+6Skh2d
++qoyBHINTlKY9+548Zgqu+Z3mI3pGmdhd7hCiamiffDwCLEqRxbXdZdLpC9GpAP5
+HOqXHzN2aZbAGHb1GkHVxskSNzAwlEEZhh4Ibe6o7U65hoL9borewT+gj6sQohI5
+/LHL0P2bVvtRZiwBVPUX8HZWuVYIFb6GEGTTqOofNhNHvHaKUlD8Uxi5/h/Xi8fq
+xpdkjIn7VXj9e+I3TkfiphDtk0+Q+f+UkuPyuzU1PafinPfRK1J6gk+ZqAQHW/sp
+g6GVr2r4PkOrBPsA6jmCnQhs2C4MlZyR2p65qjVutdkKU5NgftW+giK9shgglcza
+38RF8i01THOnD3j+2teM/t/Ziqb2PGWv/bmvhcYqt1aG186Pe3bBCxhh/L7bqNKD
+q7sxDmaDE2pTkfyvh07udarmBQc5gvfXYqwghbqP/n7wizqjeEJgAwwHyi8LLsFV
+XreBQ/8Z2gQwXurrh5WD+7KSgvgopW/oVC8a3++8Hmf5Nkj27lACzoDWTG2/Swah
+O1MmdtPyy/KCbf5ujt2BlXM9D206Rsr6hoO9UZ1s1ohRdJReVGc4NZ4XrVWc4TKT
+gUAFTaHIKgFe/DgLaQn8L8Pqb8B/JfoSgQ74r69S434Kc+EDKui8wnkgso5bqrr1
+M07H9Xo+OtG1D6rma2EUlpoU06CAIcyqNx5fHJ3xfk9GHScQi4U6vEDCAQTNTS65
+I5AOHthZ2kZzfXvP6TF39S5D37NrV7/WJu7ZFaJx3bUGwnS2HYTwjFPABHpVLMwJ
+nBylVJs+h7bCZdBNCWgTytcn1mYMCvXVmrW8VTwBRjUQsy4rgE2wjpZuIM9rx+gZ
+HtNvy5t2RlOSqVKapyvV0ll7qbT1lwGIePxjttiWmNbgbwRBQzjv6FZ1Yo331Fl4
diff --git a/tests/standalone_2/io/certificates/client2.pem b/tests/standalone_2/io/certificates/client2.pem
new file mode 100644
index 00000000000..f34bde4b48b
--- /dev/null
+++ b/tests/standalone_2/io/certificates/client2.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDBzCCAe+gAwIBAgIBAzANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9jbGll
+bnRhdXRob3JpdHkwHhcNMTUxMDI3MTAyNjM1WhcNMjUxMDI0MTAyNjM1WjAQMQ4w
+DAYDVQQDDAV1c2VyMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMay
+a0BYpNJHlwcNz6TyX+D6dKnqxUfdHQDgW9/5Hl4RiHDKAH+2iVYEsedksOmxNDlV
+HqZg4fBsyPVRzeGqia7nCsN3KlMbaqZgNI3ynvvMFIJkb3e/ZJtodg+cYzqnOu2F
+G3LijzRJG363aavTnjLdFumLnsOtSDdYnjRM43eeE3X2ajAiKkE9r6b6/wt8Ki5T
+GVIm9kG674iCloawK6dgCBA1dDPsKmzhcFoAl5UMpQSvd1OuW034qryE+RzQ0RCe
+G5u2leVgiuoq2rpmPL6fA0BHsyJ3wP1Gs74i+NhZdhiBhv+E89sfKaJOPpmDBW7b
+3jCpEmgRSm5h5SDm8KsCAwEAAaNiMGAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUj0t8
+BdHrTqd7aKIV4+OLWvT6WX4wHwYDVR0jBBgwFoAUtyLBueMoMi7TborRvM7CnwOi
+SQ4wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBABQ4PKRG
+VJYhWtktqpilP+C8CXsMArsqkEdMwHgQi8Xv3WVvXZpiLZHvO0To9J3+dgD2sOys
+MphZBXMJuOfX/+3IGerxsBxVj7Pnx37nn83g6PfCvGgVQQw7cGUjn5/Dw6apH2HH
+eO3yG+fgYeMNXyKt1KVWYeIToZfXUFvm+oMbWxxdpcctsKLRgCRvf1+r5EK9xE8+
+jYYk3S3pXvsk3qwWJz3pjg6zR3IbakkEuhE1Gl0Wrf4zZ9DOB8rd00/xirAuuYwm
+aIZ3KcFCTgVdGtB41q03D31xWNZPODCxAEADiICNE+3cuUMCi3wwBeCrybXSLhj/
+6St8K4NBvg+xL/w=
+-----END CERTIFICATE-----
diff --git a/tests/standalone_2/io/certificates/client2_key.pem b/tests/standalone_2/io/certificates/client2_key.pem
new file mode 100644
index 00000000000..b4074f97535
--- /dev/null
+++ b/tests/standalone_2/io/certificates/client2_key.pem
@@ -0,0 +1,29 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE5DAcBgoqhkiG9w0BDAEBMA4ECC/vc3ONj4KfAgIIAASCBMI1liT+B00kYYj+
+VRcEHQVrWsvD648OCd6BNQ9gKTYL5767lHUN0iG2JAdTHTKJy7XeEVVdPweU58jb
+HnS1yWbs0IuUFkCGy9wH3Lb6SkZtEScoAmzsNRdSY3WwmNhUG/yHrLITKM1SGkg3
+nf3ywIJYwO3YH22InVK0puVT/y943F1GXZSvklG/TGawR0uIyNuZOl0rg+5bsCaf
+1VSCWvt/Czgqm9Pc+Iz2PAKwyyjmvqRMBCtKvJTGNEPB63eDyHWQTtvQe0un06AF
+lvB7JYWaTXiwccSww2BuqTdJdBYKWxzPbdBfcqUT5Q9/LE0JhwvfZY/oDeJFP0HC
+HVBajuESZPJgb06xcsiX1qmk/iqAjZVZQ/CQ9K08qXem7YRFxJCy90wjLu3abjzQ
+Nvq0VsI8a8vlODQlr/Z5iXSYEKMYvUwh5Y9e8fc0BOOc1QzOYV2vxy28OVHmigOn
+tVHdj/FXK6N97QgtFzVUTjisO3YFygI2wybrz1BEys/vwqfCBiT+/hu+ur/lCrkn
+E2S6I967TyTvaxn+WCo9EW2Rb66XdI7tL09AkV2VZqJN4PTyis9YYgkr2uKjj4qX
+ySAQp/XHGEF1mmvjeptKTb2CMut0vcP+nl1bsUUXpSiKYGQ2BBcqgTcEFUEd75ms
+kcPMOuHdioaYh72nCRVzsRoDTDGF08NMTndW5PC8RpFsNS0vx8dq/A3VHAvJa2Rc
+9lP939FAU/Ck9b3NxH6hUgfDEFHQ61oW2Inpu4s3eRoClkgyf+aQEZZI7GTiNICm
+xqHosZ+hLe2mYoGk6xl1AruMk7kGeebRaPxzvS0UKfftOQDahFcDp8iEtLAcM1nx
+8Pdu4csyWFk+eBsTT6sPur2ZkD2LO0gLjR+N2nZNTqEJYy7n1jyV7M/JZBfh0fGi
+VX+sb+urTBAlDszX6b1LV7M78MDs6QwziDsrytjuClOWN47wzYbYYnSZZnDtTR+B
+CDHyK5wa8gNs4A+643HvD6sJz6zALOu2UI/9SrvuyYPltCwCUmWJ3A2XxoBmdJ/e
+yHEj/VdsNi6TtQ5qpBWqm43LpF0WAKNgksGnbFjOc/0QsUVk0txB9D6/oC9HyCd8
+u9nR8vLUC7l1dtYL0CwpocqU67qzVoRxrkkyCE4iblusKjr1ZlfstHDS0tPELodo
+8RroSs4vKXV9dzhzLQyqp6PzzdB7y/5Bpn0grxXrwln6/shoSR462h2CB4z9chGA
+Vdsp+KE8LDogIwZDT6iVVrpaBQDLoSxmX+E2IKRCUcj/l+gepEPyHbhOAn8/NxGX
+h16v89aDMtnyWqUcc/Gm2/Qep3o7goRfodyoyWvwy8nq9Lgf/wJIfEGn0lEeR0I/
+/Om/UAiId1o47C3LsGMm+qO+FcWesLA67eMQnp1WYoWpnanb3q4t8PWATzAlW05n
+cA59dYjutUmKJEjrh595AptMLXn6RM1GzA7x53+uAKvXaI+aR8wrtujiJLg9DwY2
++f4ehwfwNptBxzZX97a7/3lGZ5U7BgDeJhNo9T02VQTvXxB29H6J/v6XYyPCKpuM
+upPhiHzrs9UyMvINfDnd/fJ58qr6TvEuBi0QxMMmOCfccYlj6Q5Bfqp+iuST0igg
+SLmBml+LkIM=
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/standalone_2/io/certificates/client_authority.p12 b/tests/standalone_2/io/certificates/client_authority.p12
new file mode 100644
index 00000000000..545282e65f0
Binary files /dev/null and b/tests/standalone_2/io/certificates/client_authority.p12 differ
diff --git a/tests/standalone_2/io/certificates/client_authority.pem b/tests/standalone_2/io/certificates/client_authority.pem
new file mode 100644
index 00000000000..ae9ae5b6769
--- /dev/null
+++ b/tests/standalone_2/io/certificates/client_authority.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDKjCCAhKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9jbGll
+bnRhdXRob3JpdHkwHhcNMTUxMDI3MTAyNjM1WhcNMjUxMDI0MTAyNjM1WjAaMRgw
+FgYDVQQDEw9jbGllbnRhdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCi6wJAs6nppNmTZ3e/wE9l0pAmkMtDONwB9o115XXTG3rmSKfZOxa8
+TFjSn818Pr1OYb9fPdI1Y6x4WY9PELUtQyEBlNcKjwg96vhrP4p2DhqbWsI5nASH
+DSjJsM75bQ7D7qHYzriuAl0Fk1C4LcodRj+5wmErMtvGJG0x06qFbxCCMAJ2kC+h
+SneTN955/YHSXADgxjFlt3s1T0QPnqrr+G7Ro6PrVKLPBulglq7wAeTwrGkPRUt0
+3lDGOSi6i97NbpiXwrGp5XiLUtVCiID6Ro0xKWH4sjJ4JnVjIUG8CQWERc6sFDJM
+4adgFQJagkTUoxWtDGL58+WcbcJa73XJAgMBAAGjezB5MBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFLciwbnjKDIu026K0bzOwp8DokkOMB8GA1UdIwQYMBaA
+FLciwbnjKDIu026K0bzOwp8DokkOMA4GA1UdDwEB/wQEAwICBDATBgNVHSUEDDAK
+BggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAh8rryWFoGjFdm0i4FLRktF8B
+aUqVCCpFVHIYlFcsQstznIb01X2Zq5nfSfrFxbr5STVGzGJ0HGDuFpicT8+qMnJX
+dou5AuaqubIDWeKL+oAgvI71Nt1gsesixqzFQAoCTRgUjrSGpY2fL7rElV0Ndy9b
+YepVouktP1/GULc8XbIG9ZLx70Id7YTyrITDgbH3hSnbjmmZSr9RKyKas4MXN0s8
+oKGHEgAx7KyNQRppjydz3bDeH/jVbM4W98vwL6rjKUJlOlo0Ru+3+oioFHqLMSvN
+w4f5rQEiuF260h7y8KKxRxQ8rw188gsBapZr4Rcp+y8gdQvlzJONtv3d1dap5A==
+-----END CERTIFICATE-----
diff --git a/tests/standalone_2/io/certificates/client_authority_malformed.pem b/tests/standalone_2/io/certificates/client_authority_malformed.pem
new file mode 100644
index 00000000000..d0aeff4208f
--- /dev/null
+++ b/tests/standalone_2/io/certificates/client_authority_malformed.pem
@@ -0,0 +1,8 @@
+MIIDKjCCAhKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9jbGll
+bnRhdXRob3JpdHkwHhcNMTUxMDI3MTAyNjM1WhcNMjUxMDI0MTAyNjM1WjAaMRgw
+FgYDVQQDEw9jbGllbnRhdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCi6wJAs6nppNmTZ3e/wE9l0pAmkMtDONwB9o115XXTG3rmSKfZOxa8
+TFjSn818Pr1OYb9fPdI1Y6x4WY9PELUtQyEBlNcKjwg96vhrP4p2DhqbWsI5nASH
+DSjJsM75bQ7D7qHYzriuAl0Fk1C4LcodRj+5wmErMtvGJG0x06qFbxCCMAJ2kC+h
+SneTN955/YHSXADgxjFlt3s1T0QPnqrr+G7Ro6PrVKLPBulglq7wAeTwrGkPRUt0
+3lDGOSi6i97NbpiXwrGp5XiLUtVCiID6Ro0xKWH4sjJ4JnVjIUG8CQWERc6sFDJM
diff --git a/tests/standalone_2/io/certificates/server_chain.p12 b/tests/standalone_2/io/certificates/server_chain.p12
new file mode 100644
index 00000000000..79e412d9454
Binary files /dev/null and b/tests/standalone_2/io/certificates/server_chain.p12 differ
diff --git a/tests/standalone_2/io/certificates/server_chain.pem b/tests/standalone_2/io/certificates/server_chain.pem
new file mode 100644
index 00000000000..341a86f4cf1
--- /dev/null
+++ b/tests/standalone_2/io/certificates/server_chain.pem
@@ -0,0 +1,59 @@
+-----BEGIN CERTIFICATE-----
+MIIDZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDDBVpbnRl
+cm1lZGlhdGVhdXRob3JpdHkwHhcNMTUxMDI3MTAyNjM1WhcNMjUxMDI0MTAyNjM1
+WjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCkg/Qr8RQeLTOSgCkyiEX2ztgkgscX8hKGHEHdvlkmVK3JVEIIwkvu
+/Y9LtHZUia3nPAgqEEbexzTENZjSCcC0V6I2XW/e5tIE3rO0KLZyhtZhN/2SfJ6p
+KbOh0HLr1VtkKJGp1tzUmHW/aZI32pK60ZJ/N917NLPCJpCaL8+wHo3+w3oNqln6
+oJsfgxy9SUM8Bsc9WMYKMUdqLO1QKs1A5YwqZuO7Mwj+4LY2QDixC7Ua7V9YAPo2
+1SBeLvMCHbYxSPCuxcZ/kDkgax/DF9u7aZnGhMImkwBka0OQFvpfjKtTIuoobTpe
+PAG7MQYXk4RjnjdyEX/9XAQzvNo1CDObAgMBAAGjgbQwgbEwPAYDVR0RBDUwM4IJ
+bG9jYWxob3N0ggkxMjcuMC4wLjGCAzo6MYcEfwAAAYcQAAAAAAAAAAAAAAAAAAAA
+ATAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSvhJo6taTggJQBukEvMo/PDk8tKTAf
+BgNVHSMEGDAWgBS98L4T5RaIToE3DkBRsoeWPil0eDAOBgNVHQ8BAf8EBAMCA6gw
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAHLOt0mL2S4A
+B7vN7KsfQeGlVgZUVlEjem6kqBh4fIzl4CsQuOO8oJ0FlO1z5JAIo98hZinymJx1
+phBVpyGIKakT/etMH0op5evLe9dD36VA3IM/FEv5ibk35iGnPokiJXIAcdHd1zam
+YaTHRAnZET5S03+7BgRTKoRuszhbvuFz/vKXaIAnVNOF4Gf2NUJ/Ax7ssJtRkN+5
+UVxe8TZVxzgiRv1uF6NTr+J8PDepkHCbJ6zEQNudcFKAuC56DN1vUe06gRDrNbVq
+2JHEh4pRfMpdsPCrS5YHBjVq/XHtFHgwDR6g0WTwSUJvDeM4OPQY5f61FB0JbFza
+PkLkXmoIod8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDLjCCAhagAwIBAgIBAjANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1yb290
+YXV0aG9yaXR5MB4XDTE1MTAyNzEwMjYzNVoXDTI1MTAyNDEwMjYzNVowIDEeMBwG
+A1UEAwwVaW50ZXJtZWRpYXRlYXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA6GndRFiXk+2q+Ig7ZOWKKGta+is8137qyXz+eVFs5sA0ajMN
+ZBAMWS0TIXw/Yks+y6fEcV/tfv91k1eUN4YXPcoxTdDF97d2hO9wxumeYOMnQeDy
+VZVDKQBZ+jFMeI+VkNpMEdmsLErpZDGob/1dC8tLEuR6RuRR8X6IDGMPOCMw1jLK
+V1bQjPtzqKadTscfjLuKxuLgspJdTrzsu6hdcl1mm8K6CjTY2HNXWxs1yYmwfuQ2
+Z4/8sOMNqFqLjN+ChD7pksTMq7IosqGiJzi2bpd5f44ek/k822Y0ATncJHk4h1Z+
+kZBnW6kgcLna1gDri9heRwSZ+M8T8nlHgIMZIQIDAQABo3sweTASBgNVHRMBAf8E
+CDAGAQH/AgEAMB0GA1UdDgQWBBS98L4T5RaIToE3DkBRsoeWPil0eDAfBgNVHSME
+GDAWgBRxD5DQHTmtpDFKDOiMf5FAi6vfbzAOBgNVHQ8BAf8EBAMCAgQwEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAD+4KpUeV5mUPw5IG/7w
+eOXnUpeS96XFGuS1JuFo/TbgntPWSPyo+rD4GrPIkUXyoHaMCDd2UBEjyGbBIKlB
+NZA3RJOAEp7DTkLNK4RFn/OEcLwG0J5brL7kaLRO4vwvItVIdZ2XIqzypRQTc0MG
+MmF08zycnSlaN01ryM67AsMhwdHqVa+uXQPo8R8sdFGnZ33yywTYD73FeImXilQ2
+rDnFUVqmrW1fjl0Fi4rV5XI0EQiPrzKvRtmF8ZqjGATPOsRd64cwQX6V+P5hNeIR
+9pba6td7AbNGausHfacRYMyoGJWWWkFPd+7jWOCPqW7Fk1tmBgdB8GzXa3inWIRM
+RUE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC+zCCAeOgAwIBAgIBATANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1yb290
+YXV0aG9yaXR5MB4XDTE1MTAyNzEwMjYzNFoXDTI1MTAyNDEwMjYzNFowGDEWMBQG
+A1UEAwwNcm9vdGF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMl+dcraUM/E7E6zl7+7hK9oUJYXJLnfiMtP/TRFVbH4+2aEN8vXzPbzKdR3
+FfaHczXQTwnTCaYA4u4uSDvSOsFFEfxEwYORsdKmQEM8nGpVX2NVvKsMcGIhh8kh
+ZwJfkMIOcAxmGIHGdMhF8VghonJ8uGiuqktxdfpARq0g3fqIjDHsF9/LpfshUfk9
+wsRyTF0yr90U/dsfnE+u8l7GvVl8j2Zegp0sagAGtLaNv7tP17AibqEGg2yDBrBN
+9r9ihe4CqMjx+Q2kQ2S9Gz2V2ReO/n6vm2VQxsPRB/lV/9jh7cUcS0/9mggLYrDy
+cq1v7rLLQrWuxMz1E3gOhyCYJ38CAwEAAaNQME4wHQYDVR0OBBYEFHEPkNAdOa2k
+MUoM6Ix/kUCLq99vMB8GA1UdIwQYMBaAFHEPkNAdOa2kMUoM6Ix/kUCLq99vMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABrhjnWC6b+z9Kw73C/niOwo
+9sPdufjS6tb0sCwDjt3mjvE4NdNWt+/+ZOugW6dqtvqhtqZM1q0u9pJkNwIrqgFD
+ZHcfNaf31G6Z2YE+Io7woTVw6fFobg/EFo+a/qwbvWL26McmiRL5yiSBjVjpX4a5
+kdZ+aPQUCBaLrTWwlCDqzSVIULWUQvveRWbToMFKPNID58NtEpymAx3Pgir7YjV9
+UnlU2l5vZrh1PTCqZxvC/IdRESUfW80LdHaeyizRUP+6vKxGgSz2MRuYINjbd6GO
+hGiCpWlwziW2xLV1l2qSRLko2kIafLZP18N0ThM9zKbU5ps9NgFOf//wqSGtLaE=
+-----END CERTIFICATE-----
diff --git a/tests/standalone_2/io/certificates/server_chain_malformed1.pem b/tests/standalone_2/io/certificates/server_chain_malformed1.pem
new file mode 100644
index 00000000000..cb623fdc705
--- /dev/null
+++ b/tests/standalone_2/io/certificates/server_chain_malformed1.pem
@@ -0,0 +1,6 @@
+MIIDZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDDBVpbnRl
+cm1lZGlhdGVhdXRob3JpdHkwHhcNMTUxMDI3MTAyNjM1WhcNMjUxMDI0MTAyNjM1
+WjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCkg/Qr8RQeLTOSgCkyiEX2ztgkgscX8hKGHEHdvlkmVK3JVEIIwkvu
+/Y9LtHZUia3nPAgqEEbexzTENZjSCcC0V6I2XW/e5tIE3rO0KLZyhtZhN/2SfJ6p
+KbOh0HLr1VtkKJGp1tzUmHW/aZI32pK60ZJ/N917NLPCJpCaL8+wHo3+w3oNqln6
diff --git a/tests/standalone_2/io/certificates/server_chain_malformed2.pem b/tests/standalone_2/io/certificates/server_chain_malformed2.pem
new file mode 100644
index 00000000000..978c523c0de
--- /dev/null
+++ b/tests/standalone_2/io/certificates/server_chain_malformed2.pem
@@ -0,0 +1,41 @@
+MIIDZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDDBVpbnRl
+cm1lZGlhdGVhdXRob3JpdHkwHhcNMTUxMDI3MTAyNjM1WhcNMjUxMDI0MTAyNjM1
+WjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCkg/Qr8RQeLTOSgCkyiEX2ztgkgscX8hKGHEHdvlkmVK3JVEIIwkvu
+/Y9LtHZUia3nPAgqEEbexzTENZjSCcC0V6I2XW/e5tIE3rO0KLZyhtZhN/2SfJ6p
+KbOh0HLr1VtkKJGp1tzUmHW/aZI32pK60ZJ/N917NLPCJpCaL8+wHo3+w3oNqln6
+oJsfgxy9SUM8Bsc9WMYKMUdqLO1QKs1A5YwqZuO7Mwj+4LY2QDixC7Ua7V9YAPo2
+1SBeLvMCHbYxSPCuxcZ/kDkgax/DF9u7aZnGhMImkwBka0OQFvpfjKtTIuoobTpe
+PAG7MQYXk4RjnjdyEX/9XAQzvNo1CDObAgMBAAGjgbQwgbEwPAYDVR0RBDUwM4IJ
+bG9jYWxob3N0ggkxMjcuMC4wLjGCAzo6MYcEfwAAAYcQAAAAAAAAAAAAAAAAAAAA
+ATAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSvhJo6taTggJQBukEvMo/PDk8tKTAf
+BgNVHSMEGDAWgBS98L4T5RaIToE3DkBRsoeWPil0eDAOBgNVHQ8BAf8EBAMCA6gw
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAHLOt0mL2S4A
+B7vN7KsfQeGlVgZUVlEjem6kqBh4fIzl4CsQuOO8oJ0FlO1z5JAIo98hZinymJx1
+phBVpyGIKakT/etMH0op5evLe9dD36VA3IM/FEv5ibk35iGnPokiJXIAcdHd1zam
+YaTHRAnZET5S03+7BgRTKoRuszhbvuFz/vKXaIAnVNOF4Gf2NUJ/Ax7ssJtRkN+5
+UVxe8TZVxzgiRv1uF6NTr+J8PDepkHCbJ6zEQNudcFKAuC56DN1vUe06gRDrNbVq
+2JHEh4pRfMpdsPCrS5YHBjVq/XHtFHgwDR6g0WTwSUJvDeM4OPQY5f61FB0JbFza
+PkLkXmoIod8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDLjCCAhagAwIBAgIBAjANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1yb290
+YXV0aG9yaXR5MB4XDTE1MTAyNzEwMjYzNVoXDTI1MTAyNDEwMjYzNVowIDEeMBwG
+A1UEAwwVaW50ZXJtZWRpYXRlYXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA6GndRFiXk+2q+Ig7ZOWKKGta+is8137qyXz+eVFs5sA0ajMN
+ZBAMWS0TIXw/Yks+y6fEcV/tfv91k1eUN4YXPcoxTdDF97d2hO9wxumeYOMnQeDy
+VZVDKQBZ+jFMeI+VkNpMEdmsLErpZDGob/1dC8tLEuR6RuRR8X6IDGMPOCMw1jLK
+V1bQjPtzqKadTscfjLuKxuLgspJdTrzsu6hdcl1mm8K6CjTY2HNXWxs1yYmwfuQ2
+Z4/8sOMNqFqLjN+ChD7pksTMq7IosqGiJzi2bpd5f44ek/k822Y0ATncJHk4h1Z+
+kZBnW6kgcLna1gDri9heRwSZ+M8T8nlHgIMZIQIDAQABo3sweTASBgNVHRMBAf8E
+CDAGAQH/AgEAMB0GA1UdDgQWBBS98L4T5RaIToE3DkBRsoeWPil0eDAfBgNVHSME
+GDAWgBRxD5DQHTmtpDFKDOiMf5FAi6vfbzAOBgNVHQ8BAf8EBAMCAgQwEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAD+4KpUeV5mUPw5IG/7w
+eOXnUpeS96XFGuS1JuFo/TbgntPWSPyo+rD4GrPIkUXyoHaMCDd2UBEjyGbBIKlB
+NZA3RJOAEp7DTkLNK4RFn/OEcLwG0J5brL7kaLRO4vwvItVIdZ2XIqzypRQTc0MG
+MmF08zycnSlaN01ryM67AsMhwdHqVa+uXQPo8R8sdFGnZ33yywTYD73FeImXilQ2
+rDnFUVqmrW1fjl0Fi4rV5XI0EQiPrzKvRtmF8ZqjGATPOsRd64cwQX6V+P5hNeIR
+9pba6td7AbNGausHfacRYMyoGJWWWkFPd+7jWOCPqW7Fk1tmBgdB8GzXa3inWIRM
+RUE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
diff --git a/tests/standalone_2/io/certificates/server_key.p12 b/tests/standalone_2/io/certificates/server_key.p12
new file mode 100644
index 00000000000..204d42d2943
Binary files /dev/null and b/tests/standalone_2/io/certificates/server_key.p12 differ
diff --git a/tests/standalone_2/io/certificates/server_key.pem b/tests/standalone_2/io/certificates/server_key.pem
new file mode 100644
index 00000000000..895b7d2be15
--- /dev/null
+++ b/tests/standalone_2/io/certificates/server_key.pem
@@ -0,0 +1,29 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE4zAcBgoqhkiG9w0BDAEBMA4ECBMCjlg8JYZ4AgIIAASCBMFd9cBoZ5xcTock
+AVQcg/HzYJtMceKn1gtMDdC7mmXuyN0shoxhG4BpQInHkFARL+nenesXFxEm4X5e
+L603Pcgw72/ratxVpTW7hPMjiLTEBqza0GjQm7Sarbdy+Vzdp/6XFrAcPfFl1juY
+oyYzbozPsvFHz3Re44y1KmI4HAzU/qkjJUbNTTiPPVI2cDP6iYN2XXxBb1wwp8jR
+iqdZqFG7lU/wvPEbD7BVPpmJBHWNG681zb4ea5Zn4hW8UaxpiIBiaH0/IWc2SVZd
+RliAFo3NEsGxCcsnBo/n00oudGbOJxdOp7FbH5hJpeqX2WhCyJRxIeHOWmeuMAet
+03HFriiEmJ99m2nEJN1x0A3QUUM7ji6vZAb4qb1dyq7LlX4M2aaqixRnaTcQkapf
+DOxX35DEBXSKrDpyWp6Rx4wNpUyi1TKyhaVnYgD3Gn0VfC/2w86gSFlrf9PMYGM0
+PvFxTDzTyjOuPBRa728gZOGXgDOL7qvdInU/opVew7kFeRQHXxHzFCLK5dD+Vrig
+5fS3m0++f55ODkxqHXB8gbXbd3GMmsW6MrGpU7VsCNtbVPdSMW0FalovEB0M+2lj
+1VfuvL+0F5huTe+BgZAt6xgET/CIcZXdNMRPVhraqUjqWtI9Rdk4STPCpU1rDkjG
+YDl/fo4W2T6qQWFUpiC9IvVVGkVxaqfZZ4Qu+V5xPUi6vk95QiTNkN1t+m+sCCgS
+Llkea8Um0aHMy33Lj3NsfL0LMrnpniqcAks8BvcgIZwk1VRqcj7BQVCygJSYrmAR
+DBhMpjWlXuSggnyVPuduZDtnTN+8lCHLOKL3a3bDb6ySaKX49Km6GutDLfpDtEA0
+3mQvmEG4XVm7zy+AlN72qFbtSLDRi/D/uQh2q/ZrFQLOBQBQB56TvEbKouLimUDM
+ascQA3aUyhOE7e+d02NOFIFTozwc/C//CIFeA+ZEwxyfha/3Bor6Jez7PC/eHNxZ
+w7YMXzPW9NhcCcerhYGebuCJxLwzqJ+IGdukjKsGV2ytWDoB2xZiJNu096j4RKcq
+YSJoen0R7IH8N4eDujXR8m9kAl724Uqs1OoAs4VNICvzTutbsgVZ6Z+NMOcfnPw9
+jZkFhot16w8znD+OmhBR7/bzOLpaeUhk7EhNq5M6U0NNWx3WwkDlvU/jx+6/EQe3
+iLEHptH2HYBF1xscaKGbtKNtuQsfdzgWpOX0qK2YbK3yCKvL/xIm1DQmDZDKkWdW
+VNh8oGV1H96CivWlvxhAgXKz9F/83CjMw8YXRk7RJvWR4vtNvXFAvGkFIYCN9Jv9
+p+1ukaYoxSLGBik907I6gWSHqumJiCprUyAX/bVfZfNiYh4hzeA3lhwxZSax3JG4
+7QFPvyepOmF/3AAzS/Pusx6jOZnuCMCkfQi6Wpem1o3s4x+fP7kz00Xuj01ErucM
+S10ixfIh84kXBN3dTRDtDdeCyoMsBKO0W5jDBBlWL02YfdF6Opo1Q4cPh2DYgXMh
+XEszNZSK5LB0y+f3A6Kdx/hkZzHVvMONA70OyrkoZzGyWENhcB0c7ntTJyPPD2qM
+s0HRA2VwF/0ypU3OKERM1Ua5NSkTgvnnVTlV9GO90Tkn5v4fxdl8NzIuJLyGguTP
+Xc0tRM34Lg==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/standalone_2/io/certificates/server_trusted.pem b/tests/standalone_2/io/certificates/server_trusted.pem
new file mode 100644
index 00000000000..b943cf9a7ba
--- /dev/null
+++ b/tests/standalone_2/io/certificates/server_trusted.pem
@@ -0,0 +1,57 @@
+-----BEGIN CERTIFICATE-----
+MIIDLjCCAhagAwIBAgIBAjANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1yb290
+YXV0aG9yaXR5MB4XDTE1MTAyNzEwMjYzNVoXDTI1MTAyNDEwMjYzNVowIDEeMBwG
+A1UEAwwVaW50ZXJtZWRpYXRlYXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA6GndRFiXk+2q+Ig7ZOWKKGta+is8137qyXz+eVFs5sA0ajMN
+ZBAMWS0TIXw/Yks+y6fEcV/tfv91k1eUN4YXPcoxTdDF97d2hO9wxumeYOMnQeDy
+VZVDKQBZ+jFMeI+VkNpMEdmsLErpZDGob/1dC8tLEuR6RuRR8X6IDGMPOCMw1jLK
+V1bQjPtzqKadTscfjLuKxuLgspJdTrzsu6hdcl1mm8K6CjTY2HNXWxs1yYmwfuQ2
+Z4/8sOMNqFqLjN+ChD7pksTMq7IosqGiJzi2bpd5f44ek/k822Y0ATncJHk4h1Z+
+kZBnW6kgcLna1gDri9heRwSZ+M8T8nlHgIMZIQIDAQABo3sweTASBgNVHRMBAf8E
+CDAGAQH/AgEAMB0GA1UdDgQWBBS98L4T5RaIToE3DkBRsoeWPil0eDAfBgNVHSME
+GDAWgBRxD5DQHTmtpDFKDOiMf5FAi6vfbzAOBgNVHQ8BAf8EBAMCAgQwEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAD+4KpUeV5mUPw5IG/7w
+eOXnUpeS96XFGuS1JuFo/TbgntPWSPyo+rD4GrPIkUXyoHaMCDd2UBEjyGbBIKlB
+NZA3RJOAEp7DTkLNK4RFn/OEcLwG0J5brL7kaLRO4vwvItVIdZ2XIqzypRQTc0MG
+MmF08zycnSlaN01ryM67AsMhwdHqVa+uXQPo8R8sdFGnZ33yywTYD73FeImXilQ2
+rDnFUVqmrW1fjl0Fi4rV5XI0EQiPrzKvRtmF8ZqjGATPOsRd64cwQX6V+P5hNeIR
+9pba6td7AbNGausHfacRYMyoGJWWWkFPd+7jWOCPqW7Fk1tmBgdB8GzXa3inWIRM
+RUE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC+zCCAeOgAwIBAgIBATANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1yb290
+YXV0aG9yaXR5MB4XDTE1MTAyNzEwMjYzNFoXDTI1MTAyNDEwMjYzNFowGDEWMBQG
+A1UEAwwNcm9vdGF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMl+dcraUM/E7E6zl7+7hK9oUJYXJLnfiMtP/TRFVbH4+2aEN8vXzPbzKdR3
+FfaHczXQTwnTCaYA4u4uSDvSOsFFEfxEwYORsdKmQEM8nGpVX2NVvKsMcGIhh8kh
+ZwJfkMIOcAxmGIHGdMhF8VghonJ8uGiuqktxdfpARq0g3fqIjDHsF9/LpfshUfk9
+wsRyTF0yr90U/dsfnE+u8l7GvVl8j2Zegp0sagAGtLaNv7tP17AibqEGg2yDBrBN
+9r9ihe4CqMjx+Q2kQ2S9Gz2V2ReO/n6vm2VQxsPRB/lV/9jh7cUcS0/9mggLYrDy
+cq1v7rLLQrWuxMz1E3gOhyCYJ38CAwEAAaNQME4wHQYDVR0OBBYEFHEPkNAdOa2k
+MUoM6Ix/kUCLq99vMB8GA1UdIwQYMBaAFHEPkNAdOa2kMUoM6Ix/kUCLq99vMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABrhjnWC6b+z9Kw73C/niOwo
+9sPdufjS6tb0sCwDjt3mjvE4NdNWt+/+ZOugW6dqtvqhtqZM1q0u9pJkNwIrqgFD
+ZHcfNaf31G6Z2YE+Io7woTVw6fFobg/EFo+a/qwbvWL26McmiRL5yiSBjVjpX4a5
+kdZ+aPQUCBaLrTWwlCDqzSVIULWUQvveRWbToMFKPNID58NtEpymAx3Pgir7YjV9
+UnlU2l5vZrh1PTCqZxvC/IdRESUfW80LdHaeyizRUP+6vKxGgSz2MRuYINjbd6GO
+hGiCpWlwziW2xLV1l2qSRLko2kIafLZP18N0ThM9zKbU5ps9NgFOf//wqSGtLaE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDKjCCAhKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9jbGll
+bnRhdXRob3JpdHkwHhcNMTUxMDI3MTAyNjM1WhcNMjUxMDI0MTAyNjM1WjAaMRgw
+FgYDVQQDEw9jbGllbnRhdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCi6wJAs6nppNmTZ3e/wE9l0pAmkMtDONwB9o115XXTG3rmSKfZOxa8
+TFjSn818Pr1OYb9fPdI1Y6x4WY9PELUtQyEBlNcKjwg96vhrP4p2DhqbWsI5nASH
+DSjJsM75bQ7D7qHYzriuAl0Fk1C4LcodRj+5wmErMtvGJG0x06qFbxCCMAJ2kC+h
+SneTN955/YHSXADgxjFlt3s1T0QPnqrr+G7Ro6PrVKLPBulglq7wAeTwrGkPRUt0
+3lDGOSi6i97NbpiXwrGp5XiLUtVCiID6Ro0xKWH4sjJ4JnVjIUG8CQWERc6sFDJM
+4adgFQJagkTUoxWtDGL58+WcbcJa73XJAgMBAAGjezB5MBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFLciwbnjKDIu026K0bzOwp8DokkOMB8GA1UdIwQYMBaA
+FLciwbnjKDIu026K0bzOwp8DokkOMA4GA1UdDwEB/wQEAwICBDATBgNVHSUEDDAK
+BggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAh8rryWFoGjFdm0i4FLRktF8B
+aUqVCCpFVHIYlFcsQstznIb01X2Zq5nfSfrFxbr5STVGzGJ0HGDuFpicT8+qMnJX
+dou5AuaqubIDWeKL+oAgvI71Nt1gsesixqzFQAoCTRgUjrSGpY2fL7rElV0Ndy9b
+YepVouktP1/GULc8XbIG9ZLx70Id7YTyrITDgbH3hSnbjmmZSr9RKyKas4MXN0s8
+oKGHEgAx7KyNQRppjydz3bDeH/jVbM4W98vwL6rjKUJlOlo0Ru+3+oioFHqLMSvN
+w4f5rQEiuF260h7y8KKxRxQ8rw188gsBapZr4Rcp+y8gdQvlzJONtv3d1dap5A==
+-----END CERTIFICATE-----
diff --git a/tests/standalone_2/io/certificates/trusted_certs.p12 b/tests/standalone_2/io/certificates/trusted_certs.p12
new file mode 100644
index 00000000000..76c76ec17b0
Binary files /dev/null and b/tests/standalone_2/io/certificates/trusted_certs.p12 differ
diff --git a/tests/standalone_2/io/certificates/trusted_certs.pem b/tests/standalone_2/io/certificates/trusted_certs.pem
new file mode 100644
index 00000000000..8b5bf3e7e29
--- /dev/null
+++ b/tests/standalone_2/io/certificates/trusted_certs.pem
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC+zCCAeOgAwIBAgIBATANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1yb290
+YXV0aG9yaXR5MB4XDTE1MTAyNzEwMjYzNFoXDTI1MTAyNDEwMjYzNFowGDEWMBQG
+A1UEAwwNcm9vdGF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMl+dcraUM/E7E6zl7+7hK9oUJYXJLnfiMtP/TRFVbH4+2aEN8vXzPbzKdR3
+FfaHczXQTwnTCaYA4u4uSDvSOsFFEfxEwYORsdKmQEM8nGpVX2NVvKsMcGIhh8kh
+ZwJfkMIOcAxmGIHGdMhF8VghonJ8uGiuqktxdfpARq0g3fqIjDHsF9/LpfshUfk9
+wsRyTF0yr90U/dsfnE+u8l7GvVl8j2Zegp0sagAGtLaNv7tP17AibqEGg2yDBrBN
+9r9ihe4CqMjx+Q2kQ2S9Gz2V2ReO/n6vm2VQxsPRB/lV/9jh7cUcS0/9mggLYrDy
+cq1v7rLLQrWuxMz1E3gOhyCYJ38CAwEAAaNQME4wHQYDVR0OBBYEFHEPkNAdOa2k
+MUoM6Ix/kUCLq99vMB8GA1UdIwQYMBaAFHEPkNAdOa2kMUoM6Ix/kUCLq99vMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABrhjnWC6b+z9Kw73C/niOwo
+9sPdufjS6tb0sCwDjt3mjvE4NdNWt+/+ZOugW6dqtvqhtqZM1q0u9pJkNwIrqgFD
+ZHcfNaf31G6Z2YE+Io7woTVw6fFobg/EFo+a/qwbvWL26McmiRL5yiSBjVjpX4a5
+kdZ+aPQUCBaLrTWwlCDqzSVIULWUQvveRWbToMFKPNID58NtEpymAx3Pgir7YjV9
+UnlU2l5vZrh1PTCqZxvC/IdRESUfW80LdHaeyizRUP+6vKxGgSz2MRuYINjbd6GO
+hGiCpWlwziW2xLV1l2qSRLko2kIafLZP18N0ThM9zKbU5ps9NgFOf//wqSGtLaE=
+-----END CERTIFICATE-----
diff --git a/tests/standalone_2/io/certificates/trusted_certs_malformed.pem b/tests/standalone_2/io/certificates/trusted_certs_malformed.pem
new file mode 100644
index 00000000000..f96698ef008
--- /dev/null
+++ b/tests/standalone_2/io/certificates/trusted_certs_malformed.pem
@@ -0,0 +1,8 @@
+MIIC+zCCAeOgAwIBAgIBATANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1yb290
+YXV0aG9yaXR5MB4XDTE1MTAyNzEwMjYzNFoXDTI1MTAyNDEwMjYzNFowGDEWMBQG
+A1UEAwwNcm9vdGF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMl+dcraUM/E7E6zl7+7hK9oUJYXJLnfiMtP/TRFVbH4+2aEN8vXzPbzKdR3
+FfaHczXQTwnTCaYA4u4uSDvSOsFFEfxEwYORsdKmQEM8nGpVX2NVvKsMcGIhh8kh
+ZwJfkMIOcAxmGIHGdMhF8VghonJ8uGiuqktxdfpARq0g3fqIjDHsF9/LpfshUfk9
+wsRyTF0yr90U/dsfnE+u8l7GvVl8j2Zegp0sagAGtLaNv7tP17AibqEGg2yDBrBN
+a
diff --git a/tests/standalone_2/io/certificates/untrusted_server_chain.pem b/tests/standalone_2/io/certificates/untrusted_server_chain.pem
new file mode 100644
index 00000000000..ff6e5685edd
--- /dev/null
+++ b/tests/standalone_2/io/certificates/untrusted_server_chain.pem
@@ -0,0 +1,59 @@
+-----BEGIN CERTIFICATE-----
+MIIDZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDDBVpbnRl
+cm1lZGlhdGVhdXRob3JpdHkwHhcNMTUxMDE5MTE1NTEyWhcNMjUxMDE2MTE1NTEy
+WjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDca2l3VIWhnlTqazrA07hiHjgXACUYS/nVox+a2Jar383kBz2kzN6B
+u4K7IwD2msym2IOBp1YT9OKPh9/KkSGvpPelu7ToCoehala32W+0ozh53CR8IpzQ
+tmh7J9oHtN2PcbLgEzHfAWyrY3xp9RpWUONjxoG8xXPedNsZL0Rj65Z3fKAjOypl
++XJsgrqrNNAi3x0OMdhextMmLrYl+YQjgdND8UpykTSc8Q0vwngDZuLH/Nhx0cAA
+Ade0ZfXS6snwWVxrWke+zGF6yANoiV00gsBhq+WZZ50SmE2mz5LT9uj4t5WpcOI/
+2TlbV9HSjdOEAFD8cJIrK5FkEmz383E1AgMBAAGjgbQwgbEwPAYDVR0RBDUwM4IJ
+bG9jYWxob3N0ggkxMjcuMC4wLjGCAzo6MYcEfwAAAYcQAAAAAAAAAAAAAAAAAAAA
+ATAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQO+6Atr6tkTBmPasN4oTDUlbxQ1zAf
+BgNVHSMEGDAWgBRrkK4hOni2neySWQNmMfb9imn/+DAOBgNVHQ8BAf8EBAMCA6gw
+EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBACdVUzrhfXoW
+wG0zI9aT6CxD7T0i0WK4fC6Yrx0Pqz53xnuiwBfvuAJ/PRXKYsJMxa2LuHGJKU/A
+nImCXGJHoUwL6x4Eor6fg7L9nPNqtIrQ6tzubxNtVPpLj4tK6Ps3IM+FICYUSX0b
+FLSfnv74afUp/2+0OHsoUVsL1rCTO2WgEkEShLERdJvdcvUSTWHfC5IQORS9vfzG
++cZGOOPebfm8TY2DJxMYj/t7CHs1Sk550x590sKb/prwtJAYtQxGe7v0m9rihiM3
+dFKZiNh99yXbQ1ELYyhkFP8WAdK8ZTnynGqgAYJmV89Dg8k2uU8z+dahlE3foORD
+Y/Gn0CZE1NY=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDLjCCAhagAwIBAgIBATANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1yb290
+YXV0aG9yaXR5MB4XDTE1MTAxOTExNTUxMloXDTI1MTAxNjExNTUxMlowIDEeMBwG
+A1UEAwwVaW50ZXJtZWRpYXRlYXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA1OV9iea75DPQ18NppXxEFW26J7IfjUvp4wVnj9m7pOhsByqd
+wwS6hpjlkpEwCyugKD/t7u/VGwp2BB+BeaX7FPj6rnYY82bOJQlyB/vvDmOZfAe2
+84ug9O7QcsQHSQ7YQFuvYKaeYCKdrGjzQPVYkoVdv2js2dYTDG3QSIxpbi305Vef
+ia6Zfs5CAW/SfL36+ETo2pXNlD1ZBGRL8H3z+mMnIEj1Tbaipf+1Npr2l3xqIs1k
+RWsM3X+9xMkWGyvsDdbLIGiTTVxM9kOF0aNLdQIKb2tZsg4jRrFIgiO+5TXwp0FW
+4ldc5/GhtaoPDcsIALyIQc7CJ/PpPm9hnxIy7QIDAQABo3sweTASBgNVHRMBAf8E
+CDAGAQH/AgEAMB0GA1UdDgQWBBRrkK4hOni2neySWQNmMfb9imn/+DAfBgNVHSME
+GDAWgBRpz+jRK9iGqijrL/4WCsGsIjxoETAOBgNVHQ8BAf8EBAMCAgQwEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBACcwiLJUPzYGIeGIYGlo
+XlP4++adiPlXvsyTxLdGVSFWJMBV5EhtiXQXaUsOs2PyC7SWxiiUdAgE8Y2tMsF3
+Bh5LY/kKxZQXZuFa+RN1kPlhlYJWdiPyqcBziSPFBtqwudWLDUVSaVAQDhYYVB3K
+5+pFaeQKfhYmPvJKR9U2nTvukOhN1fZM8GUBnm2uaiA3giQ0wxXyQIuqC9S52qbh
+x4D4ZdbshQAgThPkHBoZVmd/NF1TNzitZZy7uaU7GpGrS1dcevN7pEUwm3+KIkIT
+AOSLB2FbFOwPUg6a/lWkFPotT3gl0tdyCaqkfneGCHzVciT0JTS/AqpdYEtuxEMe
+PJk=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC+zCCAeOgAwIBAgIBATANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA1yb290
+YXV0aG9yaXR5MB4XDTE1MTAxOTExNTUxMloXDTI1MTAxNjExNTUxMlowGDEWMBQG
+A1UEAwwNcm9vdGF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMDzkcftGzdNJz5vXEAZSCAO2J6bCPz896pK3qtaViR/aF8I2vHZQm0IEoJc
+Y1NUMF3F50d6fMYCkEoORAkC0d7iAwTprhBdIg35+TxwGObcStrohDtEgwFmFRzg
+LtYeXiU0t0dBWOOQ9k2f9VGqbzKwZ2dbhOHSTXMTFoEcMStbeFc++oiOLY+QSq/J
+Xd/BXqvwVM3Mt+OwLvyUu45Kw18ENo77qubIPJUwoyaf+N2nFRqcc7bmNy0Wvk2Q
+StvQXy6DpN3KOoZx/sR7Ff8hYuHXcxbSsJ1hOO+tIJyOZyEJvU2BBOYVlKr4E4JU
+mkex0CM1IfIFqfcEkbvjwLjaojsCAwEAAaNQME4wHQYDVR0OBBYEFGnP6NEr2Iaq
+KOsv/hYKwawiPGgRMB8GA1UdIwQYMBaAFGnP6NEr2IaqKOsv/hYKwawiPGgRMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJKl4RCEaXwtosNeurZlS3b9
+owXdsXDRdnfEawcc//AbRkrS4bHCQyOJNp/3DibEKkeAXCJrJ5cvXRjE5gb3Q+rl
+0AqziLY15xuMAxUK3zv0e8Zir21PQzQ9x8zbmlucEoT/jn7KvMSSqfEoer77cXev
+BpmQDQzE3FNgKohmHIzIDoTPiU3ahv6x8IhJ1e47UmRsSPFgtqglHcdCYIEclXpY
+bHvctT6+pFZuJfIs9+BATMXPJWSX7NhlMcnyP+xdDxDKuF/nwVFy6xA+njuWnnZT
+TyiGCnx+u/VpKzOrwMfzv2DW8Db80UERoox5n6QNQLnXNWPMddUL92/p9lMzWJY=
+-----END CERTIFICATE-----
diff --git a/tests/standalone_2/io/certificates/untrusted_server_key.pem b/tests/standalone_2/io/certificates/untrusted_server_key.pem
new file mode 100644
index 00000000000..29a9e327c8f
--- /dev/null
+++ b/tests/standalone_2/io/certificates/untrusted_server_key.pem
@@ -0,0 +1,29 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE5TAcBgoqhkiG9w0BDAEBMA4ECKAry4fwmB/TAgIIAASCBMNsKbVVvIs/l6/N
+/1J9WXSiA1gnRTd2n58GJUV6mkiaRUMiWu3fK+V7iHpIi7KeLeD+JGsDeqxw0bB5
+lmS/RJy0wNBP0PL0oiI8VUe3wxTUU2b5wW9fomeOTGWOIUL5VZXHkTCf5KMcFWMY
+GMnDpIN/f/m9zvz/3FogxIZlIAxG7gKKrfEcKExIShAJ5wYDbDSFZWfNcjMODGPn
+xz3W04aRsJGf3KlOQvSuNtcBpsuwXuAXezzuFETM20xrWW3iJIsO5UmqJ1OJcdet
+A+k5k0K+1/WwLkceWJYSd19O+7LNULsZhKUJ515ZSO1TJGgfd5DznkgRXYUx5ucS
+tvJLYvShGbaYulsVKn8q2nkIxnQCov3my1hIRk/qCKb+uOvRD9dIkjSlNubqaRb6
+geEOfTh1g5PCeKPlSTkVueLQqWxKMye4eWYqUxExkUNuGJ0d2ndBGJRo6bulnc7I
+kt44DzEufV5OLvyTufimpohqRm3Yzq87DWSSThCKOGkhfGutn8B7cJR8ZPrG2euT
+J7Bv4EuFjhpKDieqDi8yoXgIkWSgyzFNMsewV4lxFNP/wbvoKPFrKsU4ny6jRfzy
+WTjMN1UOTBvsyZbVvjLII79cBKLqlowHAZQ7YwuxtbjeB9FRH+ZwkzYeyn4GNHdf
+QoVwOMKAiOMjzAK9qdW7isVXy/7v9EXaZplRmwMRhCZevC9zeY2Rueahq8qpHpH1
+GPjrew5elPkBRQhxX6IiL7kI7upE65UI5hnnTnrdrZkRmMYOFEZLyLbTU4wMCxui
+4BmEiGp6qCWe3UND1b8YhG+gsRYzHK5oEJV+Ck7m+e9iU3/axggUfAhZeBmdlgqd
+bUajlzcgbtfaSgZ08XXU1YPw0aLlmJGzb+oWMFwBJHAUYpOV2uqDHiXZZt4SoAF9
+gJQaXvqMGzY8JyP5ZQauljVtPGcopA+jbix3Rbwf97lLqJHSpWoHpcCa6FrfaMqG
+dx8oQsO67WN0gm5DIN3kB2jHOj9Nf7kr3HGjyC5tPq8s1+aT6baZcHWzVfyVr10c
+9X13Pz5XzEa1oiaO7JDPkzb9T7aPJZwskATNB8h6tWfqdGyUY5eURtsCnVrtG/1p
+pAXyY/0vAksfDPjMChKLKxZ7rBbscoNzr2f7Vw4CTnIpaxA4eLEx6UdpG4/5RzYJ
+0YuR+SzCkuNti7uZGi9DCGkZkYl6VndatW+Pk/+JVBexdKt6MsER6aVsS8ev9UbW
+JG+2C8bjMlfKy21644KwYOtZbVcE9jwlsz8w+e6YbOzBvbwiPmoCi0xcMxRJPa2y
+cKMrs2hSKmhUP6uIH0b0qNcHEPA32mVzGC0MToC5R+yb6OdyvoEsisqS7tEAMfTJ
+0yowcZr2lPehaMr4efSB8JY6DuofitfgI6X6bmiIPQ9v//djxhkxkRAbpTRGmFZx
+1YIKDa72S8jUxHWlVvmoqTWI8T+jltF2pYBctS6IMKEot/CcBCHb5l1zfMyo5a0x
+73ooh5tq+vRWJGaLRMj66VVSWGQoJmfAGwWpjBpTLa0UQoHO0/J1IbfjFOj5HV3J
+bscmoGWhVwuJM5ActB0MOvXGQe9mf2X4p/1Rp+yBuipH1SJzFEzbOZ3kE50Z6aXH
+CoJJOKkcuf43
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/standalone/io/code_collection_test.dart b/tests/standalone_2/io/code_collection_test.dart
similarity index 100%
rename from tests/standalone/io/code_collection_test.dart
rename to tests/standalone_2/io/code_collection_test.dart
diff --git a/tests/standalone/io/compile_all_test.dart b/tests/standalone_2/io/compile_all_test.dart
similarity index 100%
rename from tests/standalone/io/compile_all_test.dart
rename to tests/standalone_2/io/compile_all_test.dart
diff --git a/tests/standalone/io/console_unicode_test.dart b/tests/standalone_2/io/console_unicode_test.dart
similarity index 80%
rename from tests/standalone/io/console_unicode_test.dart
rename to tests/standalone_2/io/console_unicode_test.dart
index db89abd0963..7284b5fa681 100644
--- a/tests/standalone/io/console_unicode_test.dart
+++ b/tests/standalone_2/io/console_unicode_test.dart
@@ -5,6 +5,10 @@
 import 'dart:convert';
 import 'dart:io';
 
+// This test ensures that the VM will support string literals that have non
+// ascii characters. An unhandeld exception will be thrown if the VM fails
+// to support non ascii characters.
+
 main() {
   String canary = "Canary";
   String spades = "These are three black spades: â™ â™ â™ ";
diff --git a/tests/standalone/io/create_recursive_test.dart b/tests/standalone_2/io/create_recursive_test.dart
similarity index 100%
rename from tests/standalone/io/create_recursive_test.dart
rename to tests/standalone_2/io/create_recursive_test.dart
diff --git a/tests/standalone/io/dart_std_io_pipe_script.dart b/tests/standalone_2/io/dart_std_io_pipe_script.dart
similarity index 100%
rename from tests/standalone/io/dart_std_io_pipe_script.dart
rename to tests/standalone_2/io/dart_std_io_pipe_script.dart
diff --git a/tests/standalone/io/dart_std_io_pipe_test.dart b/tests/standalone_2/io/dart_std_io_pipe_test.dart
similarity index 91%
rename from tests/standalone/io/dart_std_io_pipe_test.dart
rename to tests/standalone_2/io/dart_std_io_pipe_test.dart
index 83c0f97f027..0f08e82ab8e 100644
--- a/tests/standalone/io/dart_std_io_pipe_test.dart
+++ b/tests/standalone_2/io/dart_std_io_pipe_test.dart
@@ -23,7 +23,7 @@ void checkFileEmpty(String fileName) {
 void checkFileContent(String fileName, String content) {
   RandomAccessFile pipeOut = new File(fileName).openSync();
   int length = pipeOut.lengthSync();
-  List data = new List<int>(length);
+  var data = new List<int>(length);
   pipeOut.readIntoSync(data, 0, length);
   Expect.equals(content, new String.fromCharCodes(data));
   pipeOut.closeSync();
@@ -105,15 +105,16 @@ main() {
 
   // Get the shell script for testing the Standalone Dart VM with
   // piping and redirections of stdio.
-  var shellScript = new File("tests/standalone/io/dart_std_io_pipe_test.sh");
+  var shellScript = new File("tests/standalone_2/io/dart_std_io_pipe_test.sh");
   if (!shellScript.existsSync()) {
-    shellScript = new File("../tests/standalone/io/dart_std_io_pipe_test.sh");
+    shellScript = new File("../tests/standalone_2/io/dart_std_io_pipe_test.sh");
   }
   // Get the Dart script file which echoes stdin to stdout or stderr or both.
-  var scriptFile = new File("tests/standalone/io/dart_std_io_pipe_script.dart");
+  var scriptFile =
+      new File("tests/standalone_2/io/dart_std_io_pipe_script.dart");
   if (!scriptFile.existsSync()) {
     scriptFile =
-        new File("../tests/standalone/io/dart_std_io_pipe_script.dart");
+        new File("../tests/standalone_2/io/dart_std_io_pipe_script.dart");
   }
 
   // Run the shell script.
diff --git a/tests/standalone_2/io/dart_std_io_pipe_test.sh b/tests/standalone_2/io/dart_std_io_pipe_test.sh
new file mode 100755
index 00000000000..7caa1edabe4
--- /dev/null
+++ b/tests/standalone_2/io/dart_std_io_pipe_test.sh
@@ -0,0 +1,17 @@
+#! /bin/bash
+
+# This script expects the following arguments
+# $1: Path to dart executable
+# $2: Path to dart echoing script
+# $3: Argument to dart echoing script (0, 1 or 2)
+# $4: File for output from piping stdout and stderr
+# $5: File prefix for output from redirecting stdout and stderr to a file.
+# $6: Stdio type of stdin
+
+# Test piping and stdio file redirection.
+echo "Hello" | $1 $2 $3 pipe pipe pipe 2>&1 | cat - > $4
+$1 $2 $3 $6 file file < $4 > $5.stdout 2> $5.stderr
+$1 $2 $3 $6 file file < $4 >> $5.stdout 2>> $5.stderr
+$1 $2 $3 $6 terminal terminal < $4 > /dev/null 2> /dev/null
+$1 $2 $3 $6 terminal pipe < $4 2>&1 > /dev/null
+$1 $2 $3 $6 terminal terminal < $4 > /dev/null 2>&1
diff --git a/tests/standalone/io/delete_symlink_test.dart b/tests/standalone_2/io/delete_symlink_test.dart
similarity index 100%
rename from tests/standalone/io/delete_symlink_test.dart
rename to tests/standalone_2/io/delete_symlink_test.dart
diff --git a/tests/standalone/io/dependency_graph_test.dart b/tests/standalone_2/io/dependency_graph_test.dart
similarity index 100%
rename from tests/standalone/io/dependency_graph_test.dart
rename to tests/standalone_2/io/dependency_graph_test.dart
diff --git a/tests/standalone/io/directory_chdir_test.dart b/tests/standalone_2/io/directory_chdir_test.dart
similarity index 100%
rename from tests/standalone/io/directory_chdir_test.dart
rename to tests/standalone_2/io/directory_chdir_test.dart
diff --git a/tests/standalone/io/directory_create_race_test.dart b/tests/standalone_2/io/directory_create_race_test.dart
similarity index 100%
rename from tests/standalone/io/directory_create_race_test.dart
rename to tests/standalone_2/io/directory_create_race_test.dart
diff --git a/tests/standalone/io/directory_error_test.dart b/tests/standalone_2/io/directory_error_test.dart
similarity index 100%
rename from tests/standalone/io/directory_error_test.dart
rename to tests/standalone_2/io/directory_error_test.dart
diff --git a/tests/standalone/io/directory_fuzz_test.dart b/tests/standalone_2/io/directory_fuzz_test.dart
similarity index 66%
rename from tests/standalone/io/directory_fuzz_test.dart
rename to tests/standalone_2/io/directory_fuzz_test.dart
index c0ce827ffc8..9d3dcae3f7f 100644
--- a/tests/standalone/io/directory_fuzz_test.dart
+++ b/tests/standalone_2/io/directory_fuzz_test.dart
@@ -16,39 +16,40 @@ import 'fuzz_support.dart';
 fuzzSyncMethods() {
   typeMapping.forEach((k, v) {
     doItSync(() {
-      doItSync(() {
-        Directory.systemTemp.createTempSync(v).deleteSync();
-      });
-      var d = new Directory(v);
-      doItSync(d.existsSync);
-      doItSync(d.createSync);
-      doItSync(d.deleteSync);
-      doItSync(d.listSync);
-      doItSync(() {
-        d.createTempSync('tempdir').deleteSync();
-      });
-      doItSync(() {
-        // Let's be a little careful. If the directory exists we don't
-        // want to delete it and all its contents.
-        if (!d.existsSync()) d.deleteSync(recursive: true);
-      });
-      typeMapping.forEach((k2, v2) {
-        doItSync(() => d.renameSync(v2));
-        doItSync(() => d.listSync(recursive: v2));
-      });
+      Directory.systemTemp.createTempSync(v).deleteSync();
+    });
+    Directory d;
+    doItSync(() => d = new Directory(v));
+    if (d == null) return;
+    doItSync(d.existsSync);
+    doItSync(d.createSync);
+    doItSync(d.deleteSync);
+    doItSync(d.listSync);
+    doItSync(() {
+      d.createTempSync('tempdir').deleteSync();
+    });
+    doItSync(() {
+      // Let's be a little careful. If the directory exists we don't
+      // want to delete it and all its contents.
+      if (!d.existsSync()) d.deleteSync(recursive: true);
+    });
+    typeMapping.forEach((k2, v2) {
+      doItSync(() => d.renameSync(v2));
+      doItSync(() => d.listSync(recursive: v2));
     });
   });
 }
 
 fuzzAsyncMethods() {
   asyncStart();
-  var futures = [];
+  var futures = <Future>[];
   typeMapping.forEach((k, v) {
     futures.add(doItAsync(() {
       Directory.systemTemp.createTempSync(v).deleteSync();
     }));
     if (v is! String) {
-      Expect.throws(() => new Directory(v), (e) => e is ArgumentError);
+      Expect.throws(() => new Directory(v),
+                    (e) => e is ArgumentError || e is TypeError);
       return;
     }
     var d = new Directory(v);
diff --git a/tests/standalone/io/directory_list_nonexistent_test.dart b/tests/standalone_2/io/directory_list_nonexistent_test.dart
similarity index 100%
rename from tests/standalone/io/directory_list_nonexistent_test.dart
rename to tests/standalone_2/io/directory_list_nonexistent_test.dart
diff --git a/tests/standalone/io/directory_list_pause_test.dart b/tests/standalone_2/io/directory_list_pause_test.dart
similarity index 100%
rename from tests/standalone/io/directory_list_pause_test.dart
rename to tests/standalone_2/io/directory_list_pause_test.dart
diff --git a/tests/standalone/io/directory_list_sync_test.dart b/tests/standalone_2/io/directory_list_sync_test.dart
similarity index 100%
rename from tests/standalone/io/directory_list_sync_test.dart
rename to tests/standalone_2/io/directory_list_sync_test.dart
diff --git a/tests/standalone/io/directory_non_ascii_sync_test.dart b/tests/standalone_2/io/directory_non_ascii_sync_test.dart
similarity index 100%
rename from tests/standalone/io/directory_non_ascii_sync_test.dart
rename to tests/standalone_2/io/directory_non_ascii_sync_test.dart
diff --git a/tests/standalone/io/directory_non_ascii_test.dart b/tests/standalone_2/io/directory_non_ascii_test.dart
similarity index 100%
rename from tests/standalone/io/directory_non_ascii_test.dart
rename to tests/standalone_2/io/directory_non_ascii_test.dart
diff --git a/tests/standalone/io/directory_test.dart b/tests/standalone_2/io/directory_test.dart
similarity index 100%
rename from tests/standalone/io/directory_test.dart
rename to tests/standalone_2/io/directory_test.dart
diff --git a/tests/standalone/io/directory_uri_test.dart b/tests/standalone_2/io/directory_uri_test.dart
similarity index 100%
rename from tests/standalone/io/directory_uri_test.dart
rename to tests/standalone_2/io/directory_uri_test.dart
diff --git a/tests/standalone/io/echo_server_stream_test.dart b/tests/standalone_2/io/echo_server_stream_test.dart
similarity index 100%
rename from tests/standalone/io/echo_server_stream_test.dart
rename to tests/standalone_2/io/echo_server_stream_test.dart
diff --git a/tests/standalone_2/io/empty_file b/tests/standalone_2/io/empty_file
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/standalone/io/file_absolute_path_test.dart b/tests/standalone_2/io/file_absolute_path_test.dart
similarity index 98%
rename from tests/standalone/io/file_absolute_path_test.dart
rename to tests/standalone_2/io/file_absolute_path_test.dart
index f8c65328f8c..bd5d97e0a2e 100644
--- a/tests/standalone/io/file_absolute_path_test.dart
+++ b/tests/standalone_2/io/file_absolute_path_test.dart
@@ -48,7 +48,6 @@ testWindows() {
 
 testPosix() {
   String current = Directory.current.path;
-  print(Directory.current.path);
   for (String relative in ['abd', '..', '.', 'efg/hij', 'abc/']) {
     if (current.endsWith('/')) {
       Expect.equals(new File(relative).absolute.path, '$current$relative');
diff --git a/tests/standalone/io/file_blocking_lock_script.dart b/tests/standalone_2/io/file_blocking_lock_script.dart
similarity index 100%
rename from tests/standalone/io/file_blocking_lock_script.dart
rename to tests/standalone_2/io/file_blocking_lock_script.dart
diff --git a/tests/standalone/io/file_blocking_lock_test.dart b/tests/standalone_2/io/file_blocking_lock_test.dart
similarity index 100%
rename from tests/standalone/io/file_blocking_lock_test.dart
rename to tests/standalone_2/io/file_blocking_lock_test.dart
diff --git a/tests/standalone_2/io/file_constructor_test.dart b/tests/standalone_2/io/file_constructor_test.dart
new file mode 100644
index 00000000000..251348b1017
--- /dev/null
+++ b/tests/standalone_2/io/file_constructor_test.dart
@@ -0,0 +1,27 @@
+// 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";
+import 'dart:io';
+
+void main() {
+  bool developerMode = false;
+  assert(developerMode = true);
+  new File('blåbærgrød');
+  new File('foo.txt');
+  try {
+    new File(null);
+    Expect.fail('ArgumentError expected.');
+  } on ArgumentError catch (e) {
+    // Expected.
+  }
+  try {
+    new File(1);
+    Expect.fail('Error expected.');
+  } on ArgumentError catch (e) {
+    if (developerMode) rethrow;
+  } on TypeError catch (e) {
+    if (!developerMode) rethrow;
+  }
+}
diff --git a/tests/standalone/io/file_copy_test.dart b/tests/standalone_2/io/file_copy_test.dart
similarity index 100%
rename from tests/standalone/io/file_copy_test.dart
rename to tests/standalone_2/io/file_copy_test.dart
diff --git a/tests/standalone/io/file_create_test.dart b/tests/standalone_2/io/file_create_test.dart
similarity index 100%
rename from tests/standalone/io/file_create_test.dart
rename to tests/standalone_2/io/file_create_test.dart
diff --git a/tests/standalone/io/file_error_test.dart b/tests/standalone_2/io/file_error_test.dart
similarity index 100%
rename from tests/standalone/io/file_error_test.dart
rename to tests/standalone_2/io/file_error_test.dart
diff --git a/tests/standalone/io/file_fuzz_test.dart b/tests/standalone_2/io/file_fuzz_test.dart
similarity index 65%
rename from tests/standalone/io/file_fuzz_test.dart
rename to tests/standalone_2/io/file_fuzz_test.dart
index 6131b005d73..4a3637ae29e 100644
--- a/tests/standalone/io/file_fuzz_test.dart
+++ b/tests/standalone_2/io/file_fuzz_test.dart
@@ -14,49 +14,49 @@ import "package:async_helper/async_helper.dart";
 
 fuzzSyncMethods() {
   typeMapping.forEach((k, v) {
-    doItSync(() {
-      var f = new File(v);
-      doItSync(f.existsSync);
-      doItSync(f.createSync);
-      doItSync(f.deleteSync);
-      doItSync(f.lengthSync);
-      doItSync(f.modifiedSync);
-      doItSync(f.fullPathSync);
-      doItSync(() => f.openRead().listen((_) {}, onError: (e) {}));
-      doItSync(f.readAsBytesSync);
-      doItSync(f.readAsStringSync);
-      doItSync(f.readAsLinesSync);
-      typeMapping.forEach((k2, v2) {
-        doItSync(() => f.openSync(mode: v2));
-        doItSync(() => f.openWrite(mode: v2));
-        doItSync(() => f.readAsStringSync(encoding: v2));
-        doItSync(() => f.readAsLinesSync(encoding: v2));
-      });
+    File f;
+    doItSync(() => f = new File(v));
+    if (f == null) return;
+    doItSync(f.existsSync);
+    doItSync(f.createSync);
+    doItSync(f.deleteSync);
+    doItSync(f.lengthSync);
+    doItSync(f.lastModifiedSync);
+    doItSync(() => f.path);
+    doItSync(() => f.openRead().listen((_) {}, onError: (e) {}));
+    doItSync(f.readAsBytesSync);
+    doItSync(f.readAsStringSync);
+    doItSync(f.readAsLinesSync);
+    typeMapping.forEach((k2, v2) {
+      doItSync(() => f.openSync(mode: v2));
+      doItSync(() => f.openWrite(mode: v2));
+      doItSync(() => f.readAsStringSync(encoding: v2));
+      doItSync(() => f.readAsLinesSync(encoding: v2));
     });
   });
 }
 
 fuzzAsyncMethods() {
   asyncStart();
-  var futures = [];
+  var futures = <Future>[];
   typeMapping.forEach((k, v) {
-    doItSync(() {
-      var f = new File(v);
-      futures.add(doItAsync(f.exists));
-      futures.add(doItAsync(f.delete));
-      futures.add(doItAsync(f.parent));
-      futures.add(doItAsync(f.length));
-      futures.add(doItAsync(f.modified));
-      futures.add(doItAsync(f.open));
-      futures.add(doItAsync(f.fullPath));
-      futures.add(doItAsync(f.readAsBytes));
-      futures.add(doItAsync(f.readAsLines));
-      futures.add(doItAsync(f.readAsString));
-      typeMapping.forEach((k2, v2) {
-        futures.add(doItAsync(() => f.open(mode: v2)));
-        futures.add(doItAsync(() => f.readAsString(encoding: v2)));
-        futures.add(doItAsync(() => f.readAsLines(encoding: v2)));
-      });
+    File f;
+    doItSync(() => f = new File(v));
+    if (f == null) return;
+    futures.add(doItAsync(f.exists));
+    futures.add(doItAsync(f.delete));
+    futures.add(doItAsync(() => f.parent));
+    futures.add(doItAsync(f.length));
+    futures.add(doItAsync(f.lastModified));
+    futures.add(doItAsync(f.open));
+    futures.add(doItAsync(() => f.path));
+    futures.add(doItAsync(f.readAsBytes));
+    futures.add(doItAsync(f.readAsLines));
+    futures.add(doItAsync(f.readAsString));
+    typeMapping.forEach((k2, v2) {
+      futures.add(doItAsync(() => f.open(mode: v2)));
+      futures.add(doItAsync(() => f.readAsString(encoding: v2)));
+      futures.add(doItAsync(() => f.readAsLines(encoding: v2)));
     });
   });
   Future.wait(futures).then((_) => asyncEnd());
@@ -91,7 +91,7 @@ fuzzAsyncRandomAccessMethods() {
   var file = new File('${temp.path}/x');
   file.createSync();
   var modes = [FileMode.READ, FileMode.WRITE, FileMode.APPEND];
-  var futures = [];
+  var futures = <Future>[];
   var openedFiles = [];
   for (var m in modes) {
     var opened = file.openSync(mode: m);
diff --git a/tests/standalone/io/file_input_stream_test.dart b/tests/standalone_2/io/file_input_stream_test.dart
similarity index 100%
rename from tests/standalone/io/file_input_stream_test.dart
rename to tests/standalone_2/io/file_input_stream_test.dart
diff --git a/tests/standalone/io/file_lock_script.dart b/tests/standalone_2/io/file_lock_script.dart
similarity index 100%
rename from tests/standalone/io/file_lock_script.dart
rename to tests/standalone_2/io/file_lock_script.dart
diff --git a/tests/standalone/io/file_lock_test.dart b/tests/standalone_2/io/file_lock_test.dart
similarity index 100%
rename from tests/standalone/io/file_lock_test.dart
rename to tests/standalone_2/io/file_lock_test.dart
diff --git a/tests/standalone/io/file_non_ascii_sync_test.dart b/tests/standalone_2/io/file_non_ascii_sync_test.dart
similarity index 100%
rename from tests/standalone/io/file_non_ascii_sync_test.dart
rename to tests/standalone_2/io/file_non_ascii_sync_test.dart
diff --git a/tests/standalone/io/file_non_ascii_test.dart b/tests/standalone_2/io/file_non_ascii_test.dart
similarity index 100%
rename from tests/standalone/io/file_non_ascii_test.dart
rename to tests/standalone_2/io/file_non_ascii_test.dart
diff --git a/tests/standalone/io/file_output_stream_test.dart b/tests/standalone_2/io/file_output_stream_test.dart
similarity index 100%
rename from tests/standalone/io/file_output_stream_test.dart
rename to tests/standalone_2/io/file_output_stream_test.dart
diff --git a/tests/standalone/io/file_read_encoded_test.dart b/tests/standalone_2/io/file_read_encoded_test.dart
similarity index 100%
rename from tests/standalone/io/file_read_encoded_test.dart
rename to tests/standalone_2/io/file_read_encoded_test.dart
diff --git a/tests/standalone/io/file_read_special_device_test.dart b/tests/standalone_2/io/file_read_special_device_test.dart
similarity index 100%
rename from tests/standalone/io/file_read_special_device_test.dart
rename to tests/standalone_2/io/file_read_special_device_test.dart
diff --git a/tests/standalone/io/file_read_stdio_script.dart b/tests/standalone_2/io/file_read_stdio_script.dart
similarity index 100%
rename from tests/standalone/io/file_read_stdio_script.dart
rename to tests/standalone_2/io/file_read_stdio_script.dart
diff --git a/tests/standalone/io/file_stat_test.dart b/tests/standalone_2/io/file_stat_test.dart
similarity index 100%
rename from tests/standalone/io/file_stat_test.dart
rename to tests/standalone_2/io/file_stat_test.dart
diff --git a/tests/standalone/io/file_stream_test.dart b/tests/standalone_2/io/file_stream_test.dart
similarity index 100%
rename from tests/standalone/io/file_stream_test.dart
rename to tests/standalone_2/io/file_stream_test.dart
diff --git a/tests/standalone/io/file_system_async_links_test.dart b/tests/standalone_2/io/file_system_async_links_test.dart
similarity index 99%
rename from tests/standalone/io/file_system_async_links_test.dart
rename to tests/standalone_2/io/file_system_async_links_test.dart
index 2b4958a2168..c7e42c1b700 100644
--- a/tests/standalone/io/file_system_async_links_test.dart
+++ b/tests/standalone_2/io/file_system_async_links_test.dart
@@ -213,7 +213,6 @@ Future testDirectoryListingBrokenLink() {
                 sawLink = true;
                 Expect.isTrue(entity.path.endsWith(link));
               }
-              return true;
             }))
         .then((_) => temp.delete(recursive: true));
   });
diff --git a/tests/standalone/io/file_system_delete_test.dart b/tests/standalone_2/io/file_system_delete_test.dart
similarity index 100%
rename from tests/standalone/io/file_system_delete_test.dart
rename to tests/standalone_2/io/file_system_delete_test.dart
diff --git a/tests/standalone/io/file_system_exists_test.dart b/tests/standalone_2/io/file_system_exists_test.dart
similarity index 100%
rename from tests/standalone/io/file_system_exists_test.dart
rename to tests/standalone_2/io/file_system_exists_test.dart
diff --git a/tests/standalone/io/file_system_links_test.dart b/tests/standalone_2/io/file_system_links_test.dart
similarity index 100%
rename from tests/standalone/io/file_system_links_test.dart
rename to tests/standalone_2/io/file_system_links_test.dart
diff --git a/tests/standalone/io/file_system_uri_test.dart b/tests/standalone_2/io/file_system_uri_test.dart
similarity index 100%
rename from tests/standalone/io/file_system_uri_test.dart
rename to tests/standalone_2/io/file_system_uri_test.dart
index 68e8adde785..c48706d63ac 100644
--- a/tests/standalone/io/file_system_uri_test.dart
+++ b/tests/standalone_2/io/file_system_uri_test.dart
@@ -2,8 +2,8 @@
 // for 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 "dart:io";
+import "package:expect/expect.dart";
 
 testFile(String input) {
   if (Platform.isWindows) {
diff --git a/tests/standalone/io/file_system_watcher_test.dart b/tests/standalone_2/io/file_system_watcher_test.dart
similarity index 100%
rename from tests/standalone/io/file_system_watcher_test.dart
rename to tests/standalone_2/io/file_system_watcher_test.dart
diff --git a/tests/standalone/io/file_test.dart b/tests/standalone_2/io/file_test.dart
similarity index 100%
rename from tests/standalone/io/file_test.dart
rename to tests/standalone_2/io/file_test.dart
diff --git a/tests/standalone_2/io/file_test.txt b/tests/standalone_2/io/file_test.txt
new file mode 100644
index 00000000000..4c2c0d169fe
--- /dev/null
+++ b/tests/standalone_2/io/file_test.txt
@@ -0,0 +1,63 @@
+// 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.
+
+#include "bin/file.h"
+#include "platform/assert.h"
+#include "platform/globals.h"
+#include "vm/unit_test.h"
+
+namespace dart {
+namespace bin {
+
+// Helper method to be able to run the test from the runtime
+// directory, or the top directory.
+static const char* GetFileName(const char* name) {
+  if (File::Exists(name)) {
+    return name;
+  } else {
+    static const int kRuntimeLength = strlen("runtime/");
+    return name + kRuntimeLength;
+  }
+}
+
+
+TEST_CASE(Read) {
+  const char* kFilename = GetFileName("runtime/bin/file_test.cc");
+  File* file = File::Open(kFilename, File::kRead);
+  EXPECT(file != NULL);
+  char buffer[16];
+  buffer[0] = '\0';
+  EXPECT(file->ReadFully(buffer, 13));  // ReadFully returns true.
+  buffer[13] = '\0';
+  EXPECT_STREQ("// Copyright ", buffer);
+  EXPECT(!file->WriteByte(1));  // Cannot write to a read-only file.
+  file->Release();
+}
+
+
+TEST_CASE(FileLength) {
+  const char* kFilename =
+      GetFileName("runtime/tests/vm/data/fixed_length_file");
+  File* file = File::Open(kFilename, File::kRead);
+  EXPECT(file != NULL);
+  EXPECT_EQ(42, file->Length());
+  file->Release();
+}
+
+
+TEST_CASE(FilePosition) {
+  char buf[42];
+  const char* kFilename =
+      GetFileName("runtime/tests/vm/data/fixed_length_file");
+  File* file = File::Open(kFilename, File::kRead);
+  EXPECT(file != NULL);
+  EXPECT(file->ReadFully(buf, 12));
+  EXPECT_EQ(12, file->Position());
+  EXPECT(file->ReadFully(buf, 6));
+  EXPECT_EQ(18, file->Position());
+  file->Release();
+}
+
+}  // namespace bin
+}  // namespace dart
diff --git a/tests/standalone/io/file_typed_data_test.dart b/tests/standalone_2/io/file_typed_data_test.dart
similarity index 100%
rename from tests/standalone/io/file_typed_data_test.dart
rename to tests/standalone_2/io/file_typed_data_test.dart
diff --git a/tests/standalone/io/file_uri_test.dart b/tests/standalone_2/io/file_uri_test.dart
similarity index 100%
rename from tests/standalone/io/file_uri_test.dart
rename to tests/standalone_2/io/file_uri_test.dart
diff --git a/tests/standalone/io/file_windows_test.dart b/tests/standalone_2/io/file_windows_test.dart
similarity index 100%
rename from tests/standalone/io/file_windows_test.dart
rename to tests/standalone_2/io/file_windows_test.dart
diff --git a/tests/standalone/io/file_write_as_test.dart b/tests/standalone_2/io/file_write_as_test.dart
similarity index 100%
rename from tests/standalone/io/file_write_as_test.dart
rename to tests/standalone_2/io/file_write_as_test.dart
diff --git a/tests/standalone/io/file_write_only_test.dart b/tests/standalone_2/io/file_write_only_test.dart
similarity index 100%
rename from tests/standalone/io/file_write_only_test.dart
rename to tests/standalone_2/io/file_write_only_test.dart
diff --git a/tests/standalone_2/io/fixed_length_file b/tests/standalone_2/io/fixed_length_file
new file mode 100644
index 00000000000..52ce32d91b3
--- /dev/null
+++ b/tests/standalone_2/io/fixed_length_file
@@ -0,0 +1 @@
+This file should contain exactly 42 bytes.
\ No newline at end of file
diff --git a/tests/standalone_2/io/fixed_length_file_out b/tests/standalone_2/io/fixed_length_file_out
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/standalone/io/fuzz_support.dart b/tests/standalone_2/io/fuzz_support.dart
similarity index 97%
rename from tests/standalone/io/fuzz_support.dart
rename to tests/standalone_2/io/fuzz_support.dart
index 7faa7f56246..10e3014428d 100644
--- a/tests/standalone/io/fuzz_support.dart
+++ b/tests/standalone_2/io/fuzz_support.dart
@@ -50,7 +50,7 @@ doItSync(Function f) {
 // Perform async operation and transform the future for the operation
 // into a future that never fails by treating errors as normal
 // completion.
-Future doItAsync(void f()) {
+Future doItAsync(FutureOr f()) {
   // Ignore value and errors.
   return new Future.delayed(Duration.ZERO, f)
       .catchError((_) {})
diff --git a/tests/standalone/io/http_100_continue.dart b/tests/standalone_2/io/http_100_continue.dart
similarity index 100%
rename from tests/standalone/io/http_100_continue.dart
rename to tests/standalone_2/io/http_100_continue.dart
diff --git a/tests/standalone/io/http_10_test.dart b/tests/standalone_2/io/http_10_test.dart
similarity index 100%
rename from tests/standalone/io/http_10_test.dart
rename to tests/standalone_2/io/http_10_test.dart
index 0663a138c84..9a02f73a5e1 100644
--- a/tests/standalone/io/http_10_test.dart
+++ b/tests/standalone_2/io/http_10_test.dart
@@ -7,10 +7,10 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:isolate";
 import "dart:io";
+import "package:expect/expect.dart";
 
 // Client makes a HTTP 1.0 request without connection keep alive. The
 // server sets a content length but still needs to close the
diff --git a/tests/standalone/io/http_advanced_test.dart b/tests/standalone_2/io/http_advanced_test.dart
similarity index 99%
rename from tests/standalone/io/http_advanced_test.dart
rename to tests/standalone_2/io/http_advanced_test.dart
index 72949b95888..95ec223999e 100644
--- a/tests/standalone/io/http_advanced_test.dart
+++ b/tests/standalone_2/io/http_advanced_test.dart
@@ -107,7 +107,7 @@ class TestServer {
     var response = request.response;
     response.statusCode = HttpStatus.NOT_FOUND;
     response.headers.set("Content-Type", "text/html; charset=UTF-8");
-    response.outputStream.writeString("Page not found");
+    response.write("Page not found");
     response.close();
   }
 
diff --git a/tests/standalone/io/http_auth_digest_test.dart b/tests/standalone_2/io/http_auth_digest_test.dart
similarity index 99%
rename from tests/standalone/io/http_auth_digest_test.dart
rename to tests/standalone_2/io/http_auth_digest_test.dart
index 82ad1706267..d599af1d9df 100644
--- a/tests/standalone/io/http_auth_digest_test.dart
+++ b/tests/standalone_2/io/http_auth_digest_test.dart
@@ -157,7 +157,7 @@ void testNoCredentials(String algorithm, String qop) {
       });
     }
 
-    var futures = [];
+    var futures = <Future>[];
     for (int i = 0; i < 5; i++) {
       futures.add(
           makeRequest(Uri.parse("http://127.0.0.1:${server.port}/digest")));
@@ -187,7 +187,7 @@ void testCredentials(String algorithm, String qop) {
     client.addCredentials(Uri.parse("http://127.0.0.1:${server.port}/digest"),
         "test", new HttpClientDigestCredentials("dart", "password"));
 
-    var futures = [];
+    var futures = <Future>[];
     for (int i = 0; i < 2; i++) {
       String uriBase = "http://127.0.0.1:${server.port}/digest";
       futures.add(makeRequest(Uri.parse(uriBase)));
@@ -230,7 +230,7 @@ void testAuthenticateCallback(String algorithm, String qop) {
       });
     }
 
-    var futures = [];
+    var futures = <Future>[];
     for (int i = 0; i < 5; i++) {
       futures.add(
           makeRequest(Uri.parse("http://127.0.0.1:${server.port}/digest")));
diff --git a/tests/standalone/io/http_auth_test.dart b/tests/standalone_2/io/http_auth_test.dart
similarity index 98%
rename from tests/standalone/io/http_auth_test.dart
rename to tests/standalone_2/io/http_auth_test.dart
index 2413857cdde..0cbca3f2db8 100644
--- a/tests/standalone/io/http_auth_test.dart
+++ b/tests/standalone_2/io/http_auth_test.dart
@@ -102,7 +102,7 @@ void testBasicNoCredentials() {
       });
     }
 
-    var futures = [];
+    var futures = <Future>[];
     for (int i = 0; i < 5; i++) {
       futures.add(
           makeRequest(Uri.parse("http://127.0.0.1:${server.port}/test$i")));
@@ -135,7 +135,7 @@ void testBasicCredentials() {
           "realm", new HttpClientBasicCredentials("test$i", "test$i"));
     }
 
-    var futures = [];
+    var futures = <Future>[];
     for (int i = 0; i < 5; i++) {
       futures.add(
           makeRequest(Uri.parse("http://127.0.0.1:${server.port}/test$i")));
@@ -180,7 +180,7 @@ void testBasicAuthenticateCallback() {
     }
 
     List<Future> makeRequests() {
-      var futures = [];
+      var futures = <Future>[];
       for (int i = 0; i < 5; i++) {
         futures.add(
             makeRequest(Uri.parse("http://127.0.0.1:${server.port}/test$i")));
diff --git a/tests/standalone/io/http_basic_test.dart b/tests/standalone_2/io/http_basic_test.dart
similarity index 100%
rename from tests/standalone/io/http_basic_test.dart
rename to tests/standalone_2/io/http_basic_test.dart
diff --git a/tests/standalone/io/http_bind_test.dart b/tests/standalone_2/io/http_bind_test.dart
similarity index 98%
rename from tests/standalone/io/http_bind_test.dart
rename to tests/standalone_2/io/http_bind_test.dart
index 1d97eedc6df..502a012ea80 100644
--- a/tests/standalone/io/http_bind_test.dart
+++ b/tests/standalone_2/io/http_bind_test.dart
@@ -66,7 +66,7 @@ void main() {
     if (ok) {
       addresses.add('::1');
     }
-    var futures = [];
+    var futures = <Future>[];
     for (var host in addresses) {
       futures.add(testBindShared(host, false));
       futures.add(testBindShared(host, true));
diff --git a/tests/standalone/io/http_client_connect_test.dart b/tests/standalone_2/io/http_client_connect_test.dart
similarity index 96%
rename from tests/standalone/io/http_client_connect_test.dart
rename to tests/standalone_2/io/http_client_connect_test.dart
index 4480d092f5b..f996e0cbb1d 100644
--- a/tests/standalone/io/http_client_connect_test.dart
+++ b/tests/standalone_2/io/http_client_connect_test.dart
@@ -147,6 +147,7 @@ void testGetDataServerForceClose() {
   });
 }
 
+typedef Future<HttpClientRequest> Callback1(String a1, int a2, String a3);
 void testOpenEmptyRequest() {
   var client = new HttpClient();
   var methods = [
@@ -165,7 +166,8 @@ void testOpenEmptyRequest() {
         request.pipe(request.response);
       });
 
-      method[0]("127.0.0.1", server.port, "/")
+      Callback1 cb = method[0] as Callback1;
+      cb("127.0.0.1", server.port, "/")
           .then((request) => request.close())
           .then((response) {
         response.listen((data) {}, onDone: server.close);
@@ -174,6 +176,7 @@ void testOpenEmptyRequest() {
   }
 }
 
+typedef Future<HttpClientRequest> Callback2(Uri a1);
 void testOpenUrlEmptyRequest() {
   var client = new HttpClient();
   var methods = [
@@ -192,7 +195,8 @@ void testOpenUrlEmptyRequest() {
         request.pipe(request.response);
       });
 
-      method[0](Uri.parse("http://127.0.0.1:${server.port}/"))
+      Callback2 cb = method[0] as Callback2;
+      cb(Uri.parse("http://127.0.0.1:${server.port}/"))
           .then((request) => request.close())
           .then((response) {
         response.listen((data) {}, onDone: server.close);
diff --git a/tests/standalone/io/http_client_exception_test.dart b/tests/standalone_2/io/http_client_exception_test.dart
similarity index 100%
rename from tests/standalone/io/http_client_exception_test.dart
rename to tests/standalone_2/io/http_client_exception_test.dart
diff --git a/tests/standalone/io/http_client_request_test.dart b/tests/standalone_2/io/http_client_request_test.dart
similarity index 100%
rename from tests/standalone/io/http_client_request_test.dart
rename to tests/standalone_2/io/http_client_request_test.dart
diff --git a/tests/standalone/io/http_client_stays_alive_test.dart b/tests/standalone_2/io/http_client_stays_alive_test.dart
similarity index 98%
rename from tests/standalone/io/http_client_stays_alive_test.dart
rename to tests/standalone_2/io/http_client_stays_alive_test.dart
index 102a097174d..efc9c43ea35 100644
--- a/tests/standalone/io/http_client_stays_alive_test.dart
+++ b/tests/standalone_2/io/http_client_stays_alive_test.dart
@@ -37,7 +37,7 @@ void runServerProcess() {
     server.idleTimeout = const Duration(hours: 1);
 
     var subscription = server.listen((HttpRequest request) {
-      return request.response
+      request.response
         ..write('hello world')
         ..close();
     });
diff --git a/tests/standalone/io/http_close_test.dart b/tests/standalone_2/io/http_close_test.dart
similarity index 100%
rename from tests/standalone/io/http_close_test.dart
rename to tests/standalone_2/io/http_close_test.dart
diff --git a/tests/standalone/io/http_compression_test.dart b/tests/standalone_2/io/http_compression_test.dart
similarity index 100%
rename from tests/standalone/io/http_compression_test.dart
rename to tests/standalone_2/io/http_compression_test.dart
diff --git a/tests/standalone/io/http_connection_close_test.dart b/tests/standalone_2/io/http_connection_close_test.dart
similarity index 100%
rename from tests/standalone/io/http_connection_close_test.dart
rename to tests/standalone_2/io/http_connection_close_test.dart
diff --git a/tests/standalone/io/http_connection_header_test.dart b/tests/standalone_2/io/http_connection_header_test.dart
similarity index 100%
rename from tests/standalone/io/http_connection_header_test.dart
rename to tests/standalone_2/io/http_connection_header_test.dart
diff --git a/tests/standalone/io/http_connection_info_test.dart b/tests/standalone_2/io/http_connection_info_test.dart
similarity index 100%
rename from tests/standalone/io/http_connection_info_test.dart
rename to tests/standalone_2/io/http_connection_info_test.dart
diff --git a/tests/standalone/io/http_content_length_test.dart b/tests/standalone_2/io/http_content_length_test.dart
similarity index 100%
rename from tests/standalone/io/http_content_length_test.dart
rename to tests/standalone_2/io/http_content_length_test.dart
index f65f4052623..dcb67243acc 100644
--- a/tests/standalone/io/http_content_length_test.dart
+++ b/tests/standalone_2/io/http_content_length_test.dart
@@ -7,10 +7,10 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:isolate";
 import "dart:io";
+import "package:expect/expect.dart";
 
 void testNoBody(int totalConnections, bool explicitContentLength) {
   int count = 0;
diff --git a/tests/standalone/io/http_cookie_date_test.dart b/tests/standalone_2/io/http_cookie_date_test.dart
similarity index 100%
rename from tests/standalone/io/http_cookie_date_test.dart
rename to tests/standalone_2/io/http_cookie_date_test.dart
index 359823580dc..7335a5bb676 100644
--- a/tests/standalone/io/http_cookie_date_test.dart
+++ b/tests/standalone_2/io/http_cookie_date_test.dart
@@ -4,15 +4,15 @@
 
 library dart.http;
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:collection";
 import "dart:convert";
 import "dart:developer";
-import "dart:math";
 import "dart:io";
-import "dart:typed_data";
 import "dart:isolate";
+import "dart:math";
+import "dart:typed_data";
+import "package:expect/expect.dart";
 
 part "../../../sdk/lib/_http/crypto.dart";
 part "../../../sdk/lib/_http/http_impl.dart";
diff --git a/tests/standalone/io/http_cookie_test.dart b/tests/standalone_2/io/http_cookie_test.dart
similarity index 100%
rename from tests/standalone/io/http_cookie_test.dart
rename to tests/standalone_2/io/http_cookie_test.dart
index c884a352962..27ae2183722 100644
--- a/tests/standalone/io/http_cookie_test.dart
+++ b/tests/standalone_2/io/http_cookie_test.dart
@@ -2,9 +2,9 @@
 // for 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 "dart:async";
 import "dart:io";
+import "package:expect/expect.dart";
 
 void testCookies() {
   var cookies = [
diff --git a/tests/standalone/io/http_cross_process_test.dart b/tests/standalone_2/io/http_cross_process_test.dart
similarity index 100%
rename from tests/standalone/io/http_cross_process_test.dart
rename to tests/standalone_2/io/http_cross_process_test.dart
index 7da835d464e..7408c8e22b2 100644
--- a/tests/standalone/io/http_cross_process_test.dart
+++ b/tests/standalone_2/io/http_cross_process_test.dart
@@ -3,9 +3,9 @@
 // BSD-style license that can be found in the LICENSE file.
 //
 
-import "package:expect/expect.dart";
 import 'dart:async';
 import 'dart:io';
+import "package:expect/expect.dart";
 
 const int NUM_SERVERS = 10;
 
diff --git a/tests/standalone/io/http_date_test.dart b/tests/standalone_2/io/http_date_test.dart
similarity index 100%
rename from tests/standalone/io/http_date_test.dart
rename to tests/standalone_2/io/http_date_test.dart
index d139e809181..4bbe58040c0 100644
--- a/tests/standalone/io/http_date_test.dart
+++ b/tests/standalone_2/io/http_date_test.dart
@@ -2,10 +2,10 @@
 // for 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 "dart:async";
 import "dart:math";
 import "dart:io";
+import "package:expect/expect.dart";
 
 void testParseHttpDate() {
   DateTime date;
diff --git a/tests/standalone/io/http_detach_socket_test.dart b/tests/standalone_2/io/http_detach_socket_test.dart
similarity index 100%
rename from tests/standalone/io/http_detach_socket_test.dart
rename to tests/standalone_2/io/http_detach_socket_test.dart
diff --git a/tests/standalone/io/http_head_test.dart b/tests/standalone_2/io/http_head_test.dart
similarity index 100%
rename from tests/standalone/io/http_head_test.dart
rename to tests/standalone_2/io/http_head_test.dart
index e4a20d8f1e0..de19182fc6d 100644
--- a/tests/standalone/io/http_head_test.dart
+++ b/tests/standalone_2/io/http_head_test.dart
@@ -2,8 +2,8 @@
 // for 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 "dart:io";
+import "package:expect/expect.dart";
 
 void testHEAD(int totalConnections) {
   HttpServer.bind("127.0.0.1", 0).then((server) {
diff --git a/tests/standalone/io/http_headers_state_test.dart b/tests/standalone_2/io/http_headers_state_test.dart
similarity index 100%
rename from tests/standalone/io/http_headers_state_test.dart
rename to tests/standalone_2/io/http_headers_state_test.dart
index 78be5ec9d53..fa06d5d7fed 100644
--- a/tests/standalone/io/http_headers_state_test.dart
+++ b/tests/standalone_2/io/http_headers_state_test.dart
@@ -3,9 +3,9 @@
 // BSD-style license that can be found in the LICENSE file.
 //
 
-import "package:expect/expect.dart";
 import "dart:isolate";
 import "dart:io";
+import "package:expect/expect.dart";
 
 void test(int totalConnections, [String body]) {
   HttpServer.bind("127.0.0.1", 0).then((server) {
diff --git a/tests/standalone/io/http_headers_test.dart b/tests/standalone_2/io/http_headers_test.dart
similarity index 100%
rename from tests/standalone/io/http_headers_test.dart
rename to tests/standalone_2/io/http_headers_test.dart
index ec5d1ac43af..31d92c318bd 100644
--- a/tests/standalone/io/http_headers_test.dart
+++ b/tests/standalone_2/io/http_headers_test.dart
@@ -4,15 +4,15 @@
 
 library dart.http;
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:collection";
 import "dart:convert";
 import "dart:developer";
 import "dart:io";
+import "dart:isolate";
 import "dart:math";
 import "dart:typed_data";
-import "dart:isolate";
+import "package:expect/expect.dart";
 
 part "../../../sdk/lib/_http/crypto.dart";
 part "../../../sdk/lib/_http/http_impl.dart";
diff --git a/tests/standalone/io/http_ipv6_test.dart b/tests/standalone_2/io/http_ipv6_test.dart
similarity index 100%
rename from tests/standalone/io/http_ipv6_test.dart
rename to tests/standalone_2/io/http_ipv6_test.dart
diff --git a/tests/standalone/io/http_keep_alive_test.dart b/tests/standalone_2/io/http_keep_alive_test.dart
similarity index 100%
rename from tests/standalone/io/http_keep_alive_test.dart
rename to tests/standalone_2/io/http_keep_alive_test.dart
index 037fc87faa2..a0a0d81f096 100644
--- a/tests/standalone/io/http_keep_alive_test.dart
+++ b/tests/standalone_2/io/http_keep_alive_test.dart
@@ -7,9 +7,9 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
+import "package:expect/expect.dart";
 
 Future getData(HttpClient client, int port, bool chunked, int length) {
   return client
diff --git a/tests/standalone/io/http_loopback_test.dart b/tests/standalone_2/io/http_loopback_test.dart
similarity index 100%
rename from tests/standalone/io/http_loopback_test.dart
rename to tests/standalone_2/io/http_loopback_test.dart
diff --git a/tests/standalone/io/http_no_reason_phrase_test.dart b/tests/standalone_2/io/http_no_reason_phrase_test.dart
similarity index 100%
rename from tests/standalone/io/http_no_reason_phrase_test.dart
rename to tests/standalone_2/io/http_no_reason_phrase_test.dart
index de930050a62..23e53fc6618 100644
--- a/tests/standalone/io/http_no_reason_phrase_test.dart
+++ b/tests/standalone_2/io/http_no_reason_phrase_test.dart
@@ -7,10 +7,10 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:isolate";
 import "dart:io";
+import "package:expect/expect.dart";
 
 // Test that a response line without any reason phrase is handled.
 void missingReasonPhrase(int statusCode, bool includeSpace) {
diff --git a/tests/standalone/io/http_outgoing_size_test.dart b/tests/standalone_2/io/http_outgoing_size_test.dart
similarity index 100%
rename from tests/standalone/io/http_outgoing_size_test.dart
rename to tests/standalone_2/io/http_outgoing_size_test.dart
diff --git a/tests/standalone/io/http_parser_test.dart b/tests/standalone_2/io/http_parser_test.dart
similarity index 100%
rename from tests/standalone/io/http_parser_test.dart
rename to tests/standalone_2/io/http_parser_test.dart
index e99cc353e2c..82903527739 100644
--- a/tests/standalone/io/http_parser_test.dart
+++ b/tests/standalone_2/io/http_parser_test.dart
@@ -4,15 +4,15 @@
 
 library dart.http;
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:collection";
 import "dart:convert";
 import "dart:developer";
 import "dart:io";
+import "dart:isolate";
 import "dart:math";
 import "dart:typed_data";
-import "dart:isolate";
+import "package:expect/expect.dart";
 
 part "../../../sdk/lib/_http/crypto.dart";
 part "../../../sdk/lib/_http/http_impl.dart";
diff --git a/tests/standalone/io/http_proxy_advanced_test.dart b/tests/standalone_2/io/http_proxy_advanced_test.dart
similarity index 99%
rename from tests/standalone/io/http_proxy_advanced_test.dart
rename to tests/standalone_2/io/http_proxy_advanced_test.dart
index f5cd5298894..a69f6a49b19 100644
--- a/tests/standalone/io/http_proxy_advanced_test.dart
+++ b/tests/standalone_2/io/http_proxy_advanced_test.dart
@@ -6,22 +6,22 @@
 // OtherResources=certificates/server_key.pem
 // OtherResources=certificates/trusted_certs.pem
 
+import "dart:async";
+import "dart:io";
+import 'dart:convert';
 import "package:convert/convert.dart";
 import "package:crypto/crypto.dart";
 import "package:expect/expect.dart";
 import "package:path/path.dart";
-import "dart:async";
-import "dart:io";
-import 'dart:convert';
 
 String localFile(path) => Platform.script.resolve(path).toFilePath();
 
-SecurityContext serverContext = new SecurityContext()
+final SecurityContext serverContext = new SecurityContext()
   ..useCertificateChain(localFile('certificates/server_chain.pem'))
   ..usePrivateKey(localFile('certificates/server_key.pem'),
       password: 'dartdart');
 
-SecurityContext clientContext = new SecurityContext()
+final SecurityContext clientContext = new SecurityContext()
   ..setTrustedCertificates(localFile('certificates/trusted_certs.pem'));
 
 class Server {
diff --git a/tests/standalone/io/http_proxy_configuration_test.dart b/tests/standalone_2/io/http_proxy_configuration_test.dart
similarity index 100%
rename from tests/standalone/io/http_proxy_configuration_test.dart
rename to tests/standalone_2/io/http_proxy_configuration_test.dart
index ab87c600ccb..7f81127a811 100644
--- a/tests/standalone/io/http_proxy_configuration_test.dart
+++ b/tests/standalone_2/io/http_proxy_configuration_test.dart
@@ -2,8 +2,8 @@
 // for 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 "dart:io";
+import "package:expect/expect.dart";
 
 expect(expected, String uri, environment) {
   Expect.equals(
diff --git a/tests/standalone/io/http_proxy_test.dart b/tests/standalone_2/io/http_proxy_test.dart
similarity index 99%
rename from tests/standalone/io/http_proxy_test.dart
rename to tests/standalone_2/io/http_proxy_test.dart
index bef1412cc23..4e6ac21d694 100644
--- a/tests/standalone/io/http_proxy_test.dart
+++ b/tests/standalone_2/io/http_proxy_test.dart
@@ -6,21 +6,21 @@
 // OtherResources=certificates/server_key.pem
 // OtherResources=certificates/trusted_certs.pem
 
-import "package:convert/convert.dart";
-import "package:crypto/crypto.dart";
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
 import 'dart:convert';
+import "package:convert/convert.dart";
+import "package:crypto/crypto.dart";
+import "package:expect/expect.dart";
 
 String localFile(path) => Platform.script.resolve(path).toFilePath();
 
-SecurityContext serverContext = new SecurityContext()
+final SecurityContext serverContext = new SecurityContext()
   ..useCertificateChain(localFile('certificates/server_chain.pem'))
   ..usePrivateKey(localFile('certificates/server_key.pem'),
       password: 'dartdart');
 
-SecurityContext clientContext = new SecurityContext()
+final SecurityContext clientContext = new SecurityContext()
   ..setTrustedCertificates(localFile('certificates/trusted_certs.pem'));
 
 class Server {
diff --git a/tests/standalone/io/http_read_test.dart b/tests/standalone_2/io/http_read_test.dart
similarity index 100%
rename from tests/standalone/io/http_read_test.dart
rename to tests/standalone_2/io/http_read_test.dart
index 6c5bcf97a37..0bada13f139 100644
--- a/tests/standalone/io/http_read_test.dart
+++ b/tests/standalone_2/io/http_read_test.dart
@@ -7,9 +7,9 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "package:expect/expect.dart";
 import "dart:isolate";
 import "dart:io";
+import "package:expect/expect.dart";
 
 class IsolatedHttpServer {
   IsolatedHttpServer()
diff --git a/tests/standalone/io/http_redirect_test.dart b/tests/standalone_2/io/http_redirect_test.dart
similarity index 100%
rename from tests/standalone/io/http_redirect_test.dart
rename to tests/standalone_2/io/http_redirect_test.dart
diff --git a/tests/standalone/io/http_request_pipeling_test.dart b/tests/standalone_2/io/http_request_pipeling_test.dart
similarity index 100%
rename from tests/standalone/io/http_request_pipeling_test.dart
rename to tests/standalone_2/io/http_request_pipeling_test.dart
index 92b9854945e..4acb06fc721 100644
--- a/tests/standalone/io/http_request_pipeling_test.dart
+++ b/tests/standalone_2/io/http_request_pipeling_test.dart
@@ -7,8 +7,8 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "package:expect/expect.dart";
 import "dart:io";
+import "package:expect/expect.dart";
 
 void main() {
   final int REQUEST_COUNT = 100;
diff --git a/tests/standalone/io/http_requested_uri_test.dart b/tests/standalone_2/io/http_requested_uri_test.dart
similarity index 100%
rename from tests/standalone/io/http_requested_uri_test.dart
rename to tests/standalone_2/io/http_requested_uri_test.dart
index 8718c5f7b44..17fb8894ac2 100644
--- a/tests/standalone/io/http_requested_uri_test.dart
+++ b/tests/standalone_2/io/http_requested_uri_test.dart
@@ -2,10 +2,10 @@
 // for 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:async_helper/async_helper.dart";
 import "dart:async";
 import "dart:io";
+import "package:expect/expect.dart";
+import "package:async_helper/async_helper.dart";
 
 const sendPath = '/path?a=b#c';
 const expectedPath = '/path?a=b';
diff --git a/tests/standalone/io/http_response_deadline_test.dart b/tests/standalone_2/io/http_response_deadline_test.dart
similarity index 96%
rename from tests/standalone/io/http_response_deadline_test.dart
rename to tests/standalone_2/io/http_response_deadline_test.dart
index 522dbbbf8cf..757ec51ea29 100644
--- a/tests/standalone/io/http_response_deadline_test.dart
+++ b/tests/standalone_2/io/http_response_deadline_test.dart
@@ -19,7 +19,7 @@ void testSimpleDeadline(int connections) {
       request.response.close();
     });
 
-    var futures = [];
+    var futures = <Future>[];
     var client = new HttpClient();
     for (int i = 0; i < connections; i++) {
       futures.add(client
@@ -39,7 +39,7 @@ void testExceedDeadline(int connections) {
       request.response.write("stuff");
     });
 
-    var futures = [];
+    var futures = <Future>[];
     var client = new HttpClient();
     for (int i = 0; i < connections; i++) {
       futures.add(client
@@ -71,7 +71,7 @@ void testDeadlineAndDetach(int connections) {
       });
     });
 
-    var futures = [];
+    var futures = <Future>[];
     var client = new HttpClient();
     for (int i = 0; i < connections; i++) {
       futures.add(client
diff --git a/tests/standalone/io/http_reuse_server_port_test.dart b/tests/standalone_2/io/http_reuse_server_port_test.dart
similarity index 100%
rename from tests/standalone/io/http_reuse_server_port_test.dart
rename to tests/standalone_2/io/http_reuse_server_port_test.dart
diff --git a/tests/standalone/io/http_server_close_response_after_error_client.dart b/tests/standalone_2/io/http_server_close_response_after_error_client.dart
similarity index 100%
rename from tests/standalone/io/http_server_close_response_after_error_client.dart
rename to tests/standalone_2/io/http_server_close_response_after_error_client.dart
diff --git a/tests/standalone/io/http_server_close_response_after_error_test.dart b/tests/standalone_2/io/http_server_close_response_after_error_test.dart
similarity index 100%
rename from tests/standalone/io/http_server_close_response_after_error_test.dart
rename to tests/standalone_2/io/http_server_close_response_after_error_test.dart
diff --git a/tests/standalone/io/http_server_early_client_close2_test.dart b/tests/standalone_2/io/http_server_early_client_close2_test.dart
similarity index 100%
rename from tests/standalone/io/http_server_early_client_close2_test.dart
rename to tests/standalone_2/io/http_server_early_client_close2_test.dart
index 43d9e8c0512..80bc51c2372 100644
--- a/tests/standalone/io/http_server_early_client_close2_test.dart
+++ b/tests/standalone_2/io/http_server_early_client_close2_test.dart
@@ -7,10 +7,10 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
 import "dart:isolate";
+import "package:expect/expect.dart";
 
 main() {
   HttpServer.bind("127.0.0.1", 0).then((server) {
diff --git a/tests/standalone/io/http_server_early_client_close_test.dart b/tests/standalone_2/io/http_server_early_client_close_test.dart
similarity index 100%
rename from tests/standalone/io/http_server_early_client_close_test.dart
rename to tests/standalone_2/io/http_server_early_client_close_test.dart
index 09ba91cb7a1..4cacde09c96 100644
--- a/tests/standalone/io/http_server_early_client_close_test.dart
+++ b/tests/standalone_2/io/http_server_early_client_close_test.dart
@@ -7,10 +7,10 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
 import "dart:isolate";
+import "package:expect/expect.dart";
 
 Future sendData(List<int> data, int port) {
   return Socket.connect("127.0.0.1", port).then((socket) {
diff --git a/tests/standalone/io/http_server_idle_timeout_test.dart b/tests/standalone_2/io/http_server_idle_timeout_test.dart
similarity index 100%
rename from tests/standalone/io/http_server_idle_timeout_test.dart
rename to tests/standalone_2/io/http_server_idle_timeout_test.dart
diff --git a/tests/standalone/io/http_server_response_test.dart b/tests/standalone_2/io/http_server_response_test.dart
similarity index 100%
rename from tests/standalone/io/http_server_response_test.dart
rename to tests/standalone_2/io/http_server_response_test.dart
diff --git a/tests/standalone/io/http_server_test.dart b/tests/standalone_2/io/http_server_test.dart
similarity index 100%
rename from tests/standalone/io/http_server_test.dart
rename to tests/standalone_2/io/http_server_test.dart
diff --git a/tests/standalone/io/http_session_test.dart b/tests/standalone_2/io/http_session_test.dart
similarity index 97%
rename from tests/standalone/io/http_session_test.dart
rename to tests/standalone_2/io/http_session_test.dart
index 7130a94f394..fa8270de6cd 100644
--- a/tests/standalone/io/http_session_test.dart
+++ b/tests/standalone_2/io/http_session_test.dart
@@ -42,7 +42,7 @@ void testSessions(int sessionCount) {
       request.response.close();
     });
 
-    var futures = [];
+    var futures = <Future>[];
     for (int i = 0; i < sessionCount; i++) {
       futures.add(connectGetSession(client, server.port).then((session) {
         Expect.isNotNull(session);
@@ -67,7 +67,7 @@ void testTimeout(int sessionCount) {
   var client = new HttpClient();
   HttpServer.bind("127.0.0.1", 0).then((server) {
     server.sessionTimeout = 1;
-    var timeouts = [];
+    var timeouts = <Future>[];
     server.listen((request) {
       var c = new Completer();
       timeouts.add(c.future);
@@ -77,13 +77,13 @@ void testTimeout(int sessionCount) {
       request.response.close();
     });
 
-    var futures = [];
+    var futures = <Future>[];
     for (int i = 0; i < sessionCount; i++) {
       futures.add(connectGetSession(client, server.port));
     }
     Future.wait(futures).then((clientSessions) {
       Future.wait(timeouts).then((_) {
-        futures = [];
+        futures = <Future>[];
         for (var id in clientSessions) {
           futures
               .add(connectGetSession(client, server.port, id).then((session) {
diff --git a/tests/standalone/io/http_shutdown_test.dart b/tests/standalone_2/io/http_shutdown_test.dart
similarity index 100%
rename from tests/standalone/io/http_shutdown_test.dart
rename to tests/standalone_2/io/http_shutdown_test.dart
index 4761f41a090..a3410db3b06 100644
--- a/tests/standalone/io/http_shutdown_test.dart
+++ b/tests/standalone_2/io/http_shutdown_test.dart
@@ -7,9 +7,9 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
+import "package:expect/expect.dart";
 
 void test1(int totalConnections) {
   // Server which just closes immediately.
diff --git a/tests/standalone/io/http_stream_close_test.dart b/tests/standalone_2/io/http_stream_close_test.dart
similarity index 100%
rename from tests/standalone/io/http_stream_close_test.dart
rename to tests/standalone_2/io/http_stream_close_test.dart
diff --git a/tests/standalone/io/https_client_certificate_test.dart b/tests/standalone_2/io/https_client_certificate_test.dart
similarity index 100%
rename from tests/standalone/io/https_client_certificate_test.dart
rename to tests/standalone_2/io/https_client_certificate_test.dart
diff --git a/tests/standalone/io/https_client_exception_test.dart b/tests/standalone_2/io/https_client_exception_test.dart
similarity index 100%
rename from tests/standalone/io/https_client_exception_test.dart
rename to tests/standalone_2/io/https_client_exception_test.dart
diff --git a/tests/standalone/io/https_server_test.dart b/tests/standalone_2/io/https_server_test.dart
similarity index 100%
rename from tests/standalone/io/https_server_test.dart
rename to tests/standalone_2/io/https_server_test.dart
diff --git a/tests/standalone/io/https_unauthorized_client.dart b/tests/standalone_2/io/https_unauthorized_client.dart
similarity index 100%
rename from tests/standalone/io/https_unauthorized_client.dart
rename to tests/standalone_2/io/https_unauthorized_client.dart
diff --git a/tests/standalone/io/https_unauthorized_test.dart b/tests/standalone_2/io/https_unauthorized_test.dart
similarity index 98%
rename from tests/standalone/io/https_unauthorized_test.dart
rename to tests/standalone_2/io/https_unauthorized_test.dart
index 2c291dfc861..2952afd40ef 100644
--- a/tests/standalone/io/https_unauthorized_test.dart
+++ b/tests/standalone_2/io/https_unauthorized_test.dart
@@ -30,7 +30,7 @@ SecurityContext untrustedServerContext = new SecurityContext()
 SecurityContext clientContext = new SecurityContext()
   ..setTrustedCertificates(localFile('certificates/trusted_certs.pem'));
 
-Future<SecureServerSocket> runServer() {
+Future<HttpServer> runServer() {
   return HttpServer
       .bindSecure(HOST_NAME, 0, untrustedServerContext, backlog: 5)
       .then((server) {
diff --git a/tests/standalone/io/internet_address_test.dart b/tests/standalone_2/io/internet_address_test.dart
similarity index 100%
rename from tests/standalone/io/internet_address_test.dart
rename to tests/standalone_2/io/internet_address_test.dart
diff --git a/tests/standalone/io/io_sink_test.dart b/tests/standalone_2/io/io_sink_test.dart
similarity index 97%
rename from tests/standalone/io/io_sink_test.dart
rename to tests/standalone_2/io/io_sink_test.dart
index ff76c5f4f96..123357025df 100644
--- a/tests/standalone/io/io_sink_test.dart
+++ b/tests/standalone_2/io/io_sink_test.dart
@@ -2,12 +2,12 @@
 // for 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:async_helper/async_helper.dart";
 import "dart:async";
 import "dart:io";
+import "package:expect/expect.dart";
+import "package:async_helper/async_helper.dart";
 
-class TestConsumer implements StreamConsumer {
+class TestConsumer implements StreamConsumer<List<int>> {
   final List expected;
   final List received = [];
 
diff --git a/tests/standalone/io/issue_22636_test.dart b/tests/standalone_2/io/issue_22636_test.dart
similarity index 100%
rename from tests/standalone/io/issue_22636_test.dart
rename to tests/standalone_2/io/issue_22636_test.dart
index f21df31c7f0..39064277e32 100644
--- a/tests/standalone/io/issue_22636_test.dart
+++ b/tests/standalone_2/io/issue_22636_test.dart
@@ -6,8 +6,8 @@
 // closed for read (the other end has closed for write) does not send
 // an additional READ_CLOSED event.
 
-import "dart:io";
 import "dart:async";
+import "dart:io";
 import "package:expect/expect.dart";
 
 final Duration delay = new Duration(milliseconds: 100);
diff --git a/tests/standalone/io/issue_22637_test.dart b/tests/standalone_2/io/issue_22637_test.dart
similarity index 100%
rename from tests/standalone/io/issue_22637_test.dart
rename to tests/standalone_2/io/issue_22637_test.dart
diff --git a/tests/standalone/io/issue_26954_test.dart b/tests/standalone_2/io/issue_26954_test.dart
similarity index 100%
rename from tests/standalone/io/issue_26954_test.dart
rename to tests/standalone_2/io/issue_26954_test.dart
diff --git a/tests/standalone/io/link_async_test.dart b/tests/standalone_2/io/link_async_test.dart
similarity index 99%
rename from tests/standalone/io/link_async_test.dart
rename to tests/standalone_2/io/link_async_test.dart
index 9a421774473..21118e7d172 100644
--- a/tests/standalone/io/link_async_test.dart
+++ b/tests/standalone_2/io/link_async_test.dart
@@ -97,7 +97,7 @@ Future testCreate() {
           .then((_) => testDirectoryListing(base, baseDir))
           .then((_) => new Directory(target).delete(recursive: true))
           .then((_) {
-        List<Future> futures = [];
+        var futures = <Future>[];
         for (bool recursive in [true, false]) {
           for (bool followLinks in [true, false]) {
             var result = baseDir.listSync(
@@ -175,7 +175,7 @@ Future testRename(_) {
 
   return Directory.systemTemp.createTemp('dart_link_async').then((baseDir) {
     String base = baseDir.path;
-    var targetsFutures = [];
+    var targetsFutures = <Future>[];
     targetsFutures.add(new Directory(join(base, 'a')).create());
     if (Platform.isWindows) {
       // Currently only links to directories are supported on Windows.
@@ -217,7 +217,7 @@ Future testDirectoryListing(String base, Directory baseDir) {
     expected[ending] = 'Found';
   }
 
-  List futures = [];
+  var futures = <Future>[];
   for (bool recursive in [true, false]) {
     for (bool followLinks in [true, false]) {
       Map expected = makeExpected(recursive, followLinks);
diff --git a/tests/standalone/io/link_test.dart b/tests/standalone_2/io/link_test.dart
similarity index 99%
rename from tests/standalone/io/link_test.dart
rename to tests/standalone_2/io/link_test.dart
index fc2671ab1d2..8292632c4a6 100644
--- a/tests/standalone/io/link_test.dart
+++ b/tests/standalone_2/io/link_test.dart
@@ -109,7 +109,7 @@ testCreateSync() {
     expected[ending] = 'Found';
   }
 
-  List futures = [];
+  var futures = <Future>[];
   for (bool recursive in [true, false]) {
     for (bool followLinks in [true, false]) {
       Map expected = makeExpected(recursive, followLinks);
diff --git a/tests/standalone/io/link_uri_test.dart b/tests/standalone_2/io/link_uri_test.dart
similarity index 100%
rename from tests/standalone/io/link_uri_test.dart
rename to tests/standalone_2/io/link_uri_test.dart
diff --git a/tests/standalone/io/locale_name_test.dart b/tests/standalone_2/io/locale_name_test.dart
similarity index 94%
rename from tests/standalone/io/locale_name_test.dart
rename to tests/standalone_2/io/locale_name_test.dart
index 6beffabb00a..7298ca75ea4 100644
--- a/tests/standalone/io/locale_name_test.dart
+++ b/tests/standalone_2/io/locale_name_test.dart
@@ -14,5 +14,4 @@ main() {
   }
   Expect.isNotNull(Platform.localeName);
   Expect.isTrue(Platform.localeName is String);
-  print(Platform.localeName);
 }
diff --git a/tests/standalone/io/many_directory_operations_test.dart b/tests/standalone_2/io/many_directory_operations_test.dart
similarity index 100%
rename from tests/standalone/io/many_directory_operations_test.dart
rename to tests/standalone_2/io/many_directory_operations_test.dart
diff --git a/tests/standalone/io/many_file_operations_test.dart b/tests/standalone_2/io/many_file_operations_test.dart
similarity index 100%
rename from tests/standalone/io/many_file_operations_test.dart
rename to tests/standalone_2/io/many_file_operations_test.dart
diff --git a/tests/standalone/io/named_pipe_script_test.dart b/tests/standalone_2/io/named_pipe_script_test.dart
similarity index 100%
rename from tests/standalone/io/named_pipe_script_test.dart
rename to tests/standalone_2/io/named_pipe_script_test.dart
diff --git a/tests/standalone/io/namespace_test.dart b/tests/standalone_2/io/namespace_test.dart
similarity index 100%
rename from tests/standalone/io/namespace_test.dart
rename to tests/standalone_2/io/namespace_test.dart
diff --git a/tests/standalone/io/network_interface_test.dart b/tests/standalone_2/io/network_interface_test.dart
similarity index 100%
rename from tests/standalone/io/network_interface_test.dart
rename to tests/standalone_2/io/network_interface_test.dart
diff --git a/tests/standalone/io/non_utf8_output_test.dart b/tests/standalone_2/io/non_utf8_output_test.dart
similarity index 100%
rename from tests/standalone/io/non_utf8_output_test.dart
rename to tests/standalone_2/io/non_utf8_output_test.dart
diff --git a/tests/standalone/io/parent_test.dart b/tests/standalone_2/io/parent_test.dart
similarity index 100%
rename from tests/standalone/io/parent_test.dart
rename to tests/standalone_2/io/parent_test.dart
index 0b29283c39e..ab1117a9f7f 100644
--- a/tests/standalone/io/parent_test.dart
+++ b/tests/standalone_2/io/parent_test.dart
@@ -5,8 +5,8 @@
 // Dart test program for testing file I/O.
 
 import 'dart:async';
-import 'dart:convert';
 import 'dart:collection';
+import 'dart:convert';
 import 'dart:io';
 
 import "package:async_helper/async_helper.dart";
diff --git a/tests/standalone/io/pipe_server_test.dart b/tests/standalone_2/io/pipe_server_test.dart
similarity index 99%
rename from tests/standalone/io/pipe_server_test.dart
rename to tests/standalone_2/io/pipe_server_test.dart
index ddbc077d1cd..bafc368cda4 100644
--- a/tests/standalone/io/pipe_server_test.dart
+++ b/tests/standalone_2/io/pipe_server_test.dart
@@ -11,11 +11,12 @@
 
 library ServerTest;
 
-import "package:expect/expect.dart";
-import "package:async_helper/async_helper.dart";
 import "dart:async";
 import "dart:io";
 import "dart:isolate";
+import "package:expect/expect.dart";
+import "package:async_helper/async_helper.dart";
+
 part "testing_server.dart";
 
 String getDataFilename(String path) =>
diff --git a/tests/standalone/io/platform_os_version_test.dart b/tests/standalone_2/io/platform_os_version_test.dart
similarity index 90%
rename from tests/standalone/io/platform_os_version_test.dart
rename to tests/standalone_2/io/platform_os_version_test.dart
index ee276aabddb..fff7335a869 100644
--- a/tests/standalone/io/platform_os_version_test.dart
+++ b/tests/standalone_2/io/platform_os_version_test.dart
@@ -10,5 +10,4 @@ main() {
   var version = Platform.operatingSystemVersion;
   Expect.isNotNull(version);
   Expect.isTrue(version is String);
-  print(Platform.operatingSystemVersion);
 }
diff --git a/tests/standalone/io/platform_resolved_executable_test.dart b/tests/standalone_2/io/platform_resolved_executable_test.dart
similarity index 100%
rename from tests/standalone/io/platform_resolved_executable_test.dart
rename to tests/standalone_2/io/platform_resolved_executable_test.dart
diff --git a/tests/standalone/io/platform_test.dart b/tests/standalone_2/io/platform_test.dart
similarity index 96%
rename from tests/standalone/io/platform_test.dart
rename to tests/standalone_2/io/platform_test.dart
index 6e78db9acf3..3fb3d3c2b37 100644
--- a/tests/standalone/io/platform_test.dart
+++ b/tests/standalone_2/io/platform_test.dart
@@ -43,8 +43,8 @@ test() {
   // Move directory to be sure script is correct.
   var oldDir = Directory.current;
   Directory.current = Directory.current.parent;
-  Expect.isTrue(
-      Platform.script.path.endsWith('tests/standalone/io/platform_test.dart'));
+  Expect.isTrue(Platform.script.path
+      .endsWith('tests/standalone_2/io/platform_test.dart'));
   Expect.isTrue(Platform.script.toFilePath().startsWith(oldDir.path));
   // Restore dir.
   Directory.current = oldDir;
@@ -84,7 +84,8 @@ testIsolate() {
     // SpawnFunction retains the script url of the parent which in this
     // case was a relative path.
     Expect.equals("file", uri.scheme);
-    Expect.isTrue(uri.path.endsWith('tests/standalone/io/platform_test.dart'));
+    Expect
+        .isTrue(uri.path.endsWith('tests/standalone_2/io/platform_test.dart'));
     Expect.equals(Platform.packageRoot, results["Platform.packageRoot"]);
     Expect.listEquals(
         Platform.executableArguments, results["Platform.executableArguments"]);
diff --git a/tests/standalone/io/print_env.dart b/tests/standalone_2/io/print_env.dart
similarity index 100%
rename from tests/standalone/io/print_env.dart
rename to tests/standalone_2/io/print_env.dart
diff --git a/tests/standalone/io/print_sync_script.dart b/tests/standalone_2/io/print_sync_script.dart
similarity index 100%
rename from tests/standalone/io/print_sync_script.dart
rename to tests/standalone_2/io/print_sync_script.dart
diff --git a/tests/standalone/io/print_sync_test.dart b/tests/standalone_2/io/print_sync_test.dart
similarity index 100%
rename from tests/standalone/io/print_sync_test.dart
rename to tests/standalone_2/io/print_sync_test.dart
diff --git a/tests/standalone/io/process_broken_pipe_test.dart b/tests/standalone_2/io/process_broken_pipe_test.dart
similarity index 100%
rename from tests/standalone/io/process_broken_pipe_test.dart
rename to tests/standalone_2/io/process_broken_pipe_test.dart
diff --git a/tests/standalone/io/process_check_arguments_script.dart b/tests/standalone_2/io/process_check_arguments_script.dart
similarity index 100%
rename from tests/standalone/io/process_check_arguments_script.dart
rename to tests/standalone_2/io/process_check_arguments_script.dart
index 8c0f491c665..76cff03dcd7 100644
--- a/tests/standalone/io/process_check_arguments_script.dart
+++ b/tests/standalone_2/io/process_check_arguments_script.dart
@@ -4,8 +4,8 @@
 //
 // Utility script to check that arguments are correctly passed from
 // one dart process to another using the dart:io process interface.
-import "dart:math";
 import "dart:io";
+import "dart:math";
 
 class Expect {
   static void isTrue(x) {
diff --git a/tests/standalone/io/process_check_arguments_test.dart b/tests/standalone_2/io/process_check_arguments_test.dart
similarity index 86%
rename from tests/standalone/io/process_check_arguments_test.dart
rename to tests/standalone_2/io/process_check_arguments_test.dart
index 78f96fa2ad8..d0e2c9b7bd1 100644
--- a/tests/standalone/io/process_check_arguments_test.dart
+++ b/tests/standalone_2/io/process_check_arguments_test.dart
@@ -21,10 +21,10 @@ test(args) {
 main() {
   // Get the Dart script file which checks arguments.
   var scriptFile =
-      new File("tests/standalone/io/process_check_arguments_script.dart");
+      new File("tests/standalone_2/io/process_check_arguments_script.dart");
   if (!scriptFile.existsSync()) {
-    scriptFile =
-        new File("../tests/standalone/io/process_check_arguments_script.dart");
+    scriptFile = new File(
+        "../tests/standalone_2/io/process_check_arguments_script.dart");
   }
   test([scriptFile.path, '3', '0', 'a']);
   test([scriptFile.path, '3', '0', 'a b']);
diff --git a/tests/standalone/io/process_detached_script.dart b/tests/standalone_2/io/process_detached_script.dart
similarity index 100%
rename from tests/standalone/io/process_detached_script.dart
rename to tests/standalone_2/io/process_detached_script.dart
diff --git a/tests/standalone/io/process_detached_test.dart b/tests/standalone_2/io/process_detached_test.dart
similarity index 100%
rename from tests/standalone/io/process_detached_test.dart
rename to tests/standalone_2/io/process_detached_test.dart
diff --git a/tests/standalone/io/process_echo_util.dart b/tests/standalone_2/io/process_echo_util.dart
similarity index 100%
rename from tests/standalone/io/process_echo_util.dart
rename to tests/standalone_2/io/process_echo_util.dart
diff --git a/tests/standalone/io/process_environment_test.dart b/tests/standalone_2/io/process_environment_test.dart
similarity index 97%
rename from tests/standalone/io/process_environment_test.dart
rename to tests/standalone_2/io/process_environment_test.dart
index 2d6f134ada1..6c960f89f77 100644
--- a/tests/standalone/io/process_environment_test.dart
+++ b/tests/standalone_2/io/process_environment_test.dart
@@ -11,7 +11,7 @@ import "process_test_util.dart";
 
 runEnvironmentProcess(Map environment, name, includeParent, callback) {
   var dartExecutable = Platform.executable;
-  var printEnv = 'tests/standalone/io/print_env.dart';
+  var printEnv = 'tests/standalone_2/io/print_env.dart';
   if (!new File(printEnv).existsSync()) {
     printEnv = '../$printEnv';
   }
diff --git a/tests/standalone/io/process_exit_negative_test.dart b/tests/standalone_2/io/process_exit_negative_test.dart
similarity index 100%
rename from tests/standalone/io/process_exit_negative_test.dart
rename to tests/standalone_2/io/process_exit_negative_test.dart
diff --git a/tests/standalone/io/process_exit_test.dart b/tests/standalone_2/io/process_exit_test.dart
similarity index 100%
rename from tests/standalone/io/process_exit_test.dart
rename to tests/standalone_2/io/process_exit_test.dart
index fcd2866dfb5..bba1869fc28 100644
--- a/tests/standalone/io/process_exit_test.dart
+++ b/tests/standalone_2/io/process_exit_test.dart
@@ -6,8 +6,8 @@
 
 library ProcessExitTest;
 
-import "package:expect/expect.dart";
 import "dart:io";
+import "package:expect/expect.dart";
 import "process_test_util.dart";
 
 testExit() {
diff --git a/tests/standalone/io/process_info_test.dart b/tests/standalone_2/io/process_info_test.dart
similarity index 100%
rename from tests/standalone/io/process_info_test.dart
rename to tests/standalone_2/io/process_info_test.dart
diff --git a/tests/standalone/io/process_kill_test.dart b/tests/standalone_2/io/process_kill_test.dart
similarity index 100%
rename from tests/standalone/io/process_kill_test.dart
rename to tests/standalone_2/io/process_kill_test.dart
diff --git a/tests/standalone/io/process_non_ascii_test.dart b/tests/standalone_2/io/process_non_ascii_test.dart
similarity index 100%
rename from tests/standalone/io/process_non_ascii_test.dart
rename to tests/standalone_2/io/process_non_ascii_test.dart
diff --git a/tests/standalone/io/process_path_environment_test.dart b/tests/standalone_2/io/process_path_environment_test.dart
similarity index 100%
rename from tests/standalone/io/process_path_environment_test.dart
rename to tests/standalone_2/io/process_path_environment_test.dart
index 80ec89b18b1..b99074a17d6 100644
--- a/tests/standalone/io/process_path_environment_test.dart
+++ b/tests/standalone_2/io/process_path_environment_test.dart
@@ -5,8 +5,8 @@
 // Test that the executable is looked up on the user's PATH when spawning a
 // process and environment variables are passed in.
 
-import "package:expect/expect.dart";
 import "dart:io";
+import "package:expect/expect.dart";
 
 main() {
   // Pick an app that we expect to be on the PATH that returns 0 when run with
diff --git a/tests/standalone/io/process_path_test.dart b/tests/standalone_2/io/process_path_test.dart
similarity index 100%
rename from tests/standalone/io/process_path_test.dart
rename to tests/standalone_2/io/process_path_test.dart
index c8303815b84..bda21bfa923 100644
--- a/tests/standalone/io/process_path_test.dart
+++ b/tests/standalone_2/io/process_path_test.dart
@@ -5,8 +5,8 @@
 // Test that the executable is looked up on the user's PATH when spawning a
 // process.
 
-import "package:expect/expect.dart";
 import "dart:io";
+import "package:expect/expect.dart";
 
 main() {
   // Pick an app that we expect to be on the PATH that returns 0 when run with
diff --git a/tests/standalone/io/process_pid_test.dart b/tests/standalone_2/io/process_pid_test.dart
similarity index 96%
rename from tests/standalone/io/process_pid_test.dart
rename to tests/standalone_2/io/process_pid_test.dart
index 1a8b69a58cd..a9654215a86 100644
--- a/tests/standalone/io/process_pid_test.dart
+++ b/tests/standalone_2/io/process_pid_test.dart
@@ -13,7 +13,7 @@ import "package:expect/expect.dart";
 main() {
   asyncStart();
   Expect.isTrue(pid > 0);
-  var futures = [];
+  var futures = <Future>[];
   futures.add(Process.start(Platform.executable, ['--version']));
   futures.add(Process.run(Platform.executable, ['--version']));
   Future.wait(futures).then((results) {
diff --git a/tests/standalone/io/process_run_output_test.dart b/tests/standalone_2/io/process_run_output_test.dart
similarity index 92%
rename from tests/standalone/io/process_run_output_test.dart
rename to tests/standalone_2/io/process_run_output_test.dart
index 85b58ea9b17..baebf363b33 100644
--- a/tests/standalone/io/process_run_output_test.dart
+++ b/tests/standalone_2/io/process_run_output_test.dart
@@ -57,9 +57,11 @@ test(scriptFile, String encoding, stream) {
 }
 
 main() {
-  var scriptFile = new File("tests/standalone/io/process_std_io_script2.dart");
+  var scriptFile =
+      new File("tests/standalone_2/io/process_std_io_script2.dart");
   if (!scriptFile.existsSync()) {
-    scriptFile = new File("../tests/standalone/io/process_std_io_script2.dart");
+    scriptFile =
+        new File("../tests/standalone_2/io/process_std_io_script2.dart");
   }
   Expect.isTrue(scriptFile.existsSync());
   test(scriptFile.path, 'ascii', 'stdout');
diff --git a/tests/standalone/io/process_run_test.dart b/tests/standalone_2/io/process_run_test.dart
similarity index 100%
rename from tests/standalone/io/process_run_test.dart
rename to tests/standalone_2/io/process_run_test.dart
diff --git a/tests/standalone/io/process_segfault_test.dart b/tests/standalone_2/io/process_segfault_test.dart
similarity index 100%
rename from tests/standalone/io/process_segfault_test.dart
rename to tests/standalone_2/io/process_segfault_test.dart
index b043ddfb521..b7cfa72d5df 100644
--- a/tests/standalone/io/process_segfault_test.dart
+++ b/tests/standalone_2/io/process_segfault_test.dart
@@ -6,8 +6,8 @@
 
 library ProcessSegfaultTest;
 
-import "package:expect/expect.dart";
 import "dart:io";
+import "package:expect/expect.dart";
 import "process_test_util.dart";
 
 testExit() {
diff --git a/tests/standalone/io/process_set_exit_code_script.dart b/tests/standalone_2/io/process_set_exit_code_script.dart
similarity index 100%
rename from tests/standalone/io/process_set_exit_code_script.dart
rename to tests/standalone_2/io/process_set_exit_code_script.dart
diff --git a/tests/standalone/io/process_set_exit_code_test.dart b/tests/standalone_2/io/process_set_exit_code_test.dart
similarity index 100%
rename from tests/standalone/io/process_set_exit_code_test.dart
rename to tests/standalone_2/io/process_set_exit_code_test.dart
index 7e3e7831e20..e8d9e45dff2 100644
--- a/tests/standalone/io/process_set_exit_code_test.dart
+++ b/tests/standalone_2/io/process_set_exit_code_test.dart
@@ -8,9 +8,9 @@
 
 library ProcessSetExitCodeTest;
 
+import "dart:io";
 import "package:expect/expect.dart";
 import "package:path/path.dart";
-import "dart:io";
 
 main() {
   var executable = Platform.executable;
diff --git a/tests/standalone/io/process_shell_test.dart b/tests/standalone_2/io/process_shell_test.dart
similarity index 91%
rename from tests/standalone/io/process_shell_test.dart
rename to tests/standalone_2/io/process_shell_test.dart
index 1ebc4403c34..c192d90e21a 100644
--- a/tests/standalone/io/process_shell_test.dart
+++ b/tests/standalone_2/io/process_shell_test.dart
@@ -4,11 +4,11 @@
 
 // OtherResources=process_echo_util.dart
 
+import "dart:async";
+import "dart:io";
+import "dart:isolate";
 import "package:path/path.dart";
 import "package:async_helper/async_helper.dart";
-import "dart:io";
-import "dart:async";
-import "dart:isolate";
 
 void testRunShell() {
   test(args) {
@@ -16,11 +16,12 @@ void testRunShell() {
     var script = Platform.script.resolve("process_echo_util.dart").toFilePath();
     Process
         .run(Platform.executable, [script]..addAll(args), runInShell: true)
-        .then((result) {
+        .then((process_result) {
+      var result;
       if (Platform.operatingSystem == "windows") {
-        result = result.stdout.split("\r\n");
+        result = process_result.stdout.split("\r\n");
       } else {
-        result = result.stdout.split("\n");
+        result = process_result.stdout.split("\n");
       }
       if (result.length - 1 != args.length) {
         throw "wrong number of args: $args vs $result";
diff --git a/tests/standalone/io/process_start_exception_test.dart b/tests/standalone_2/io/process_start_exception_test.dart
similarity index 100%
rename from tests/standalone/io/process_start_exception_test.dart
rename to tests/standalone_2/io/process_start_exception_test.dart
index cb5c20c5c29..3a9642e9706 100644
--- a/tests/standalone/io/process_start_exception_test.dart
+++ b/tests/standalone_2/io/process_start_exception_test.dart
@@ -4,9 +4,9 @@
 //
 // Process test program to errors during startup of the process.
 
-import "package:expect/expect.dart";
 import 'dart:async';
 import 'dart:io';
+import "package:expect/expect.dart";
 
 // ENOENT and ERROR_FILE_NOT_FOUND on Windows both have the same value.
 // Note: we are setting PATH to an empty string in tests below because on
diff --git a/tests/standalone/io/process_std_io_script.dart b/tests/standalone_2/io/process_std_io_script.dart
similarity index 100%
rename from tests/standalone/io/process_std_io_script.dart
rename to tests/standalone_2/io/process_std_io_script.dart
diff --git a/tests/standalone/io/process_std_io_script2.dart b/tests/standalone_2/io/process_std_io_script2.dart
similarity index 100%
rename from tests/standalone/io/process_std_io_script2.dart
rename to tests/standalone_2/io/process_std_io_script2.dart
diff --git a/tests/standalone/io/process_stderr_test.dart b/tests/standalone_2/io/process_stderr_test.dart
similarity index 73%
rename from tests/standalone/io/process_stderr_test.dart
rename to tests/standalone_2/io/process_stderr_test.dart
index 56235b5121e..b568c8a95e3 100644
--- a/tests/standalone/io/process_stderr_test.dart
+++ b/tests/standalone_2/io/process_stderr_test.dart
@@ -22,30 +22,31 @@ void test(Future<Process> future, int expectedExitCode) {
       Expect.equals(expectedExitCode, exitCode);
     });
 
-    List<int> data = "ABCDEFGHI\n".codeUnits;
-    final int dataSize = data.length;
+    List<int> input_data = "ABCDEFGHI\n".codeUnits;
+    final int input_dataSize = input_data.length;
 
     int received = 0;
     List<int> buffer = [];
 
-    void readData(data) {
+    void readData(List<int> data) {
       buffer.addAll(data);
       for (int i = received; i < min(data.length, buffer.length) - 1; i++) {
         Expect.equals(data[i], buffer[i]);
       }
       received = buffer.length;
-      if (received >= dataSize) {
+      if (received >= input_dataSize) {
         // We expect an extra character on windows due to carriage return.
-        if (13 == buffer[dataSize - 1] && dataSize + 1 == received) {
-          Expect.equals(13, buffer[dataSize - 1]);
-          Expect.equals(10, buffer[dataSize]);
+        if (13 == buffer[input_dataSize - 1] &&
+            input_dataSize + 1 == received) {
+          Expect.equals(13, buffer[input_dataSize - 1]);
+          Expect.equals(10, buffer[input_dataSize]);
           buffer.removeLast();
         }
       }
     }
 
     process.stdout.listen((_) {});
-    process.stdin.add(data);
+    process.stdin.add(input_data);
     process.stdin.flush().then((_) => process.stdin.close());
     process.stderr.listen(readData);
   });
@@ -58,9 +59,10 @@ main() {
 
   // Run the test using the dart binary with an echo script.
   // The test runner can be run from either the root or from runtime.
-  var scriptFile = new File("tests/standalone/io/process_std_io_script.dart");
+  var scriptFile = new File("tests/standalone_2/io/process_std_io_script.dart");
   if (!scriptFile.existsSync()) {
-    scriptFile = new File("../tests/standalone/io/process_std_io_script.dart");
+    scriptFile =
+        new File("../tests/standalone_2/io/process_std_io_script.dart");
   }
   Expect.isTrue(scriptFile.existsSync());
   test(Process.start(Platform.executable, [scriptFile.path, "1"]), 0);
diff --git a/tests/standalone/io/process_stdin_transform_unsubscribe_script.dart b/tests/standalone_2/io/process_stdin_transform_unsubscribe_script.dart
similarity index 100%
rename from tests/standalone/io/process_stdin_transform_unsubscribe_script.dart
rename to tests/standalone_2/io/process_stdin_transform_unsubscribe_script.dart
diff --git a/tests/standalone/io/process_stdin_transform_unsubscribe_test.dart b/tests/standalone_2/io/process_stdin_transform_unsubscribe_test.dart
similarity index 89%
rename from tests/standalone/io/process_stdin_transform_unsubscribe_test.dart
rename to tests/standalone_2/io/process_stdin_transform_unsubscribe_test.dart
index 2730ae0eaa9..f52f9e0225e 100644
--- a/tests/standalone/io/process_stdin_transform_unsubscribe_test.dart
+++ b/tests/standalone_2/io/process_stdin_transform_unsubscribe_test.dart
@@ -33,9 +33,9 @@ void test(Future<Process> future, int expectedExitCode) {
 
 main() {
   var scriptName = "process_stdin_transform_unsubscribe_script.dart";
-  var scriptFile = new File("tests/standalone/io/$scriptName");
+  var scriptFile = new File("tests/standalone_2/io/$scriptName");
   if (!scriptFile.existsSync()) {
-    scriptFile = new File("../tests/standalone/io/$scriptName");
+    scriptFile = new File("../tests/standalone_2/io/$scriptName");
   }
   Expect.isTrue(scriptFile.existsSync());
   test(Process.start(Platform.executable, [scriptFile.path]), 0);
diff --git a/tests/standalone/io/process_stdout_test.dart b/tests/standalone_2/io/process_stdout_test.dart
similarity index 73%
rename from tests/standalone/io/process_stdout_test.dart
rename to tests/standalone_2/io/process_stdout_test.dart
index f36f94f357a..d492996185b 100644
--- a/tests/standalone/io/process_stdout_test.dart
+++ b/tests/standalone_2/io/process_stdout_test.dart
@@ -22,30 +22,31 @@ void test(Future<Process> future, int expectedExitCode) {
       Expect.equals(expectedExitCode, exitCode);
     });
 
-    List<int> data = "ABCDEFGHI\n".codeUnits;
-    final int dataSize = data.length;
+    List<int> input_data = "ABCDEFGHI\n".codeUnits;
+    final int input_dataSize = input_data.length;
 
     int received = 0;
     List<int> buffer = [];
 
-    void readData(data) {
+    void readData(List<int> data) {
       buffer.addAll(data);
       for (int i = received; i < min(data.length, buffer.length) - 1; i++) {
         Expect.equals(data[i], buffer[i]);
       }
       received = buffer.length;
-      if (received >= dataSize) {
+      if (received >= input_dataSize) {
         // We expect an extra character on windows due to carriage return.
-        if (13 == buffer[dataSize - 1] && dataSize + 1 == received) {
-          Expect.equals(13, buffer[dataSize - 1]);
-          Expect.equals(10, buffer[dataSize]);
+        if (13 == buffer[input_dataSize - 1] &&
+            input_dataSize + 1 == received) {
+          Expect.equals(13, buffer[input_dataSize - 1]);
+          Expect.equals(10, buffer[input_dataSize]);
           buffer.removeLast();
         }
       }
     }
 
     process.stderr.listen((_) {});
-    process.stdin.add(data);
+    process.stdin.add(input_data);
     process.stdin.flush().then((_) => process.stdin.close());
     process.stdout.listen(readData);
   });
@@ -58,9 +59,10 @@ main() {
 
   // Run the test using the dart binary with an echo script.
   // The test runner can be run from either the root or from runtime.
-  var scriptFile = new File("tests/standalone/io/process_std_io_script.dart");
+  var scriptFile = new File("tests/standalone_2/io/process_std_io_script.dart");
   if (!scriptFile.existsSync()) {
-    scriptFile = new File("../tests/standalone/io/process_std_io_script.dart");
+    scriptFile =
+        new File("../tests/standalone_2/io/process_std_io_script.dart");
   }
   Expect.isTrue(scriptFile.existsSync());
   test(Process.start(Platform.executable, [scriptFile.path, "0"]), 0);
diff --git a/tests/standalone/io/process_sync_script.dart b/tests/standalone_2/io/process_sync_script.dart
similarity index 100%
rename from tests/standalone/io/process_sync_script.dart
rename to tests/standalone_2/io/process_sync_script.dart
index 6ef1241ffae..e89d1a95d91 100644
--- a/tests/standalone/io/process_sync_script.dart
+++ b/tests/standalone_2/io/process_sync_script.dart
@@ -5,8 +5,8 @@
 // Utility script to generate some output on stdout and stderr.
 
 import "dart:async";
-import "dart:math";
 import "dart:io";
+import "dart:math";
 
 main(List<String> arguments) {
   var blockCount = int.parse(arguments[0]);
diff --git a/tests/standalone/io/process_sync_test.dart b/tests/standalone_2/io/process_sync_test.dart
similarity index 100%
rename from tests/standalone/io/process_sync_test.dart
rename to tests/standalone_2/io/process_sync_test.dart
index 5ad191187d0..e4fc82a7a13 100644
--- a/tests/standalone/io/process_sync_test.dart
+++ b/tests/standalone_2/io/process_sync_test.dart
@@ -4,9 +4,9 @@
 
 // OtherResources=process_sync_script.dart
 
+import "dart:io";
 import "package:expect/expect.dart";
 import 'package:path/path.dart';
-import "dart:io";
 
 test(int blockCount, int stdoutBlockSize, int stderrBlockSize, int exitCode,
     [int nonWindowsExitCode]) {
diff --git a/tests/standalone/io/process_test_util.dart b/tests/standalone_2/io/process_test_util.dart
similarity index 100%
rename from tests/standalone/io/process_test_util.dart
rename to tests/standalone_2/io/process_test_util.dart
diff --git a/tests/standalone/io/process_working_directory_test.dart b/tests/standalone_2/io/process_working_directory_test.dart
similarity index 100%
rename from tests/standalone/io/process_working_directory_test.dart
rename to tests/standalone_2/io/process_working_directory_test.dart
index 662c863e3db..2643fc0da71 100644
--- a/tests/standalone/io/process_working_directory_test.dart
+++ b/tests/standalone_2/io/process_working_directory_test.dart
@@ -6,8 +6,8 @@
 
 library ProcessWorkingDirectoryTest;
 
-import "package:expect/expect.dart";
 import "dart:io";
+import "package:expect/expect.dart";
 import "process_test_util.dart";
 
 class ProcessWorkingDirectoryTest {
diff --git a/tests/standalone/io/raw_datagram_read_all_test.dart b/tests/standalone_2/io/raw_datagram_read_all_test.dart
similarity index 100%
rename from tests/standalone/io/raw_datagram_read_all_test.dart
rename to tests/standalone_2/io/raw_datagram_read_all_test.dart
diff --git a/tests/standalone/io/raw_secure_server_closing_test.dart b/tests/standalone_2/io/raw_secure_server_closing_test.dart
similarity index 100%
rename from tests/standalone/io/raw_secure_server_closing_test.dart
rename to tests/standalone_2/io/raw_secure_server_closing_test.dart
diff --git a/tests/standalone/io/raw_secure_socket_pause_test.dart b/tests/standalone_2/io/raw_secure_socket_pause_test.dart
similarity index 100%
rename from tests/standalone/io/raw_secure_socket_pause_test.dart
rename to tests/standalone_2/io/raw_secure_socket_pause_test.dart
index 124238ff26b..9bcf421c5a9 100644
--- a/tests/standalone/io/raw_secure_socket_pause_test.dart
+++ b/tests/standalone_2/io/raw_secure_socket_pause_test.dart
@@ -10,11 +10,11 @@
 // OtherResources=certificates/server_key.pem
 // OtherResources=certificates/trusted_certs.pem
 
-import "package:expect/expect.dart";
-import "package:path/path.dart";
 import "dart:async";
 import "dart:io";
 import "dart:isolate";
+import "package:expect/expect.dart";
+import "package:path/path.dart";
 
 String localFile(path) => Platform.script.resolve(path).toFilePath();
 
diff --git a/tests/standalone/io/raw_secure_socket_test.dart b/tests/standalone_2/io/raw_secure_socket_test.dart
similarity index 95%
rename from tests/standalone/io/raw_secure_socket_test.dart
rename to tests/standalone_2/io/raw_secure_socket_test.dart
index 21f81a45028..4689a501967 100644
--- a/tests/standalone/io/raw_secure_socket_test.dart
+++ b/tests/standalone_2/io/raw_secure_socket_test.dart
@@ -10,20 +10,20 @@
 // OtherResources=certificates/server_key.pem
 // OtherResources=certificates/trusted_certs.pem
 
-import "package:expect/expect.dart";
-import "package:path/path.dart";
 import "dart:async";
 import "dart:io";
 import "dart:isolate";
+import "package:expect/expect.dart";
+import "package:path/path.dart";
 
 String localFile(path) => Platform.script.resolve(path).toFilePath();
 
-SecurityContext serverContext = new SecurityContext()
+final SecurityContext serverContext = new SecurityContext()
   ..useCertificateChain(localFile('certificates/server_chain.pem'))
   ..usePrivateKey(localFile('certificates/server_key.pem'),
       password: 'dartdart');
 
-SecurityContext clientContext = new SecurityContext()
+final SecurityContext clientContext = new SecurityContext()
   ..setTrustedCertificates(localFile('certificates/trusted_certs.pem'));
 
 main() async {
diff --git a/tests/standalone/io/raw_server_socket_cancel_test.dart b/tests/standalone_2/io/raw_server_socket_cancel_test.dart
similarity index 100%
rename from tests/standalone/io/raw_server_socket_cancel_test.dart
rename to tests/standalone_2/io/raw_server_socket_cancel_test.dart
diff --git a/tests/standalone/io/raw_socket_cross_process_test.dart b/tests/standalone_2/io/raw_socket_cross_process_test.dart
similarity index 100%
rename from tests/standalone/io/raw_socket_cross_process_test.dart
rename to tests/standalone_2/io/raw_socket_cross_process_test.dart
index a52e5b635eb..86c7b3cc0d4 100644
--- a/tests/standalone/io/raw_socket_cross_process_test.dart
+++ b/tests/standalone_2/io/raw_socket_cross_process_test.dart
@@ -3,9 +3,9 @@
 // BSD-style license that can be found in the LICENSE file.
 //
 
-import "package:expect/expect.dart";
 import 'dart:async';
 import 'dart:io';
+import "package:expect/expect.dart";
 
 const int NUM_SERVERS = 10;
 
diff --git a/tests/standalone/io/raw_socket_test.dart b/tests/standalone_2/io/raw_socket_test.dart
similarity index 100%
rename from tests/standalone/io/raw_socket_test.dart
rename to tests/standalone_2/io/raw_socket_test.dart
diff --git a/tests/standalone/io/raw_socket_typed_data_test.dart b/tests/standalone_2/io/raw_socket_typed_data_test.dart
similarity index 100%
rename from tests/standalone/io/raw_socket_typed_data_test.dart
rename to tests/standalone_2/io/raw_socket_typed_data_test.dart
diff --git a/tests/standalone/io/raw_socket_write_destroy_test.dart b/tests/standalone_2/io/raw_socket_write_destroy_test.dart
similarity index 100%
rename from tests/standalone/io/raw_socket_write_destroy_test.dart
rename to tests/standalone_2/io/raw_socket_write_destroy_test.dart
index 19871033a57..1ef85a22fb2 100644
--- a/tests/standalone/io/raw_socket_write_destroy_test.dart
+++ b/tests/standalone_2/io/raw_socket_write_destroy_test.dart
@@ -7,10 +7,10 @@
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 
-import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
 import "dart:isolate";
+import "package:expect/expect.dart";
 
 const SERVER_ADDRESS = "127.0.0.1";
 
diff --git a/tests/standalone/io/raw_synchronous_socket_test.dart b/tests/standalone_2/io/raw_synchronous_socket_test.dart
similarity index 100%
rename from tests/standalone/io/raw_synchronous_socket_test.dart
rename to tests/standalone_2/io/raw_synchronous_socket_test.dart
diff --git a/tests/standalone_2/io/read_as_text.dat b/tests/standalone_2/io/read_as_text.dat
new file mode 100644
index 00000000000..db2cce6ae21
--- /dev/null
+++ b/tests/standalone_2/io/read_as_text.dat
@@ -0,0 +1 @@
+λx. x
diff --git a/tests/standalone/io/read_into_const_list_test.dart b/tests/standalone_2/io/read_into_const_list_test.dart
similarity index 100%
rename from tests/standalone/io/read_into_const_list_test.dart
rename to tests/standalone_2/io/read_into_const_list_test.dart
diff --git a/tests/standalone_2/io/readline_test1.dat b/tests/standalone_2/io/readline_test1.dat
new file mode 100644
index 00000000000..cfbbd0840b6
--- /dev/null
+++ b/tests/standalone_2/io/readline_test1.dat
@@ -0,0 +1,10 @@
+# Test file with 10 lines and terminating line feed
+#
+Line 3
+Line 4
+Line 5
+Line 6
+Line 7
+Line 8
+Line 9
+Line 10
diff --git a/tests/standalone_2/io/readline_test2.dat b/tests/standalone_2/io/readline_test2.dat
new file mode 100644
index 00000000000..784dee2c520
--- /dev/null
+++ b/tests/standalone_2/io/readline_test2.dat
@@ -0,0 +1,10 @@
+# Test file with 10 lines without terminating line feed
+#
+Line 3
+Line 4
+Line 5
+Line 6
+Line 7
+Line 8
+Line 9
+Line 10
\ No newline at end of file
diff --git a/tests/standalone_2/io/readuntil_test.dat b/tests/standalone_2/io/readuntil_test.dat
new file mode 100644
index 00000000000..aa117d27491
--- /dev/null
+++ b/tests/standalone_2/io/readuntil_test.dat
@@ -0,0 +1,2 @@
+Hello Dart
+wassup!
diff --git a/tests/standalone_2/io/regress_10026_test.dart b/tests/standalone_2/io/regress_10026_test.dart
new file mode 100644
index 00000000000..a0cdb674358
--- /dev/null
+++ b/tests/standalone_2/io/regress_10026_test.dart
@@ -0,0 +1,701 @@
+// 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 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import "package:async_helper/async_helper.dart";
+import "package:expect/expect.dart";
+
+void testZLibInflate_regress10026() {
+  test(data, expect) {
+    asyncStart();
+    var controller = new StreamController(sync: true);
+    controller.stream
+        .transform(ZLIB.decoder)
+        .transform(UTF8.decoder)
+        .fold(new StringBuffer(), (buffer, s) {
+      buffer.write(s);
+      return buffer;
+    }).then((out) {
+      Expect.equals(out.toString(), expect);
+      asyncEnd();
+    });
+    controller.add(data);
+    controller.close();
+  }
+
+  // Generated by using 'gzip -c | od -v -tu1 -An -w12' and adding commas.
+  test([
+    31,
+    139,
+    8,
+    8,
+    238,
+    42,
+    167,
+    81,
+    0,
+    3,
+    116,
+    101,
+    120,
+    116,
+    46,
+    116,
+    120,
+    116,
+    0,
+    125,
+    84,
+    79,
+    175,
+    147,
+    64,
+    16,
+    63,
+    183,
+    159,
+    98,
+    196,
+    139,
+    38,
+    165,
+    244,
+    249,
+    212,
+    52,
+    20,
+    136,
+    70,
+    77,
+    188,
+    168,
+    7,
+    189,
+    120,
+    156,
+    178,
+    67,
+    153,
+    20,
+    118,
+    113,
+    119,
+    161,
+    109,
+    140,
+    223,
+    221,
+    97,
+    105,
+    251,
+    170,
+    47,
+    154,
+    54,
+    41,
+    51,
+    195,
+    254,
+    254,
+    49,
+    52,
+    123,
+    162,
+    76,
+    233,
+    79,
+    29,
+    65,
+    237,
+    219,
+    166,
+    152,
+    103,
+    151,
+    31,
+    66,
+    85,
+    204,
+    103,
+    153,
+    103,
+    223,
+    80,
+    241,
+    225,
+    136,
+    109,
+    215,
+    16,
+    188,
+    55,
+    45,
+    178,
+    206,
+    146,
+    169,
+    59,
+    151,
+    121,
+    75,
+    30,
+    161,
+    172,
+    209,
+    58,
+    242,
+    121,
+    212,
+    251,
+    42,
+    94,
+    71,
+    144,
+    20,
+    151,
+    73,
+    237,
+    125,
+    23,
+    211,
+    143,
+    158,
+    135,
+    60,
+    122,
+    103,
+    180,
+    39,
+    237,
+    227,
+    145,
+    45,
+    130,
+    114,
+    170,
+    242,
+    200,
+    211,
+    209,
+    39,
+    35,
+    235,
+    230,
+    138,
+    243,
+    8,
+    70,
+    99,
+    75,
+    121,
+    52,
+    48,
+    29,
+    58,
+    99,
+    253,
+    205,
+    225,
+    3,
+    43,
+    95,
+    231,
+    138,
+    6,
+    46,
+    41,
+    14,
+    197,
+    2,
+    88,
+    179,
+    103,
+    108,
+    98,
+    87,
+    98,
+    67,
+    249,
+    221,
+    25,
+    199,
+    249,
+    147,
+    24,
+    24,
+    185,
+    207,
+    148,
+    165,
+    115,
+    145,
+    12,
+    182,
+    70,
+    157,
+    224,
+    231,
+    124,
+    54,
+    219,
+    98,
+    185,
+    223,
+    89,
+    211,
+    107,
+    21,
+    151,
+    166,
+    49,
+    54,
+    133,
+    167,
+    213,
+    74,
+    62,
+    47,
+    54,
+    50,
+    108,
+    209,
+    238,
+    88,
+    167,
+    176,
+    26,
+    139,
+    14,
+    149,
+    98,
+    189,
+    59,
+    87,
+    149,
+    104,
+    137,
+    43,
+    108,
+    185,
+    57,
+    165,
+    16,
+    125,
+    233,
+    72,
+    195,
+    87,
+    212,
+    46,
+    90,
+    64,
+    244,
+    145,
+    154,
+    129,
+    60,
+    151,
+    8,
+    159,
+    169,
+    39,
+    233,
+    92,
+    27,
+    11,
+    120,
+    107,
+    69,
+    227,
+    2,
+    156,
+    220,
+    26,
+    59,
+    178,
+    92,
+    109,
+    36,
+    206,
+    95,
+    243,
+    153,
+    226,
+    33,
+    200,
+    9,
+    102,
+    82,
+    120,
+    189,
+    90,
+    117,
+    199,
+    91,
+    5,
+    175,
+    168,
+    5,
+    236,
+    189,
+    249,
+    67,
+    200,
+    61,
+    181,
+    155,
+    127,
+    88,
+    168,
+    170,
+    48,
+    49,
+    86,
+    145,
+    141,
+    45,
+    42,
+    238,
+    93,
+    10,
+    119,
+    225,
+    126,
+    97,
+    195,
+    180,
+    97,
+    189,
+    95,
+    0,
+    166,
+    3,
+    59,
+    246,
+    164,
+    2,
+    247,
+    229,
+    240,
+    253,
+    250,
+    229,
+    122,
+    29,
+    206,
+    143,
+    137,
+    197,
+    138,
+    74,
+    99,
+    209,
+    179,
+    17,
+    25,
+    218,
+    104,
+    154,
+    32,
+    222,
+    180,
+    164,
+    24,
+    225,
+    89,
+    139,
+    199,
+    248,
+    86,
+    244,
+    243,
+    41,
+    213,
+    75,
+    188,
+    255,
+    17,
+    39,
+    32,
+    87,
+    219,
+    23,
+    223,
+    23,
+    139,
+    15,
+    201,
+    63,
+    180,
+    254,
+    50,
+    19,
+    158,
+    194,
+    67,
+    22,
+    147,
+    183,
+    17,
+    84,
+    190,
+    89,
+    18,
+    158,
+    187,
+    44,
+    116,
+    50,
+    109,
+    244,
+    60,
+    27,
+    21,
+    73,
+    45,
+    132,
+    227,
+    90,
+    212,
+    119,
+    143,
+    150,
+    91,
+    90,
+    50,
+    232,
+    138,
+    111,
+    53,
+    59,
+    80,
+    161,
+    9,
+    114,
+    69,
+    206,
+    227,
+    182,
+    97,
+    87,
+    75,
+    72,
+    222,
+    192,
+    150,
+    160,
+    119,
+    114,
+    89,
+    25,
+    11,
+    220,
+    52,
+    189,
+    243,
+    99,
+    52,
+    3,
+    1,
+    77,
+    112,
+    78,
+    246,
+    80,
+    78,
+    151,
+    125,
+    43,
+    139,
+    234,
+    150,
+    240,
+    221,
+    244,
+    82,
+    74,
+    110,
+    30,
+    52,
+    5,
+    136,
+    16,
+    180,
+    88,
+    97,
+    141,
+    158,
+    64,
+    96,
+    208,
+    237,
+    3,
+    92,
+    71,
+    182,
+    101,
+    231,
+    36,
+    231,
+    145,
+    72,
+    88,
+    192,
+    223,
+    74,
+    209,
+    87,
+    10,
+    121,
+    110,
+    90,
+    1,
+    251,
+    81,
+    222,
+    8,
+    140,
+    3,
+    114,
+    35,
+    34,
+    105,
+    132,
+    17,
+    120,
+    75,
+    59,
+    158,
+    116,
+    25,
+    189,
+    204,
+    146,
+    110,
+    242,
+    149,
+    201,
+    107,
+    105,
+    169,
+    202,
+    163,
+    241,
+    229,
+    76,
+    147,
+    228,
+    112,
+    56,
+    44,
+    25,
+    53,
+    46,
+    141,
+    221,
+    37,
+    19,
+    137,
+    75,
+    92,
+    71,
+    165,
+    44,
+    104,
+    84,
+    124,
+    50,
+    150,
+    132,
+    83,
+    0,
+    219,
+    9,
+    103,
+    41,
+    72,
+    88,
+    4,
+    180,
+    44,
+    9,
+    41,
+    102,
+    201,
+    57,
+    211,
+    100,
+    250,
+    243,
+    248,
+    13,
+    215,
+    32,
+    235,
+    247,
+    84,
+    4,
+    0,
+    0
+  ], '''
+<!doctype html>
+<html>
+<head>
+	<title>Example Domain</title>
+
+	<meta charset="utf-8" />
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1" />
+	<style type="text/css">
+	body {
+		background-color: #f0f0f2;
+		margin: 0;
+		padding: 0;
+		font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+
+	}
+	div {
+		width: 600px;
+		margin: 5em auto;
+		padding: 3em;
+		background-color: #fff;
+		border-radius: 1em;
+	}
+	a:link, a:visited {
+		color: #38488f;
+		text-decoration: none;
+	}
+	@media (max-width: 600px) {
+		body {
+			background-color: #fff;
+		}
+		div {
+			width: auto;
+			margin: 0 auto;
+			border-radius: 0;
+			padding: 1em;
+		}
+	}
+	</style>
+</head>
+
+<body>
+<div>
+	<h1>Example Domain</h1>
+	<p>This domain is established to be used for illustrative examples in documents. You do not need to
+		coordinate or ask for permission to use this domain in examples, and it is not available for
+		registration.</p>
+	<p><a href="http://www.iana.org/domains/special">More information...</a></p>
+</div>
+</body>
+</html>
+''');
+}
+
+void main() {
+  testZLibInflate_regress10026();
+}
diff --git a/tests/standalone/io/regress_21160_test.dart b/tests/standalone_2/io/regress_21160_test.dart
similarity index 100%
rename from tests/standalone/io/regress_21160_test.dart
rename to tests/standalone_2/io/regress_21160_test.dart
diff --git a/tests/standalone/io/regress_21987_test.dart b/tests/standalone_2/io/regress_21987_test.dart
similarity index 100%
rename from tests/standalone/io/regress_21987_test.dart
rename to tests/standalone_2/io/regress_21987_test.dart
diff --git a/tests/standalone/io/regress_7191_script.dart b/tests/standalone_2/io/regress_7191_script.dart
similarity index 100%
rename from tests/standalone/io/regress_7191_script.dart
rename to tests/standalone_2/io/regress_7191_script.dart
diff --git a/tests/standalone/io/regress_7191_test.dart b/tests/standalone_2/io/regress_7191_test.dart
similarity index 100%
rename from tests/standalone/io/regress_7191_test.dart
rename to tests/standalone_2/io/regress_7191_test.dart
diff --git a/tests/standalone/io/regress_7679_test.dart b/tests/standalone_2/io/regress_7679_test.dart
similarity index 100%
rename from tests/standalone/io/regress_7679_test.dart
rename to tests/standalone_2/io/regress_7679_test.dart
diff --git a/tests/standalone/io/regress_8828_test.dart b/tests/standalone_2/io/regress_8828_test.dart
similarity index 100%
rename from tests/standalone/io/regress_8828_test.dart
rename to tests/standalone_2/io/regress_8828_test.dart
diff --git a/tests/standalone/io/regress_9194_test.dart b/tests/standalone_2/io/regress_9194_test.dart
similarity index 100%
rename from tests/standalone/io/regress_9194_test.dart
rename to tests/standalone_2/io/regress_9194_test.dart
diff --git a/tests/standalone/io/resolve_symbolic_links_test.dart b/tests/standalone_2/io/resolve_symbolic_links_test.dart
similarity index 95%
rename from tests/standalone/io/resolve_symbolic_links_test.dart
rename to tests/standalone_2/io/resolve_symbolic_links_test.dart
index c8978f6b582..39d980adfac 100644
--- a/tests/standalone/io/resolve_symbolic_links_test.dart
+++ b/tests/standalone_2/io/resolve_symbolic_links_test.dart
@@ -16,16 +16,16 @@ main() {
   // All of these tests test that resolveSymbolicLinks gives a path
   // that points to the same place as the original, and that it removes
   // all links, .., and . segments, and that it produces an absolute path.
-  asyncTest(() => testFile(
-      join(testsDir, 'standalone', 'io', 'resolve_symbolic_links_test.dart')));
-  asyncTest(() => testFile(join(testsDir, 'standalone', 'io', '..', 'io',
+  asyncTest(() => testFile(join(
+      testsDir, 'standalone_2', 'io', 'resolve_symbolic_links_test.dart')));
+  asyncTest(() => testFile(join(testsDir, 'standalone_2', 'io', '..', 'io',
       'resolve_symbolic_links_test.dart')));
 
-  asyncTest(() => testDir(join(testsDir, 'standalone', 'io')));
-  asyncTest(() => testDir(join(testsDir, 'lib', '..', 'standalone', 'io')));
+  asyncTest(() => testDir(join(testsDir, 'standalone_2', 'io')));
+  asyncTest(() => testDir(join(testsDir, 'lib', '..', 'standalone_2', 'io')));
   // Test a relative path.
   if (Platform.isWindows) {
-    asyncTest(() => testFile(join('\\\\?\\$testsDir', 'standalone', 'io',
+    asyncTest(() => testFile(join('\\\\?\\$testsDir', 'standalone_2', 'io',
         'resolve_symbolic_links_test.dart')));
     asyncTest(() => testDir('\\\\?\\$testsDir'));
   }
diff --git a/tests/standalone/io/secure_bad_certificate_test.dart b/tests/standalone_2/io/secure_bad_certificate_test.dart
similarity index 95%
rename from tests/standalone/io/secure_bad_certificate_test.dart
rename to tests/standalone_2/io/secure_bad_certificate_test.dart
index 2ccc3917120..60a2623d873 100644
--- a/tests/standalone/io/secure_bad_certificate_test.dart
+++ b/tests/standalone_2/io/secure_bad_certificate_test.dart
@@ -57,12 +57,13 @@ main() async {
 
 Future runClient(
     int port, SecurityContext context, callbackReturns, result) async {
-  badCertificateCallback(X509Certificate certificate) {
+  bool badCertificateCallback(X509Certificate certificate) {
     Expect.isTrue(certificate.subject.contains('rootauthority'));
     Expect.isTrue(certificate.issuer.contains('rootauthority'));
     // Throw exception if one is requested.
     if (callbackReturns == 'exception') throw new CustomException();
-    return callbackReturns;
+    if (callbackReturns is bool) return callbackReturns;
+    return false;
   }
 
   try {
diff --git a/tests/standalone/io/secure_builtin_roots_test.dart b/tests/standalone_2/io/secure_builtin_roots_test.dart
similarity index 100%
rename from tests/standalone/io/secure_builtin_roots_test.dart
rename to tests/standalone_2/io/secure_builtin_roots_test.dart
diff --git a/tests/standalone/io/secure_client_raw_server_test.dart b/tests/standalone_2/io/secure_client_raw_server_test.dart
similarity index 100%
rename from tests/standalone/io/secure_client_raw_server_test.dart
rename to tests/standalone_2/io/secure_client_raw_server_test.dart
diff --git a/tests/standalone/io/secure_client_server_test.dart b/tests/standalone_2/io/secure_client_server_test.dart
similarity index 100%
rename from tests/standalone/io/secure_client_server_test.dart
rename to tests/standalone_2/io/secure_client_server_test.dart
diff --git a/tests/standalone/io/secure_multiple_client_server_test.dart b/tests/standalone_2/io/secure_multiple_client_server_test.dart
similarity index 100%
rename from tests/standalone/io/secure_multiple_client_server_test.dart
rename to tests/standalone_2/io/secure_multiple_client_server_test.dart
diff --git a/tests/standalone/io/secure_server_client_certificate_test.dart b/tests/standalone_2/io/secure_server_client_certificate_test.dart
similarity index 100%
rename from tests/standalone/io/secure_server_client_certificate_test.dart
rename to tests/standalone_2/io/secure_server_client_certificate_test.dart
diff --git a/tests/standalone/io/secure_server_closing_test.dart b/tests/standalone_2/io/secure_server_closing_test.dart
similarity index 100%
rename from tests/standalone/io/secure_server_closing_test.dart
rename to tests/standalone_2/io/secure_server_closing_test.dart
diff --git a/tests/standalone/io/secure_server_socket_test.dart b/tests/standalone_2/io/secure_server_socket_test.dart
similarity index 100%
rename from tests/standalone/io/secure_server_socket_test.dart
rename to tests/standalone_2/io/secure_server_socket_test.dart
diff --git a/tests/standalone/io/secure_session_resume_test.dart b/tests/standalone_2/io/secure_session_resume_test.dart
similarity index 100%
rename from tests/standalone/io/secure_session_resume_test.dart
rename to tests/standalone_2/io/secure_session_resume_test.dart
diff --git a/tests/standalone/io/secure_socket_alpn_test.dart b/tests/standalone_2/io/secure_socket_alpn_test.dart
similarity index 100%
rename from tests/standalone/io/secure_socket_alpn_test.dart
rename to tests/standalone_2/io/secure_socket_alpn_test.dart
diff --git a/tests/standalone/io/secure_socket_argument_test.dart b/tests/standalone_2/io/secure_socket_argument_test.dart
similarity index 100%
rename from tests/standalone/io/secure_socket_argument_test.dart
rename to tests/standalone_2/io/secure_socket_argument_test.dart
diff --git a/tests/standalone/io/secure_socket_renegotiate_client.dart b/tests/standalone_2/io/secure_socket_renegotiate_client.dart
similarity index 100%
rename from tests/standalone/io/secure_socket_renegotiate_client.dart
rename to tests/standalone_2/io/secure_socket_renegotiate_client.dart
diff --git a/tests/standalone/io/secure_socket_renegotiate_test.dart b/tests/standalone_2/io/secure_socket_renegotiate_test.dart
similarity index 100%
rename from tests/standalone/io/secure_socket_renegotiate_test.dart
rename to tests/standalone_2/io/secure_socket_renegotiate_test.dart
diff --git a/tests/standalone/io/secure_socket_test.dart b/tests/standalone_2/io/secure_socket_test.dart
similarity index 100%
rename from tests/standalone/io/secure_socket_test.dart
rename to tests/standalone_2/io/secure_socket_test.dart
diff --git a/tests/standalone/io/secure_unauthorized_client.dart b/tests/standalone_2/io/secure_unauthorized_client.dart
similarity index 100%
rename from tests/standalone/io/secure_unauthorized_client.dart
rename to tests/standalone_2/io/secure_unauthorized_client.dart
diff --git a/tests/standalone/io/secure_unauthorized_test.dart b/tests/standalone_2/io/secure_unauthorized_test.dart
similarity index 100%
rename from tests/standalone/io/secure_unauthorized_test.dart
rename to tests/standalone_2/io/secure_unauthorized_test.dart
diff --git a/tests/standalone/io/signal_test_script.dart b/tests/standalone_2/io/signal_test_script.dart
similarity index 100%
rename from tests/standalone/io/signal_test_script.dart
rename to tests/standalone_2/io/signal_test_script.dart
diff --git a/tests/standalone/io/signals_exception_test.dart b/tests/standalone_2/io/signals_exception_test.dart
similarity index 100%
rename from tests/standalone/io/signals_exception_test.dart
rename to tests/standalone_2/io/signals_exception_test.dart
diff --git a/tests/standalone/io/signals_test.dart b/tests/standalone_2/io/signals_test.dart
similarity index 100%
rename from tests/standalone/io/signals_test.dart
rename to tests/standalone_2/io/signals_test.dart
diff --git a/tests/standalone/io/signals_test_script.dart b/tests/standalone_2/io/signals_test_script.dart
similarity index 100%
rename from tests/standalone/io/signals_test_script.dart
rename to tests/standalone_2/io/signals_test_script.dart
diff --git a/tests/standalone/io/skipping_dart2js_compilations_helper.dart b/tests/standalone_2/io/skipping_dart2js_compilations_helper.dart
similarity index 100%
rename from tests/standalone/io/skipping_dart2js_compilations_helper.dart
rename to tests/standalone_2/io/skipping_dart2js_compilations_helper.dart
diff --git a/tests/standalone/io/skipping_dart2js_compilations_test.dart b/tests/standalone_2/io/skipping_dart2js_compilations_test.dart
similarity index 100%
rename from tests/standalone/io/skipping_dart2js_compilations_test.dart
rename to tests/standalone_2/io/skipping_dart2js_compilations_test.dart
diff --git a/tests/standalone/io/snapshot_fail_script.dart b/tests/standalone_2/io/snapshot_fail_script.dart
similarity index 100%
rename from tests/standalone/io/snapshot_fail_script.dart
rename to tests/standalone_2/io/snapshot_fail_script.dart
diff --git a/tests/standalone/io/snapshot_fail_test.dart b/tests/standalone_2/io/snapshot_fail_test.dart
similarity index 100%
rename from tests/standalone/io/snapshot_fail_test.dart
rename to tests/standalone_2/io/snapshot_fail_test.dart
diff --git a/tests/standalone/io/socket_bind_test.dart b/tests/standalone_2/io/socket_bind_test.dart
similarity index 100%
rename from tests/standalone/io/socket_bind_test.dart
rename to tests/standalone_2/io/socket_bind_test.dart
diff --git a/tests/standalone/io/socket_close_test.dart b/tests/standalone_2/io/socket_close_test.dart
similarity index 100%
rename from tests/standalone/io/socket_close_test.dart
rename to tests/standalone_2/io/socket_close_test.dart
diff --git a/tests/standalone/io/socket_cross_process_test.dart b/tests/standalone_2/io/socket_cross_process_test.dart
similarity index 100%
rename from tests/standalone/io/socket_cross_process_test.dart
rename to tests/standalone_2/io/socket_cross_process_test.dart
diff --git a/tests/standalone/io/socket_exception_test.dart b/tests/standalone_2/io/socket_exception_test.dart
similarity index 100%
rename from tests/standalone/io/socket_exception_test.dart
rename to tests/standalone_2/io/socket_exception_test.dart
diff --git a/tests/standalone/io/socket_finalizer_test.dart b/tests/standalone_2/io/socket_finalizer_test.dart
similarity index 100%
rename from tests/standalone/io/socket_finalizer_test.dart
rename to tests/standalone_2/io/socket_finalizer_test.dart
diff --git a/tests/standalone/io/socket_info_ipv4_test.dart b/tests/standalone_2/io/socket_info_ipv4_test.dart
similarity index 100%
rename from tests/standalone/io/socket_info_ipv4_test.dart
rename to tests/standalone_2/io/socket_info_ipv4_test.dart
diff --git a/tests/standalone/io/socket_info_ipv6_test.dart b/tests/standalone_2/io/socket_info_ipv6_test.dart
similarity index 100%
rename from tests/standalone/io/socket_info_ipv6_test.dart
rename to tests/standalone_2/io/socket_info_ipv6_test.dart
diff --git a/tests/standalone/io/socket_ipv6_test.dart b/tests/standalone_2/io/socket_ipv6_test.dart
similarity index 100%
rename from tests/standalone/io/socket_ipv6_test.dart
rename to tests/standalone_2/io/socket_ipv6_test.dart
diff --git a/tests/standalone/io/socket_many_connections_test.dart b/tests/standalone_2/io/socket_many_connections_test.dart
similarity index 100%
rename from tests/standalone/io/socket_many_connections_test.dart
rename to tests/standalone_2/io/socket_many_connections_test.dart
diff --git a/tests/standalone/io/socket_port_test.dart b/tests/standalone_2/io/socket_port_test.dart
similarity index 100%
rename from tests/standalone/io/socket_port_test.dart
rename to tests/standalone_2/io/socket_port_test.dart
diff --git a/tests/standalone/io/socket_source_address_test.dart b/tests/standalone_2/io/socket_source_address_test.dart
similarity index 100%
rename from tests/standalone/io/socket_source_address_test.dart
rename to tests/standalone_2/io/socket_source_address_test.dart
diff --git a/tests/standalone/io/socket_test.dart b/tests/standalone_2/io/socket_test.dart
similarity index 100%
rename from tests/standalone/io/socket_test.dart
rename to tests/standalone_2/io/socket_test.dart
diff --git a/tests/standalone/io/socket_upgrade_to_secure_test.dart b/tests/standalone_2/io/socket_upgrade_to_secure_test.dart
similarity index 100%
rename from tests/standalone/io/socket_upgrade_to_secure_test.dart
rename to tests/standalone_2/io/socket_upgrade_to_secure_test.dart
diff --git a/tests/standalone/io/stdin_sync_script.dart b/tests/standalone_2/io/stdin_sync_script.dart
similarity index 100%
rename from tests/standalone/io/stdin_sync_script.dart
rename to tests/standalone_2/io/stdin_sync_script.dart
diff --git a/tests/standalone/io/stdin_sync_test.dart b/tests/standalone_2/io/stdin_sync_test.dart
similarity index 100%
rename from tests/standalone/io/stdin_sync_test.dart
rename to tests/standalone_2/io/stdin_sync_test.dart
diff --git a/tests/standalone/io/stdio_implicit_close_script.dart b/tests/standalone_2/io/stdio_implicit_close_script.dart
similarity index 100%
rename from tests/standalone/io/stdio_implicit_close_script.dart
rename to tests/standalone_2/io/stdio_implicit_close_script.dart
diff --git a/tests/standalone/io/stdio_implicit_close_test.dart b/tests/standalone_2/io/stdio_implicit_close_test.dart
similarity index 100%
rename from tests/standalone/io/stdio_implicit_close_test.dart
rename to tests/standalone_2/io/stdio_implicit_close_test.dart
diff --git a/tests/standalone/io/stdio_nonblocking_script.dart b/tests/standalone_2/io/stdio_nonblocking_script.dart
similarity index 100%
rename from tests/standalone/io/stdio_nonblocking_script.dart
rename to tests/standalone_2/io/stdio_nonblocking_script.dart
diff --git a/tests/standalone/io/stdio_nonblocking_test.dart b/tests/standalone_2/io/stdio_nonblocking_test.dart
similarity index 100%
rename from tests/standalone/io/stdio_nonblocking_test.dart
rename to tests/standalone_2/io/stdio_nonblocking_test.dart
diff --git a/tests/standalone/io/stdio_socket_finalizer_test.dart b/tests/standalone_2/io/stdio_socket_finalizer_test.dart
similarity index 100%
rename from tests/standalone/io/stdio_socket_finalizer_test.dart
rename to tests/standalone_2/io/stdio_socket_finalizer_test.dart
diff --git a/tests/standalone/io/stdout_close_test.dart b/tests/standalone_2/io/stdout_close_test.dart
similarity index 100%
rename from tests/standalone/io/stdout_close_test.dart
rename to tests/standalone_2/io/stdout_close_test.dart
diff --git a/tests/standalone/io/stdout_stderr_non_blocking_test.dart b/tests/standalone_2/io/stdout_stderr_non_blocking_test.dart
similarity index 100%
rename from tests/standalone/io/stdout_stderr_non_blocking_test.dart
rename to tests/standalone_2/io/stdout_stderr_non_blocking_test.dart
diff --git a/tests/standalone/io/stdout_stderr_terminal_test.dart b/tests/standalone_2/io/stdout_stderr_terminal_test.dart
similarity index 100%
rename from tests/standalone/io/stdout_stderr_terminal_test.dart
rename to tests/standalone_2/io/stdout_stderr_terminal_test.dart
diff --git a/tests/standalone/io/stdout_stderr_test.dart b/tests/standalone_2/io/stdout_stderr_test.dart
similarity index 100%
rename from tests/standalone/io/stdout_stderr_test.dart
rename to tests/standalone_2/io/stdout_stderr_test.dart
diff --git a/tests/standalone/io/stream_pipe_test.dart b/tests/standalone_2/io/stream_pipe_test.dart
similarity index 100%
rename from tests/standalone/io/stream_pipe_test.dart
rename to tests/standalone_2/io/stream_pipe_test.dart
diff --git a/tests/standalone/io/system_encoding_test.dart b/tests/standalone_2/io/system_encoding_test.dart
similarity index 100%
rename from tests/standalone/io/system_encoding_test.dart
rename to tests/standalone_2/io/system_encoding_test.dart
diff --git a/tests/standalone/io/test_extension.dart b/tests/standalone_2/io/test_extension.dart
similarity index 100%
rename from tests/standalone/io/test_extension.dart
rename to tests/standalone_2/io/test_extension.dart
diff --git a/tests/standalone/io/test_extension_fail_test.dart b/tests/standalone_2/io/test_extension_fail_test.dart
similarity index 100%
rename from tests/standalone/io/test_extension_fail_test.dart
rename to tests/standalone_2/io/test_extension_fail_test.dart
diff --git a/tests/standalone/io/test_extension_fail_tester.dart b/tests/standalone_2/io/test_extension_fail_tester.dart
similarity index 100%
rename from tests/standalone/io/test_extension_fail_tester.dart
rename to tests/standalone_2/io/test_extension_fail_tester.dart
diff --git a/tests/standalone/io/test_extension_test.dart b/tests/standalone_2/io/test_extension_test.dart
similarity index 100%
rename from tests/standalone/io/test_extension_test.dart
rename to tests/standalone_2/io/test_extension_test.dart
diff --git a/tests/standalone/io/test_extension_tester.dart b/tests/standalone_2/io/test_extension_tester.dart
similarity index 100%
rename from tests/standalone/io/test_extension_tester.dart
rename to tests/standalone_2/io/test_extension_tester.dart
diff --git a/tests/standalone/io/test_harness_analyzer_test.dart b/tests/standalone_2/io/test_harness_analyzer_test.dart
similarity index 100%
rename from tests/standalone/io/test_harness_analyzer_test.dart
rename to tests/standalone_2/io/test_harness_analyzer_test.dart
diff --git a/tests/standalone/io/test_relative_extension.dart b/tests/standalone_2/io/test_relative_extension.dart
similarity index 100%
rename from tests/standalone/io/test_relative_extension.dart
rename to tests/standalone_2/io/test_relative_extension.dart
diff --git a/tests/standalone/io/test_relative_extension_fail_tester.dart b/tests/standalone_2/io/test_relative_extension_fail_tester.dart
similarity index 100%
rename from tests/standalone/io/test_relative_extension_fail_tester.dart
rename to tests/standalone_2/io/test_relative_extension_fail_tester.dart
diff --git a/tests/standalone/io/test_runner_exit_code_script.dart b/tests/standalone_2/io/test_runner_exit_code_script.dart
similarity index 100%
rename from tests/standalone/io/test_runner_exit_code_script.dart
rename to tests/standalone_2/io/test_runner_exit_code_script.dart
diff --git a/tests/standalone/io/test_runner_test.dart b/tests/standalone_2/io/test_runner_test.dart
similarity index 100%
rename from tests/standalone/io/test_runner_test.dart
rename to tests/standalone_2/io/test_runner_test.dart
diff --git a/tests/standalone/io/test_utils.dart b/tests/standalone_2/io/test_utils.dart
similarity index 100%
rename from tests/standalone/io/test_utils.dart
rename to tests/standalone_2/io/test_utils.dart
diff --git a/tests/standalone/io/testing_server.dart b/tests/standalone_2/io/testing_server.dart
similarity index 100%
rename from tests/standalone/io/testing_server.dart
rename to tests/standalone_2/io/testing_server.dart
diff --git a/tests/standalone/io/uri_platform_test.dart b/tests/standalone_2/io/uri_platform_test.dart
similarity index 100%
rename from tests/standalone/io/uri_platform_test.dart
rename to tests/standalone_2/io/uri_platform_test.dart
diff --git a/tests/standalone/io/web_socket_compression_test.dart b/tests/standalone_2/io/web_socket_compression_test.dart
similarity index 100%
rename from tests/standalone/io/web_socket_compression_test.dart
rename to tests/standalone_2/io/web_socket_compression_test.dart
diff --git a/tests/standalone/io/web_socket_error_test.dart b/tests/standalone_2/io/web_socket_error_test.dart
similarity index 100%
rename from tests/standalone/io/web_socket_error_test.dart
rename to tests/standalone_2/io/web_socket_error_test.dart
diff --git a/tests/standalone/io/web_socket_ping_test.dart b/tests/standalone_2/io/web_socket_ping_test.dart
similarity index 100%
rename from tests/standalone/io/web_socket_ping_test.dart
rename to tests/standalone_2/io/web_socket_ping_test.dart
diff --git a/tests/standalone/io/web_socket_pipe_test.dart b/tests/standalone_2/io/web_socket_pipe_test.dart
similarity index 100%
rename from tests/standalone/io/web_socket_pipe_test.dart
rename to tests/standalone_2/io/web_socket_pipe_test.dart
diff --git a/tests/standalone/io/web_socket_protocol_processor_test.dart b/tests/standalone_2/io/web_socket_protocol_processor_test.dart
similarity index 100%
rename from tests/standalone/io/web_socket_protocol_processor_test.dart
rename to tests/standalone_2/io/web_socket_protocol_processor_test.dart
diff --git a/tests/standalone/io/web_socket_protocol_test.dart b/tests/standalone_2/io/web_socket_protocol_test.dart
similarity index 100%
rename from tests/standalone/io/web_socket_protocol_test.dart
rename to tests/standalone_2/io/web_socket_protocol_test.dart
diff --git a/tests/standalone/io/web_socket_test.dart b/tests/standalone_2/io/web_socket_test.dart
similarity index 99%
rename from tests/standalone/io/web_socket_test.dart
rename to tests/standalone_2/io/web_socket_test.dart
index df6d617046d..caf524ca573 100644
--- a/tests/standalone/io/web_socket_test.dart
+++ b/tests/standalone_2/io/web_socket_test.dart
@@ -395,7 +395,7 @@ class SecurityConfiguration {
         }
       });
 
-      var futures = [];
+      var futures = <Future>[];
 
       var wsProtocol = '${secure ? "wss" : "ws"}';
       var baseWsUrl = '$wsProtocol://$HOST_NAME:${server.port}/';
@@ -525,7 +525,7 @@ class SecurityConfiguration {
       WebSocket.connect(url).then((websocket) {
         return websocket.listen((message) {
           Expect.equals("Hello", message);
-          return websocket.close();
+          websocket.close();
         }).asFuture();
       }).then((_) {
         return server.close();
diff --git a/tests/standalone/io/web_socket_typed_data_test.dart b/tests/standalone_2/io/web_socket_typed_data_test.dart
similarity index 99%
rename from tests/standalone/io/web_socket_typed_data_test.dart
rename to tests/standalone_2/io/web_socket_typed_data_test.dart
index cf253af0677..59939e21d28 100644
--- a/tests/standalone/io/web_socket_typed_data_test.dart
+++ b/tests/standalone_2/io/web_socket_typed_data_test.dart
@@ -99,7 +99,7 @@ void testOutOfRangeClient({bool compression: false}) {
       return completer.future;
     }
 
-    var futures = [];
+    var futures = <Future>[];
     var data;
     data = new Uint16List(1);
     data[0] = 256;
@@ -133,7 +133,7 @@ void testOutOfRangeClient({bool compression: false}) {
 }
 
 void testOutOfRangeServer({bool compression: false}) {
-  var futures = [];
+  var futures = <Future>[];
   var testData = [];
   var data;
   data = new Uint16List(1);
diff --git a/tests/standalone/io/windows_environment_script.dart b/tests/standalone_2/io/windows_environment_script.dart
similarity index 100%
rename from tests/standalone/io/windows_environment_script.dart
rename to tests/standalone_2/io/windows_environment_script.dart
diff --git a/tests/standalone/io/windows_environment_test.dart b/tests/standalone_2/io/windows_environment_test.dart
similarity index 100%
rename from tests/standalone/io/windows_environment_test.dart
rename to tests/standalone_2/io/windows_environment_test.dart
diff --git a/tests/standalone/io/windows_file_system_async_links_test.dart b/tests/standalone_2/io/windows_file_system_async_links_test.dart
similarity index 100%
rename from tests/standalone/io/windows_file_system_async_links_test.dart
rename to tests/standalone_2/io/windows_file_system_async_links_test.dart
diff --git a/tests/standalone/io/windows_file_system_links_test.dart b/tests/standalone_2/io/windows_file_system_links_test.dart
similarity index 100%
rename from tests/standalone/io/windows_file_system_links_test.dart
rename to tests/standalone_2/io/windows_file_system_links_test.dart
diff --git a/tests/standalone/io/zlib_test.dart b/tests/standalone_2/io/zlib_test.dart
similarity index 100%
rename from tests/standalone/io/zlib_test.dart
rename to tests/standalone_2/io/zlib_test.dart
diff --git a/tests/standalone/left_shift_bit_and_op_test.dart b/tests/standalone_2/left_shift_bit_and_op_test.dart
similarity index 100%
rename from tests/standalone/left_shift_bit_and_op_test.dart
rename to tests/standalone_2/left_shift_bit_and_op_test.dart
diff --git a/tests/standalone/link_natives_lazily_test.dart b/tests/standalone_2/link_natives_lazily_test.dart
similarity index 100%
rename from tests/standalone/link_natives_lazily_test.dart
rename to tests/standalone_2/link_natives_lazily_test.dart
diff --git a/tests/standalone/map_insert_remove_oom_test.dart b/tests/standalone_2/map_insert_remove_oom_test.dart
similarity index 100%
rename from tests/standalone/map_insert_remove_oom_test.dart
rename to tests/standalone_2/map_insert_remove_oom_test.dart
diff --git a/tests/standalone/medium_integer_test.dart b/tests/standalone_2/medium_integer_test.dart
similarity index 96%
rename from tests/standalone/medium_integer_test.dart
rename to tests/standalone_2/medium_integer_test.dart
index bf0edf12826..e7f477fa6f4 100644
--- a/tests/standalone/medium_integer_test.dart
+++ b/tests/standalone_2/medium_integer_test.dart
@@ -43,10 +43,10 @@ class MediumIntegerTest {
     Expect.equals(10100000000000000002, a + b);
 
     // Mint and double.
-    a = 100000000000.0;
+    var da = 100000000000.0;
     b = 100000000000;
-    Expect.equals(200000000000.0, a + b);
-    Expect.equals(200000000000.0, b + a);
+    Expect.equals(200000000000.0, da + b);
+    Expect.equals(200000000000.0, b + da);
   }
 
   static testMintSub() {
diff --git a/tests/standalone/no_allow_absolute_addresses_test.dart b/tests/standalone_2/no_allow_absolute_addresses_test.dart
similarity index 100%
rename from tests/standalone/no_allow_absolute_addresses_test.dart
rename to tests/standalone_2/no_allow_absolute_addresses_test.dart
diff --git a/tests/standalone/no_lazy_dispatchers_test.dart b/tests/standalone_2/no_lazy_dispatchers_test.dart
similarity index 100%
rename from tests/standalone/no_lazy_dispatchers_test.dart
rename to tests/standalone_2/no_lazy_dispatchers_test.dart
diff --git a/tests/standalone/no_profiler_test.dart b/tests/standalone_2/no_profiler_test.dart
similarity index 100%
rename from tests/standalone/no_profiler_test.dart
rename to tests/standalone_2/no_profiler_test.dart
diff --git a/tests/standalone/no_support_ast_printer_test.dart b/tests/standalone_2/no_support_ast_printer_test.dart
similarity index 100%
rename from tests/standalone/no_support_ast_printer_test.dart
rename to tests/standalone_2/no_support_ast_printer_test.dart
diff --git a/tests/standalone/no_support_debugger_test.dart b/tests/standalone_2/no_support_debugger_test.dart
similarity index 100%
rename from tests/standalone/no_support_debugger_test.dart
rename to tests/standalone_2/no_support_debugger_test.dart
diff --git a/tests/standalone/no_support_disassembler_test.dart b/tests/standalone_2/no_support_disassembler_test.dart
similarity index 100%
rename from tests/standalone/no_support_disassembler_test.dart
rename to tests/standalone_2/no_support_disassembler_test.dart
diff --git a/tests/standalone/no_support_il_printer_test.dart b/tests/standalone_2/no_support_il_printer_test.dart
similarity index 100%
rename from tests/standalone/no_support_il_printer_test.dart
rename to tests/standalone_2/no_support_il_printer_test.dart
diff --git a/tests/standalone/no_support_service_test.dart b/tests/standalone_2/no_support_service_test.dart
similarity index 100%
rename from tests/standalone/no_support_service_test.dart
rename to tests/standalone_2/no_support_service_test.dart
diff --git a/tests/standalone/no_support_timeline_test.dart b/tests/standalone_2/no_support_timeline_test.dart
similarity index 100%
rename from tests/standalone/no_support_timeline_test.dart
rename to tests/standalone_2/no_support_timeline_test.dart
diff --git a/tests/standalone/number_identity_test.dart b/tests/standalone_2/number_identity_test.dart
similarity index 93%
rename from tests/standalone/number_identity_test.dart
rename to tests/standalone_2/number_identity_test.dart
index 261d6e0e211..bb25b80ab59 100644
--- a/tests/standalone/number_identity_test.dart
+++ b/tests/standalone_2/number_identity_test.dart
@@ -19,8 +19,8 @@ testNumberIdentity() {
   // No int/double differences in dart2js.
   var a = smi + 0;
   Expect.isFalse(identical(a, dbl));
-  a = dbl + 0.0;
-  Expect.isFalse(identical(a, smi));
+  var c = dbl + 0.0;
+  Expect.isFalse(identical(c, smi));
 
   a = bigint;
   var b = a + 0;
diff --git a/tests/standalone/oom_error_stacktrace_test.dart b/tests/standalone_2/oom_error_stacktrace_test.dart
similarity index 100%
rename from tests/standalone/oom_error_stacktrace_test.dart
rename to tests/standalone_2/oom_error_stacktrace_test.dart
diff --git a/tests/standalone/out_of_memory_test.dart b/tests/standalone_2/out_of_memory_test.dart
similarity index 100%
rename from tests/standalone/out_of_memory_test.dart
rename to tests/standalone_2/out_of_memory_test.dart
diff --git a/tests/standalone/package/invalid_uri_test.dart b/tests/standalone_2/package/invalid_uri_test.dart
similarity index 100%
rename from tests/standalone/package/invalid_uri_test.dart
rename to tests/standalone_2/package/invalid_uri_test.dart
diff --git a/tests/standalone/package/package1_test.dart b/tests/standalone_2/package/package1_test.dart
similarity index 100%
rename from tests/standalone/package/package1_test.dart
rename to tests/standalone_2/package/package1_test.dart
diff --git a/tests/standalone/package/package_isolate_test.dart b/tests/standalone_2/package/package_isolate_test.dart
similarity index 100%
rename from tests/standalone/package/package_isolate_test.dart
rename to tests/standalone_2/package/package_isolate_test.dart
diff --git a/tests/standalone/package/package_test.dart b/tests/standalone_2/package/package_test.dart
similarity index 100%
rename from tests/standalone/package/package_test.dart
rename to tests/standalone_2/package/package_test.dart
diff --git a/tests/standalone/package/packages/lib1.dart b/tests/standalone_2/package/packages/lib1.dart
similarity index 100%
rename from tests/standalone/package/packages/lib1.dart
rename to tests/standalone_2/package/packages/lib1.dart
diff --git a/tests/standalone/package/packages/lib2/lib2.dart b/tests/standalone_2/package/packages/lib2/lib2.dart
similarity index 100%
rename from tests/standalone/package/packages/lib2/lib2.dart
rename to tests/standalone_2/package/packages/lib2/lib2.dart
diff --git a/tests/standalone/package/packages/lib3/sub/lib3.dart b/tests/standalone_2/package/packages/lib3/sub/lib3.dart
similarity index 100%
rename from tests/standalone/package/packages/lib3/sub/lib3.dart
rename to tests/standalone_2/package/packages/lib3/sub/lib3.dart
diff --git a/tests/standalone/package/packages/package1.dart b/tests/standalone_2/package/packages/package1.dart
similarity index 100%
rename from tests/standalone/package/packages/package1.dart
rename to tests/standalone_2/package/packages/package1.dart
diff --git a/tests/standalone/package/packages/package2.dart b/tests/standalone_2/package/packages/package2.dart
similarity index 100%
rename from tests/standalone/package/packages/package2.dart
rename to tests/standalone_2/package/packages/package2.dart
diff --git a/tests/standalone/package/packages/shared.dart b/tests/standalone_2/package/packages/shared.dart
similarity index 100%
rename from tests/standalone/package/packages/shared.dart
rename to tests/standalone_2/package/packages/shared.dart
diff --git a/tests/standalone_2/package/scenarios/both_dir_and_file/.packages b/tests/standalone_2/package/scenarios/both_dir_and_file/.packages
new file mode 100644
index 00000000000..17ae735b318
--- /dev/null
+++ b/tests/standalone_2/package/scenarios/both_dir_and_file/.packages
@@ -0,0 +1 @@
+foo:foo/
\ No newline at end of file
diff --git a/tests/standalone/package/scenarios/both_dir_and_file/both_dir_and_file_noimports_test.dart b/tests/standalone_2/package/scenarios/both_dir_and_file/both_dir_and_file_noimports_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/both_dir_and_file/both_dir_and_file_noimports_test.dart
rename to tests/standalone_2/package/scenarios/both_dir_and_file/both_dir_and_file_noimports_test.dart
diff --git a/tests/standalone/package/scenarios/both_dir_and_file/foo/foo.dart b/tests/standalone_2/package/scenarios/both_dir_and_file/foo/foo.dart
similarity index 100%
rename from tests/standalone/package/scenarios/both_dir_and_file/foo/foo.dart
rename to tests/standalone_2/package/scenarios/both_dir_and_file/foo/foo.dart
diff --git a/tests/standalone/package/scenarios/both_dir_and_file/packages/foo/foo.dart b/tests/standalone_2/package/scenarios/both_dir_and_file/packages/foo/foo.dart
similarity index 100%
rename from tests/standalone/package/scenarios/both_dir_and_file/packages/foo/foo.dart
rename to tests/standalone_2/package/scenarios/both_dir_and_file/packages/foo/foo.dart
diff --git a/tests/standalone/package/scenarios/both_dir_and_file/prefers_packages_file_test.dart b/tests/standalone_2/package/scenarios/both_dir_and_file/prefers_packages_file_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/both_dir_and_file/prefers_packages_file_test.dart
rename to tests/standalone_2/package/scenarios/both_dir_and_file/prefers_packages_file_test.dart
diff --git a/tests/standalone_2/package/scenarios/empty_packages_file/.packages b/tests/standalone_2/package/scenarios/empty_packages_file/.packages
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/standalone/package/scenarios/empty_packages_file/empty_packages_file_discovery_test.dart b/tests/standalone_2/package/scenarios/empty_packages_file/empty_packages_file_discovery_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/empty_packages_file/empty_packages_file_discovery_test.dart
rename to tests/standalone_2/package/scenarios/empty_packages_file/empty_packages_file_discovery_test.dart
diff --git a/tests/standalone/package/scenarios/empty_packages_file/empty_packages_file_noimports_test.dart b/tests/standalone_2/package/scenarios/empty_packages_file/empty_packages_file_noimports_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/empty_packages_file/empty_packages_file_noimports_test.dart
rename to tests/standalone_2/package/scenarios/empty_packages_file/empty_packages_file_noimports_test.dart
diff --git a/tests/standalone/package/scenarios/empty_packages_file/empty_packages_file_option_test.dart b/tests/standalone_2/package/scenarios/empty_packages_file/empty_packages_file_option_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/empty_packages_file/empty_packages_file_option_test.dart
rename to tests/standalone_2/package/scenarios/empty_packages_file/empty_packages_file_option_test.dart
diff --git a/tests/standalone/package/scenarios/invalid/foo/foo.dart b/tests/standalone_2/package/scenarios/invalid/foo/foo.dart
similarity index 100%
rename from tests/standalone/package/scenarios/invalid/foo/foo.dart
rename to tests/standalone_2/package/scenarios/invalid/foo/foo.dart
diff --git a/tests/standalone_2/package/scenarios/invalid/invalid_package_name.packages b/tests/standalone_2/package/scenarios/invalid/invalid_package_name.packages
new file mode 100644
index 00000000000..d74d280256d
--- /dev/null
+++ b/tests/standalone_2/package/scenarios/invalid/invalid_package_name.packages
@@ -0,0 +1,2 @@
+..:nonexistent/
+foo:foo/
\ No newline at end of file
diff --git a/tests/standalone/package/scenarios/invalid/invalid_package_name_test.dart b/tests/standalone_2/package/scenarios/invalid/invalid_package_name_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/invalid/invalid_package_name_test.dart
rename to tests/standalone_2/package/scenarios/invalid/invalid_package_name_test.dart
diff --git a/tests/standalone_2/package/scenarios/invalid/invalid_utf8.packages b/tests/standalone_2/package/scenarios/invalid/invalid_utf8.packages
new file mode 100644
index 00000000000..b0c09d0d15f
--- /dev/null
+++ b/tests/standalone_2/package/scenarios/invalid/invalid_utf8.packages
@@ -0,0 +1 @@
+þ:foo/
diff --git a/tests/standalone/package/scenarios/invalid/invalid_utf8_test.dart b/tests/standalone_2/package/scenarios/invalid/invalid_utf8_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/invalid/invalid_utf8_test.dart
rename to tests/standalone_2/package/scenarios/invalid/invalid_utf8_test.dart
diff --git a/tests/standalone/package/scenarios/invalid/non_existent_packages_file_test.dart b/tests/standalone_2/package/scenarios/invalid/non_existent_packages_file_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/invalid/non_existent_packages_file_test.dart
rename to tests/standalone_2/package/scenarios/invalid/non_existent_packages_file_test.dart
diff --git a/tests/standalone_2/package/scenarios/invalid/same_package_twice.packages b/tests/standalone_2/package/scenarios/invalid/same_package_twice.packages
new file mode 100644
index 00000000000..bdd57b6894d
--- /dev/null
+++ b/tests/standalone_2/package/scenarios/invalid/same_package_twice.packages
@@ -0,0 +1,3 @@
+foo:nonexistentdir/
+# This overrides the previous entry
+foo:foo/
\ No newline at end of file
diff --git a/tests/standalone/package/scenarios/invalid/same_package_twice_test.dart b/tests/standalone_2/package/scenarios/invalid/same_package_twice_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/invalid/same_package_twice_test.dart
rename to tests/standalone_2/package/scenarios/invalid/same_package_twice_test.dart
diff --git a/tests/standalone/package/scenarios/packages_dir_only/packages/foo/foo.dart b/tests/standalone_2/package/scenarios/packages_dir_only/packages/foo/foo.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_dir_only/packages/foo/foo.dart
rename to tests/standalone_2/package/scenarios/packages_dir_only/packages/foo/foo.dart
diff --git a/tests/standalone/package/scenarios/packages_dir_only/packages_dir_only_noimports_test.dart b/tests/standalone_2/package/scenarios/packages_dir_only/packages_dir_only_noimports_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_dir_only/packages_dir_only_noimports_test.dart
rename to tests/standalone_2/package/scenarios/packages_dir_only/packages_dir_only_noimports_test.dart
diff --git a/tests/standalone/package/scenarios/packages_dir_only/packages_dir_only_test.dart b/tests/standalone_2/package/scenarios/packages_dir_only/packages_dir_only_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_dir_only/packages_dir_only_test.dart
rename to tests/standalone_2/package/scenarios/packages_dir_only/packages_dir_only_test.dart
diff --git a/tests/standalone_2/package/scenarios/packages_file_in_parent/.packages b/tests/standalone_2/package/scenarios/packages_file_in_parent/.packages
new file mode 100644
index 00000000000..17ae735b318
--- /dev/null
+++ b/tests/standalone_2/package/scenarios/packages_file_in_parent/.packages
@@ -0,0 +1 @@
+foo:foo/
\ No newline at end of file
diff --git a/tests/standalone/package/scenarios/packages_file_in_parent/foo/foo.dart b/tests/standalone_2/package/scenarios/packages_file_in_parent/foo/foo.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_in_parent/foo/foo.dart
rename to tests/standalone_2/package/scenarios/packages_file_in_parent/foo/foo.dart
diff --git a/tests/standalone/package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_noimports_test.dart b/tests/standalone_2/package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_noimports_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_noimports_test.dart
rename to tests/standalone_2/package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_noimports_test.dart
diff --git a/tests/standalone/package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_test.dart b/tests/standalone_2/package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_test.dart
rename to tests/standalone_2/package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_test.dart
diff --git a/tests/standalone_2/package/scenarios/packages_file_only/.packages b/tests/standalone_2/package/scenarios/packages_file_only/.packages
new file mode 100644
index 00000000000..17ae735b318
--- /dev/null
+++ b/tests/standalone_2/package/scenarios/packages_file_only/.packages
@@ -0,0 +1 @@
+foo:foo/
\ No newline at end of file
diff --git a/tests/standalone/package/scenarios/packages_file_only/foo/foo.dart b/tests/standalone_2/package/scenarios/packages_file_only/foo/foo.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_only/foo/foo.dart
rename to tests/standalone_2/package/scenarios/packages_file_only/foo/foo.dart
diff --git a/tests/standalone/package/scenarios/packages_file_only/packages_file_only_noimports_test.dart b/tests/standalone_2/package/scenarios/packages_file_only/packages_file_only_noimports_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_only/packages_file_only_noimports_test.dart
rename to tests/standalone_2/package/scenarios/packages_file_only/packages_file_only_noimports_test.dart
diff --git a/tests/standalone/package/scenarios/packages_file_only/packages_file_only_test.dart b/tests/standalone_2/package/scenarios/packages_file_only/packages_file_only_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_only/packages_file_only_test.dart
rename to tests/standalone_2/package/scenarios/packages_file_only/packages_file_only_test.dart
diff --git a/tests/standalone/package/scenarios/packages_file_strange_formatting/bar/bar.dart b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/bar/bar.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_strange_formatting/bar/bar.dart
rename to tests/standalone_2/package/scenarios/packages_file_strange_formatting/bar/bar.dart
diff --git a/tests/standalone/package/scenarios/packages_file_strange_formatting/baz/baz.dart b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/baz/baz.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_strange_formatting/baz/baz.dart
rename to tests/standalone_2/package/scenarios/packages_file_strange_formatting/baz/baz.dart
diff --git a/tests/standalone_2/package/scenarios/packages_file_strange_formatting/empty_lines.packages b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/empty_lines.packages
new file mode 100644
index 00000000000..e81099e5abf
--- /dev/null
+++ b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/empty_lines.packages
@@ -0,0 +1,20 @@
+
+
+
+
+foo:foo/
+
+
+bar:bar/
+
+
+
+
+
+
+
+
+baz:baz/
+
+
+
diff --git a/tests/standalone/package/scenarios/packages_file_strange_formatting/empty_lines_test.dart b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/empty_lines_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_strange_formatting/empty_lines_test.dart
rename to tests/standalone_2/package/scenarios/packages_file_strange_formatting/empty_lines_test.dart
diff --git a/tests/standalone_2/package/scenarios/packages_file_strange_formatting/empty_package_dir.packages b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/empty_package_dir.packages
new file mode 100644
index 00000000000..0152a79652d
--- /dev/null
+++ b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/empty_package_dir.packages
@@ -0,0 +1 @@
+foo:
diff --git a/tests/standalone/package/scenarios/packages_file_strange_formatting/empty_package_dir_test.dart b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/empty_package_dir_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_strange_formatting/empty_package_dir_test.dart
rename to tests/standalone_2/package/scenarios/packages_file_strange_formatting/empty_package_dir_test.dart
diff --git a/tests/standalone/package/scenarios/packages_file_strange_formatting/foo/foo.dart b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/foo/foo.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_strange_formatting/foo/foo.dart
rename to tests/standalone_2/package/scenarios/packages_file_strange_formatting/foo/foo.dart
diff --git a/tests/standalone_2/package/scenarios/packages_file_strange_formatting/mixed_line_ends.packages b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/mixed_line_ends.packages
new file mode 100644
index 00000000000..c3d3e75d940
--- /dev/null
+++ b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/mixed_line_ends.packages
@@ -0,0 +1,3 @@
+foo:foo/
+bar:bar/
+baz:baz/
diff --git a/tests/standalone/package/scenarios/packages_file_strange_formatting/mixed_line_ends_test.dart b/tests/standalone_2/package/scenarios/packages_file_strange_formatting/mixed_line_ends_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_file_strange_formatting/mixed_line_ends_test.dart
rename to tests/standalone_2/package/scenarios/packages_file_strange_formatting/mixed_line_ends_test.dart
diff --git a/tests/standalone/package/scenarios/packages_option_only/packages_option_only_noimports_test.dart b/tests/standalone_2/package/scenarios/packages_option_only/packages_option_only_noimports_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_option_only/packages_option_only_noimports_test.dart
rename to tests/standalone_2/package/scenarios/packages_option_only/packages_option_only_noimports_test.dart
diff --git a/tests/standalone/package/scenarios/packages_option_only/packages_option_only_test.dart b/tests/standalone_2/package/scenarios/packages_option_only/packages_option_only_test.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_option_only/packages_option_only_test.dart
rename to tests/standalone_2/package/scenarios/packages_option_only/packages_option_only_test.dart
diff --git a/tests/standalone_2/package/scenarios/packages_option_only/sub/.packages b/tests/standalone_2/package/scenarios/packages_option_only/sub/.packages
new file mode 100644
index 00000000000..17ae735b318
--- /dev/null
+++ b/tests/standalone_2/package/scenarios/packages_option_only/sub/.packages
@@ -0,0 +1 @@
+foo:foo/
\ No newline at end of file
diff --git a/tests/standalone/package/scenarios/packages_option_only/sub/foo/foo.dart b/tests/standalone_2/package/scenarios/packages_option_only/sub/foo/foo.dart
similarity index 100%
rename from tests/standalone/package/scenarios/packages_option_only/sub/foo/foo.dart
rename to tests/standalone_2/package/scenarios/packages_option_only/sub/foo/foo.dart
diff --git a/tests/standalone/package/sibling_isolate.dart b/tests/standalone_2/package/sibling_isolate.dart
similarity index 82%
rename from tests/standalone/package/sibling_isolate.dart
rename to tests/standalone_2/package/sibling_isolate.dart
index a2e8332ce2f..134196ec58e 100644
--- a/tests/standalone/package/sibling_isolate.dart
+++ b/tests/standalone_2/package/sibling_isolate.dart
@@ -1,15 +1,14 @@
-
 // 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.
 
 library sibling_isolate;
 
-import 'package:shared.dart'as shared;
+import 'package:shared.dart' as shared;
 import 'dart:isolate';
 
 // This file is spawned from package_isolate_test.dart
-main(List<String args>, SendPort reply) {
+main(List<String> args, SendPort reply) {
   shared.output = 'isolate';
   reply.send(shared.output);
 }
diff --git a/tests/standalone/package/test_folder/folder_isolate.dart b/tests/standalone_2/package/test_folder/folder_isolate.dart
similarity index 100%
rename from tests/standalone/package/test_folder/folder_isolate.dart
rename to tests/standalone_2/package/test_folder/folder_isolate.dart
diff --git a/tests/standalone/package/test_folder/packages/folder_lib.dart b/tests/standalone_2/package/test_folder/packages/folder_lib.dart
similarity index 100%
rename from tests/standalone/package/test_folder/packages/folder_lib.dart
rename to tests/standalone_2/package/test_folder/packages/folder_lib.dart
diff --git a/tests/standalone/packages_file_test.dart b/tests/standalone_2/packages_file_test.dart
similarity index 100%
rename from tests/standalone/packages_file_test.dart
rename to tests/standalone_2/packages_file_test.dart
diff --git a/tests/standalone/pair_location_remapping_test.dart b/tests/standalone_2/pair_location_remapping_test.dart
similarity index 95%
rename from tests/standalone/pair_location_remapping_test.dart
rename to tests/standalone_2/pair_location_remapping_test.dart
index 3c3b6e3cb92..1ee80e3a8bd 100644
--- a/tests/standalone/pair_location_remapping_test.dart
+++ b/tests/standalone_2/pair_location_remapping_test.dart
@@ -12,7 +12,7 @@ class A {
 }
 
 foo(i) {
-  var j = 0x7fffffffffffffff + i;
+  int j = 0x7fffffffffffffff + i;
   var c = new A(j); // allocation will be sunk
   var r = 0;
   for (var k = 0; k < 10; k++) {
diff --git a/tests/standalone/pow_test.dart b/tests/standalone_2/pow_test.dart
similarity index 100%
rename from tests/standalone/pow_test.dart
rename to tests/standalone_2/pow_test.dart
diff --git a/tests/standalone/regress_25335_test.dart b/tests/standalone_2/regress_25335_test.dart
similarity index 100%
rename from tests/standalone/regress_25335_test.dart
rename to tests/standalone_2/regress_25335_test.dart
diff --git a/tests/standalone/regress_26031_test.dart b/tests/standalone_2/regress_26031_test.dart
similarity index 100%
rename from tests/standalone/regress_26031_test.dart
rename to tests/standalone_2/regress_26031_test.dart
diff --git a/tests/standalone/regress_28854_1_test.dart b/tests/standalone_2/regress_28854_1_test.dart
similarity index 100%
rename from tests/standalone/regress_28854_1_test.dart
rename to tests/standalone_2/regress_28854_1_test.dart
diff --git a/tests/standalone/regress_28854_2_test.dart b/tests/standalone_2/regress_28854_2_test.dart
similarity index 100%
rename from tests/standalone/regress_28854_2_test.dart
rename to tests/standalone_2/regress_28854_2_test.dart
diff --git a/tests/standalone/regress_29350_test.dart b/tests/standalone_2/regress_29350_test.dart
similarity index 100%
rename from tests/standalone/regress_29350_test.dart
rename to tests/standalone_2/regress_29350_test.dart
diff --git a/tests/standalone/regress_29695_test.dart b/tests/standalone_2/regress_29695_test.dart
similarity index 100%
rename from tests/standalone/regress_29695_test.dart
rename to tests/standalone_2/regress_29695_test.dart
diff --git a/tests/standalone/slowpath_safepoints_test.dart b/tests/standalone_2/slowpath_safepoints_test.dart
similarity index 100%
rename from tests/standalone/slowpath_safepoints_test.dart
rename to tests/standalone_2/slowpath_safepoints_test.dart
diff --git a/tests/standalone_2/standalone_2.status b/tests/standalone_2/standalone_2.status
index 4bc0fef325e..d1acd0ec248 100644
--- a/tests/standalone_2/standalone_2.status
+++ b/tests/standalone_2/standalone_2.status
@@ -7,6 +7,39 @@
 # listed in tests/lib/analyzer/analyze_tests.status without the "standalone"
 # prefix.
 
+io/raw_socket_test: Pass, RuntimeError # Issue 28288
+io/http_close_test: Pass, RuntimeError # Issue 28380
+packages_file_test: Skip # Issue 26715
+packages_file_test/none: Skip   # contains no tests.
+
+package/invalid_uri_test: Fail, OK # CompileTimeErrors intentionally
+package/scenarios/packages_file_strange_formatting/empty_package_dir_test: Fail, OK # CompileTimeErrors intentionally
+package/scenarios/empty_packages_file/empty_packages_file_discovery_test: Fail, OK # CompileTimeErrors intentionally
+package/scenarios/empty_packages_file/empty_packages_file_option_test: Fail, OK # CompileTimeErrors intentionally
+package/scenarios/invalid/invalid_package_name_test: RuntimeError, CompileTimeError # Errors intentionally
+package/scenarios/invalid/same_package_twice_test.dart: RuntimeError, CompileTimeError # Errors intentionally
+
+issue14236_test: Pass # Do not remove this line. It serves as a marker for Issue 14516 comment #4.
+
+[$runtime == vm && $compiler == none && $system == fuchsia]
+*: Skip  # Not yet triaged.
+
+[ ($runtime != vm && $runtime != dart_precompiled && $compiler != none) ]
+no_assert_test: Fail, OK # This is testing a vm flag.
+env_test: Skip # This is testing a vm command line parsing scenario.
+
+[ $runtime == vm || $runtime == dart_precompiled || $runtime == flutter ]
+package/package_isolate_test: Fail # Issue 12474
+package/scenarios/invalid/same_package_twice_test: Pass # Issue 24119
+# This test checks that the test runner correctly detects and reports non-utf8
+# output from a test.
+io/non_utf8_output_test: NonUtf8Output, OK
+# Failures in secure networking while NSS is replaced with BoringSSL
+io/https_client_certificate_test: RuntimeError # Issue 24070
+io/secure_socket_renegotiate_test: RuntimeError
+io/secure_socket_bad_data_test: RuntimeError  # An error in a secure connection just puts a READ_CLOSED on the stream, rather than signaling an error on the stream.
+
+
 # All static_tests have expected compile-time errors.
 [ $strong && $compiler != dart2analyzer && $compiler != dartdevc ]
 float_array_static_test: MissingCompileTimeError
@@ -18,8 +51,32 @@ float_array_static_test: MissingCompileTimeError
 no_assert_test: Fail, Ok
 env_test: Skip
 
+[ ($runtime == vm || $runtime == dart_precompiled) && $system == macos ]
+# This test fails with "Too many open files" on the Mac OS buildbot.
+# This is expected as MacOS by default runs with a very low number
+# of allowed open files ('ulimit -n' says something like 256).
+io/socket_many_connections_test: Skip
+# Re-enable once the bots have been updated. Issue #26057
+io/secure_server_client_certificate_test: Skip
+io/socket_test: Pass, Timeout # Issue 27453
+
+# This test sometimes hangs on Mac.
+io/raw_server_socket_cancel_test: Skip # Issue 28182
+io/raw_secure_server_socket_test: Pass, Crash # Issue 29524
+
 [ ((($runtime == vm) || ($runtime == flutter)) && ($system == linux)) ]
 io/http_launch_test: Pass, Slow, Timeout # Issue 28046
+# These tests have started timing out and issue 25649 has been filed to
+# investigate, skipping these tests temporarily to get the bots to be
+# green again.
+io/http_proxy_test: Skip
+io/secure_builtin_roots_test: Skip
+
+# These tests might be slow on an opt counter threshold bot.
+# They also time out on the bot occasionally => flaky test issue 28046
+io/http_basic_test: Pass, Slow, Timeout  # Issue 28046
+io/http_launch_test: Pass, Slow, Timeout  # Issue 28046
+
 
 [ (((($runtime != vm) || ($arch == arm)) || ($arch == arm64)) || (($system == windows) && ($mode == debug))) ]
 fragmentation_test: Skip
@@ -39,8 +96,16 @@ assert_test: SkipByDesign
 no_assert_test: SkipByDesign
 
 [ ($mode == product) ]
+no_profiler_test: SkipByDesign
+no_support_coverage_test: SkipByDesign
+no_support_debugger_test: SkipByDesign
+no_support_disassembler_test: SkipByDesign
+no_support_il_printer_test: SkipByDesign
+no_support_service_test: SkipByDesign
+no_support_timeline_test: SkipByDesign
+io/stdio_implicit_close_test: Skip # SkipByDesign
 dart_developer_env_test: SkipByDesign
-dart_developer_env_test: SkipByDesign
+verbose_gc_to_bmu_test: SkipByDesign  # No verbose_gc in product mode
 
 [ (($runtime == dart_precompiled) && ($mode == product)) ]
 dwarf_stack_trace_test: Pass, RuntimeError
@@ -50,16 +115,61 @@ deferred_transitive_import_error_test: Skip
 
 [ (($hot_reload) || ($hot_reload_rollback)) ]
 deferred_transitive_import_error_test: Crash
+package/*: SkipByDesign # Launches VMs in interesting ways.
+io/raw_datagram_read_all_test: Pass, Fail # Timing dependent.
+io/test_runner_test: Pass, Slow # Slow.
+io/skipping_dart2js_compilations_test: Pass, Slow # Slow.
+
+[ $builder_tag == no_ipv6 ]
+io/socket_source_address_test: SkipByDesign
+io/socket_bind_test: SkipByDesign
+io/http_loopback_test: SkipByDesign
+io/http_proxy_advanced_test: SkipByDesign
+io/http_ipv6_test: SkipByDesign
+io/socket_ipv6_test: SkipByDesign
+io/socket_info_ipv6_test: SkipByDesign
+
+[ $runtime == vm && $system == macos && $mode == release ]
+io/named_pipe_script_test: Pass, RuntimeError # Issue 28737
+
+[ $system == macos && $builder_tag == swarming ]
+io/*: Skip # Issue 30618
+
+[ $builder_tag == asan ]
+io/process_detached_test: Pass, Slow
+io/named_pipe_script_test: RuntimeError
 
 [ (($compiler == dartk) || ($compiler == dartkp)) ]
 assert_test: RuntimeError
+io/http_client_connect_test: Skip # Flaky.
+io/http_content_length_test: Skip # Flaky.
+io/http_proxy_test: Skip # Flaky.
+io/http_response_deadline_test: Skip # Flaky.
+io/http_reuse_server_port_test: Skip # Flaky.
+io/http_server_close_response_after_error_test: Skip # Flaky.
+io/http_shutdown_test: Skip # Flaky.
+io/raw_secure_server_closing_test: Skip # Flaky
+io/raw_secure_server_closing_test: Skip # Flaky.
+io/secure_multiple_client_server_test: Skip # Flaky.
+io/secure_server_closing_test: Skip # Flaky.
+io/secure_server_socket_test: Skip # Flaky.
+io/web_socket_error_test: Skip # Flaky
+io/web_socket_ping_test: Skip # Flaky.
+io/web_socket_test: Skip # Flaky.
+no_support_debugger_test: Skip # kernel-service snapshot not compatible with flag disabled
+regress_29350_test: MissingCompileTimeError
+assert_test: RuntimeError
+io/compile_all_test: Skip # Crashes
+map_insert_remove_oom_test: Skip # Crashes
+package/package1_test: CompileTimeError
+package/package_test: CompileTimeError
+package/scenarios/invalid/invalid_utf8_test: CompileTimeError
+package/scenarios/invalid/non_existent_packages_file_test: CompileTimeError
+package/scenarios/invalid/same_package_twice_test: CompileTimeError
 
 [ ($compiler == dartkp) ]
-causal_async_stack_test: Fail
+causal_async_stack_test: Skip # Flaky.
 
-[ ($runtime == flutter) ]
-io/addlatexhash_test: RuntimeError # Issue 9115
-http_launch_test: Skip # Issue 9115
-dart_developer_disabled_env_test: RuntimeError # Issue 9115
-dart_developer_disabled_env_test: RuntimeError # Issue 9115
+[ $compiler == dart2js || $compiler == dartdevc ]
+*: SkipByDesign
 
diff --git a/tests/standalone_2/standalone_2_analyzer.status b/tests/standalone_2/standalone_2_analyzer.status
new file mode 100644
index 00000000000..50429720afb
--- /dev/null
+++ b/tests/standalone_2/standalone_2_analyzer.status
@@ -0,0 +1,53 @@
+# 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.
+
+[ $compiler == dart2analyzer ]
+io/file_constructor_test: fail
+io/process_exit_negative_test: Skip
+io/http_parser_test: Pass, StaticWarning, CompileTimeError # Issue 28843
+io/http_headers_test: Pass, StaticWarning, CompileTimeError # Issue 28843
+io/http_cookie_date_test: Pass, StaticWarning, CompileTimeError # Issue 28843
+io/web_socket_protocol_processor_test: Pass, StaticWarning, CompileTimeError # Issue 28843
+package/package1_test: StaticWarning
+package/package_test: StaticWarning
+package/scenarios/packages_dir_only/packages_dir_only_test: StaticWarning
+package/scenarios/packages_file_only/packages_file_only_test: StaticWarning
+package/scenarios/both_dir_and_file/prefers_packages_file_test: StaticWarning
+package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_test: StaticWarning
+deferred_transitive_import_error_test: Skip # Contains intentional errors.
+package/package1_test: CompileTimeError
+package/package_test: CompileTimeError
+package/package_isolate_test: CompileTimeError
+package/scenarios/packages_dir_only/packages_dir_only_test: CompileTimeError
+package/scenarios/packages_file_only/packages_file_only_test: CompileTimeError
+package/scenarios/both_dir_and_file/prefers_packages_file_test: CompileTimeError
+package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_test: CompileTimeError
+package/scenarios/invalid/non_existent_packages_file_test: Crash, OK # Analyzer exits on invalid package config
+package/scenarios/invalid/invalid_utf8_test: Crash, OK # Analyzer exits on invalid package config
+package/scenarios/invalid/invalid_package_name_test: Crash, OK # Analyzer exits on invalid package config
+package/scenarios/invalid/same_package_twice_test: Crash, OK # Analyzer exits on invalid package config
+
+[ $system == windows && $compiler == dart2analyzer ]
+package/package_isolate_test: Crash # Issue 28645
+package/scenarios/empty_packages_file/empty_packages_file_noimports_test: Crash # Issue 28645
+package/scenarios/empty_packages_file/empty_packages_file_option_test: Crash, Pass # Issue 28645
+package/scenarios/packages_file_strange_formatting/empty_lines_test: Crash # Issue 28645
+package/scenarios/packages_file_strange_formatting/empty_package_dir_test: Crash # Issue 28645
+package/scenarios/packages_file_strange_formatting/mixed_line_ends_test: Crash # Issue 28645
+package/scenarios/packages_option_only/packages_option_only_noimports_test: Crash # Issue 28645
+package/scenarios/packages_option_only/packages_option_only_test: Crash, CompileTimeError # Issue 28645
+
+[ $compiler == dart2analyzer && !$strong ]
+io/directory_invalid_arguments_test: StaticWarning
+io/secure_socket_argument_test: StaticWarning
+io/stdout_bad_argument_test: StaticWarning
+io/process_invalid_arguments_test: StaticWarning
+io/raw_secure_server_socket_argument_test: StaticWarning
+
+[ $compiler == dart2analyzer && $strong ]
+io/directory_invalid_arguments_test: CompileTimeError
+io/secure_socket_argument_test: CompileTimeError
+io/stdout_bad_argument_test: CompileTimeError
+io/process_invalid_arguments_test: CompileTimeError
+io/raw_secure_server_socket_argument_test: CompileTimeError
diff --git a/tests/standalone_2/standalone_2_flutter.status b/tests/standalone_2/standalone_2_flutter.status
new file mode 100644
index 00000000000..f977d67354c
--- /dev/null
+++ b/tests/standalone_2/standalone_2_flutter.status
@@ -0,0 +1,93 @@
+# 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.
+
+[ $runtime == flutter ]
+io/raw_datagram_socket_test: Crash # Flutter Issue 9115
+io/process_check_arguments_test: RuntimeError # Flutter Issue 9115
+io/process_working_directory_test: RuntimeError # Flutter Issue 9115
+io/process_run_output_test: RuntimeError # Flutter Issue 9115
+io/process_run_test: RuntimeError # Flutter Issue 9115
+io/process_sync_test: RuntimeError # Flutter Issue 9115
+io/test_extension_test: RuntimeError # Flutter Issue 9115
+io/test_extension_test: RuntimeError # Flutter Issue 9115
+io/test_extension_fail_test: RuntimeError # Flutter Issue 9115
+io/test_extension_fail_test: RuntimeError # Flutter Issue 9115
+oom_error_stacktrace_test: RuntimeError # Flutter Issue 9115
+io/raw_socket_cross_process_test: RuntimeError # Flutter Issue 9115
+io/process_exit_test: RuntimeError # Flutter Issue 9115
+io/uri_platform_test: RuntimeError # Flutter Issue 9115
+io/dart_std_io_pipe_test: RuntimeError # Flutter Issue 9115
+io/platform_test: RuntimeError # Flutter Issue 9115
+io/process_stderr_test: RuntimeError # Flutter Issue 9115
+io/process_segfault_test: RuntimeError # Flutter Issue 9115
+io/addlatexhash_test: RuntimeError # Flutter Issue 9115
+io/http_server_response_test: Skip # Flaky  # Flutter Issue 9115
+io/process_stdout_test: RuntimeError # Flutter Issue 9115
+io/http_cross_process_test: RuntimeError # Flutter Issue 9115
+io/process_set_exit_code_test: RuntimeError # Flutter Issue 9115
+io/stdin_sync_test: RuntimeError # Flutter Issue 9115
+io/raw_server_socket_cancel_test: RuntimeError # Flutter Issue 9115
+io/socket_cross_process_test: RuntimeError # Flutter Issue 9115
+io/arguments_test: RuntimeError # Flutter Issue 9115
+io/code_collection_test: RuntimeError # Flutter Issue 9115
+io/http_client_stays_alive_test: RuntimeError # Flutter Issue 9115
+io/locale_name_test: RuntimeError # Flutter Issue 9115
+out_of_memory_test: RuntimeError # Flutter Issue 9115
+io/process_pid_test: Skip # Timeout Flutter Issue 9115
+io/socket_info_ipv4_test: Skip # Timeout Flutter Issue 9115
+io/file_test: Skip # Timeout Flutter Issue 9115
+io/named_pipe_script_test: Skip # Timeout Flutter Issue 9115
+io/print_sync_test: Skip # Timeout Flutter Issue 9115
+io/file_uri_test: Skip # Timeout Flutter Issue 9115
+io/file_lock_test: Skip # Timeout Flutter Issue 9115
+io/socket_info_ipv6_test: Skip # Timeout Flutter Issue 9115
+io/stdio_implicit_close_test: Skip # Timeout Flutter Issue 9115
+io/process_environment_test: Skip # Timeout Flutter Issue 9115
+io/secure_socket_renegotiate_test: Skip # Timeout Flutter Issue 9115
+io/process_kill_test: Skip # Timeout Flutter Issue 9115
+io/directory_uri_test: Skip # Timeout Flutter Issue 9115
+io/raw_socket_test: Skip # Timeout Flutter Issue 9115
+io/http_connection_close_test: Skip # Timeout Flutter Issue 9115
+io/https_unauthorized_test: Skip # Timeout Flutter Issue 9115
+io/file_system_watcher_test: Skip # Timeout Flutter Issue 9115
+io/secure_unauthorized_test: Skip # Timeout Flutter Issue 9115
+io/secure_socket_bad_data_test: Skip # Timeout Flutter Issue 9115
+io/link_uri_test: Skip # Timeout Flutter Issue 9115
+io/file_stream_test: Skip # Timeout Flutter Issue 9115
+io/regress_7191_test: Skip # Timeout Flutter Issue 9115
+io/http_server_close_response_after_error_test: Skip #  Flutter Issue 9115Timeout
+io/signals_test: Skip # Timeout Flutter Issue 9115
+io/process_non_ascii_test: Skip # Timeout Flutter Issue 9115
+io/https_client_certificate_test: Skip # Timeout Flutter Issue 9115
+io/socket_finalizer_test: Skip # Timeout Flutter Issue 9115
+io/process_shell_test: Skip # Timeout Flutter Issue 9115
+io/file_blocking_lock_test: Skip # Timeout Flutter Issue 9115
+io/socket_invalid_arguments_test: Skip # Timeout Flutter Issue 9115
+io/process_detached_test: Skip # Timeout Flutter Issue 9115
+io/platform_resolved_executable_test/00: Skip # Timeout Flutter Issue 9115
+io/platform_resolved_executable_test/01: Skip # Timeout Flutter Issue 9115
+io/platform_resolved_executable_test/02: Skip # Timeout Flutter Issue 9115
+io/platform_resolved_executable_test/03: Skip # Timeout Flutter Issue 9115
+io/platform_resolved_executable_test/04: Skip # Timeout Flutter Issue 9115
+io/platform_resolved_executable_test/05: Skip # Timeout Flutter Issue 9115
+http_launch_test: Skip # Timeout Flutter Issue 9115
+dart_developer_disabled_env_test: RuntimeError # Flutter Issue 9115
+package/scenarios/packages_file_in_parent/sub/packages_file_in_parent_test: Fail # Unable to parse package files Flutter Issue 9115
+package/package1_test: Fail # Unable to parse package files Flutter Issue 9115
+package/scenarios/packages_option_only/packages_option_only_test: Fail # Unable to parse package files Flutter Issue 9115
+package/scenarios/invalid/invalid_package_name_test: Fail # Unable to parse package files Flutter Issue 9115
+package/scenarios/invalid/same_package_twice_test: Fail # Unable to parse package files Flutter Issue 9115
+package/scenarios/packages_file_only/packages_file_only_test: Fail # Unable to parse package files Flutter Issue 9115
+package/scenarios/packages_dir_only/packages_dir_only_test: Fail # Unable to parse package files Flutter Issue 9115
+package/scenarios/both_dir_and_file/prefers_packages_file_test: Fail # Unable to parse package files Flutter Issue 9115
+package/package_test: Fail # Unable to parse package files Flutter Issue 9115
+io/process_run_output_test: Fail # Unable to parse package files Flutter Issue 9115
+io/dependency_graph_test: CompileTimeError # Imports dart:mirrors
+io/skipping_dart2js_compilations_test: CompileTimeError # Uses mirrors
+io/test_harness_analyzer_test: CompileTimeError # Uses mirrors
+io/test_runner_test: CompileTimeError # Uses mirrors
+io/addlatexhash_test: RuntimeError # Issue 9115
+http_launch_test: Skip # Issue 9115
+dart_developer_disabled_env_test: RuntimeError # Issue 9115
+dart_developer_disabled_env_test: RuntimeError # Issue 9115
diff --git a/tests/standalone_2/standalone_2_kernel.status b/tests/standalone_2/standalone_2_kernel.status
new file mode 100644
index 00000000000..7fc8ebcf696
--- /dev/null
+++ b/tests/standalone_2/standalone_2_kernel.status
@@ -0,0 +1,39 @@
+# 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.
+
+[ $compiler == dartk && $mode == debug ]
+io/file_lock_test: Slow, Pass
+
+[ $compiler == dartk || $compiler == dartkp ]
+io/http_client_connect_test: Skip # Flaky.
+io/http_content_length_test: Skip # Flaky.
+io/http_proxy_test: Skip # Flaky.
+io/http_response_deadline_test: Skip # Flaky.
+io/http_reuse_server_port_test: Skip # Flaky.
+io/http_server_close_response_after_error_test: Skip # Flaky.
+io/http_shutdown_test: Skip # Flaky.
+io/raw_datagram_socket_test: Skip # Flaky.
+io/raw_secure_server_closing_test: Skip # Flaky
+io/raw_secure_server_closing_test: Skip # Flaky.
+io/secure_multiple_client_server_test: Skip # Flaky.
+io/secure_server_closing_test: Skip # Flaky.
+io/secure_server_socket_test: Skip # Flaky.
+io/web_socket_error_test: Skip # Flaky
+io/web_socket_ping_test: Skip # Flaky.
+io/web_socket_test: Skip # Flaky.
+no_support_debugger_test: Skip # kernel-service snapshot not compatible with flag disabled
+regress_29350_test: MissingCompileTimeError
+io/compile_all_test: Crash
+io/http_cookie_test: Skip # Flaky
+io/http_proxy_advanced_test: Skip # Flaky
+io/socket_many_connections_test: Skip # Flaky
+map_insert_remove_oom_test: Crash
+package/package1_test: CompileTimeError
+package/package_test: CompileTimeError
+package/scenarios/invalid/invalid_utf8_test: CompileTimeError
+package/scenarios/invalid/non_existent_packages_file_test: CompileTimeError
+package/scenarios/invalid/same_package_twice_test: CompileTimeError
+
+[ $compiler == dartkp ]
+dwarf_stack_trace_test: RuntimeError
diff --git a/tests/standalone_2/standalone_2_precompiled.status b/tests/standalone_2/standalone_2_precompiled.status
new file mode 100644
index 00000000000..8364dcaec78
--- /dev/null
+++ b/tests/standalone_2/standalone_2_precompiled.status
@@ -0,0 +1,73 @@
+# 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.
+
+[ $compiler == precompiler ]
+map_insert_remove_oom_test: Skip # Heap limit too low. Increasing iteration count to make a higher limit a meaningful test makes it too slow for simarm[64] bots.
+io/web_socket_test: Pass, RuntimeError # Issue 24674
+
+[ $compiler == precompiler || $compiler == app_jit ]
+io/compile_all_test: Skip # Incompatible flag --compile_all
+
+[ $runtime == dart_precompiled ]
+http_launch_test: Skip
+io/addlatexhash_test: Skip
+io/dart_std_io_pipe_test: Skip
+io/dart_std_io_pipe_test: Skip
+io/file_blocking_lock_test: Skip
+io/file_lock_test: Skip
+io/file_read_special_device_test: Skip
+io/http_client_stays_alive_test: Skip
+io/http_response_deadline_test: Skip
+io/http_server_close_response_after_error_test: Skip
+io/https_unauthorized_test: Skip
+io/named_pipe_script_test: Skip
+io/platform_resolved_executable_test: Skip
+io/print_sync_test: Skip
+io/process_check_arguments_test: Skip
+io/process_detached_test: Skip
+io/process_environment_test: Skip
+io/process_non_ascii_test: Skip
+io/process_run_output_test: Skip
+io/process_set_exit_code_test: Skip
+io/process_shell_test: Skip
+io/process_stderr_test: Skip
+io/process_stdin_transform_unsubscribe_test: Skip
+io/process_stdout_test: Skip
+io/process_sync_test: Skip
+io/raw_datagram_socket_test: Skip
+io/regress_7191_test: Skip
+io/regress_7679_test: Skip
+io/secure_unauthorized_test: Skip
+io/signals_test: Skip
+io/stdin_sync_test: Skip
+io/stdio_implicit_close_test: Skip
+io/stdio_nonblocking_test: Skip
+io/test_extension_fail_test: Skip
+io/test_extension_fail_test: Skip
+io/test_extension_test: Skip
+io/test_extension_test: Skip
+io/windows_environment_test: Skip
+io/platform_test: RuntimeError # Expects to be running from 'dart' instead of 'dart_precompiled_runtime'
+io/directory_list_sync_test: Timeout, Skip # Expects to find the test directory relative to the script.
+io/skipping_dart2js_compilations_test: RuntimeError # Issue 30008
+
+[ $runtime == dart_precompiled || $mode == product ]
+no_assert_test: SkipByDesign # Requires checked mode.
+io/code_collection_test: Skip # Incompatible flags
+
+[ $runtime == dart_precompiled || $compiler == app_jit ]
+package/scenarios/packages_file_strange_formatting/mixed_line_ends_test: Skip
+package/scenarios/packages_file_strange_formatting/empty_lines_test: Skip
+package/scenarios/invalid/invalid_utf8_test: Skip
+package/scenarios/invalid/same_package_twice_test: Skip
+package/scenarios/invalid/non_existent_packages_file_test: Skip
+package/scenarios/empty_packages_file/empty_packages_file_noimports_test: Skip
+package/scenarios/packages_option_only/packages_option_only_noimports_test: Skip
+package/scenarios/packages_option_only/packages_option_only_test: Skip
+
+[ $runtime == dart_precompiled && $mode == product ]
+dwarf_stack_trace_test: Pass, RuntimeError # Results will flake due to identical code folding
+
+[ $system == android && $runtime == dart_precompiled && $mode == release && $arch == arm]
+io/stdout_stderr_non_blocking_test: Pass, Timeout # Issue 28426
diff --git a/tests/standalone_2/standalone_2_vm.status b/tests/standalone_2/standalone_2_vm.status
new file mode 100644
index 00000000000..cca893e6119
--- /dev/null
+++ b/tests/standalone_2/standalone_2_vm.status
@@ -0,0 +1,82 @@
+# 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.
+
+[ $runtime == vm && ($arch == arm || $arch == arm64) ]
+io/file_stream_test: Skip # Issue 26109
+io/file_typed_data_test: Skip # Issue 26109
+io/file_input_stream_test: Skip # Issue 26109
+
+[ $runtime == vm && $system == windows && $mode == release ]
+io/http_server_close_response_after_error_test: Pass, Timeout # Issue 28370: timeout.
+io/regress_7191_test: Pass, Timeout # Issue 28374: timeout.
+
+[ $runtime == vm && $system == macos && $mode == release ]
+io/named_pipe_script_test: Pass, RuntimeError # Issue 28737
+
+[ $runtime == vm && $system == linux && $mode == release && $arch == ia32 && $builder_tag == asan ]
+io/socket_close_test: Pass, Timeout # Issue 28502: timeout.
+
+[ $arch == ia32 ]
+no_allow_absolute_addresses_test: SkipByDesign # Not supported.
+link_natives_lazily_test: SkipByDesign # Not supported.
+
+[ $arch == simdbc || $arch == simdbc64 ]
+# TODO(vegorov) SIMDBC interpreter doesn't support coverage yet.
+full_coverage_test: Skip
+
+# SIMDBC interpreter doesn't support lazy linking of natives.
+link_natives_lazily_test: SkipByDesign
+
+# SIMDBC interpreter doesn't support --no_lazy_dispatchers
+no_lazy_dispatchers_test: SkipByDesign
+
+[ $system == windows ]
+io/skipping_dart2js_compilations_test: Skip # Issue 19551.
+verbose_gc_to_bmu_test: Skip
+io/platform_resolved_executable_test/06: RuntimeError  # Issue 23641
+io/process_sync_test: Pass, Timeout # Issue 24596
+io/sleep_test: Pass, Fail # Issue 25757
+io/socket_info_ipv6_test : Skip
+
+[ $compiler == app_jit ]
+io/test_extension_test: Skip # Platform.executable
+io/test_extension_fail_test: Skip # Platform.executable
+io/platform_test: Skip # Platform.executable
+io/code_collection_test: Skip # Platform.executable
+full_coverage_test: Skip # Platform.executable
+regress_26031_test: Skip # Platform.resolvedExecutable
+
+[ $system == android ]
+io/process_exit_test: Skip # Issue 29578
+io/process_path_test: Skip # Issue 26376
+io/file_test: Skip # Issue 26376
+io/process_path_environment_test: Skip # Issue 26376
+io/file_system_watcher_test: Skip # Issue 26376
+io/resolve_symbolic_links_test: Skip # Issue 26376
+io/file_stat_test: Skip # Issue 26376
+io/raw_datagram_socket_test: Skip # Issue 27638
+io/http_proxy_advanced_test: Skip # Issue 27638
+io/regress_21160_test: Skip # Issue 27638
+io/secure_multiple_client_server_test: Skip # Issue 27638
+io/http_proxy_test: Skip # Issue 27638
+io/secure_session_resume_test: Skip # Issue 27638
+io/raw_secure_server_socket_test: Skip # Issue 27638
+io/raw_secure_server_closing_test: Skip # Issue 27638
+io/raw_secure_socket_pause_test: Skip # Issue 27638
+io/https_server_test: Skip # Issue 27638
+io/secure_server_client_certificate_test: Skip # Issue 27638
+io/secure_socket_alpn_test: Skip # Issue 27638
+io/secure_bad_certificate_test: Skip # Issue 27638
+io/secure_server_socket_test: Skip # Issue 27638
+io/secure_client_server_test: Skip # Issue 27638
+io/socket_upgrade_to_secure_test: Skip # Issue 27638
+io/secure_client_raw_server_test: Skip # Issue 27638
+io/secure_socket_test: Skip # Issue 27638
+io/raw_secure_socket_test: Skip # Issue 27638
+io/https_bad_certificate_test: Skip # Issue 27638
+io/secure_server_closing_test: Skip # Issue 27638
+io/non_utf8_output_test: Skip # The Android command runner doesn't correctly handle non-UTF8 formatted output. https://github.com/dart-lang/sdk/issues/28872
+
+[ $system == android && $runtime == dart_precompiled && $mode == release && $arch == arm]
+io/stdout_stderr_non_blocking_test: Pass, Timeout # Issue 28426
diff --git a/tests/standalone/typed_array_int64_uint64_test.dart b/tests/standalone_2/typed_array_int64_uint64_test.dart
similarity index 100%
rename from tests/standalone/typed_array_int64_uint64_test.dart
rename to tests/standalone_2/typed_array_int64_uint64_test.dart
diff --git a/tests/standalone/typed_array_test.dart b/tests/standalone_2/typed_array_test.dart
similarity index 100%
rename from tests/standalone/typed_array_test.dart
rename to tests/standalone_2/typed_array_test.dart
diff --git a/tests/standalone/typed_data_isolate_test.dart b/tests/standalone_2/typed_data_isolate_test.dart
similarity index 100%
rename from tests/standalone/typed_data_isolate_test.dart
rename to tests/standalone_2/typed_data_isolate_test.dart
diff --git a/tests/standalone/typed_data_test.dart b/tests/standalone_2/typed_data_test.dart
similarity index 97%
rename from tests/standalone/typed_data_test.dart
rename to tests/standalone_2/typed_data_test.dart
index 9ba93ee5b25..138d2ae5d70 100644
--- a/tests/standalone/typed_data_test.dart
+++ b/tests/standalone_2/typed_data_test.dart
@@ -55,14 +55,8 @@ void testTypedDataRange(bool check_throws) {
   // This should eventually throw.
   typed_data[0] = 128;
   typed_data[4] = -129;
-  if (check_throws) {
-    Expect.throws(() {
-      typed_data[1] = 1.2;
-    });
-  }
   Expect.throws(() => typed_data[-1]);
   Expect.throws(() => typed_data[100]);
-  Expect.throws(() => typed_data[2.0]);
 }
 
 void testUnsignedTypedDataRange(bool check_throws) {
@@ -85,14 +79,8 @@ void testUnsignedTypedDataRange(bool check_throws) {
   typed_data[1] = 256;
   typed_data[1] = -1;
   typed_data[2] = -129;
-  if (check_throws) {
-    Expect.throws(() {
-      typed_data[1] = 1.2;
-    });
-  }
   Expect.throws(() => typed_data[-1]);
   Expect.throws(() => typed_data[100]);
-  Expect.throws(() => typed_data[2.0]);
 }
 
 void testClampedUnsignedTypedDataRangeHelper(
@@ -150,7 +138,8 @@ void testSetRange() {
   testSetRangeHelper(new Uint16List(3));
   testSetRangeHelper(new Int16List(3));
 
-  var list = new Uint8List(4);
+  var list;
+  list = new Uint8List(4);
   list.setRange(0, 4, "abcd".codeUnits, 0);
   Expect.listEquals(list, "abcd".codeUnits);
   list = new Uint16List(4);
@@ -266,8 +255,7 @@ void testGetAtIndex(TypedData list, num initial_value) {
   }
 }
 
-void testSetAtIndex(TypedData list, num initial_value,
-    [bool use_double = false]) {
+void testSetAtIndex(List list, num initial_value, [bool use_double = false]) {
   void validate([reinit = true]) {
     for (int i = 0; i < list.length; i++) {
       Expect.equals(initial_value, list[i]);
@@ -275,7 +263,7 @@ void testSetAtIndex(TypedData list, num initial_value,
     }
   }
 
-  var bdata = new ByteData.view(list.buffer);
+  var bdata = new ByteData.view((list as TypedData).buffer);
   for (int i = 0; i < bdata.lengthInBytes; i++) {
     bdata.setUint8(i, 42);
   }
diff --git a/tests/standalone/typed_data_view_test.dart b/tests/standalone_2/typed_data_view_test.dart
similarity index 98%
rename from tests/standalone/typed_data_view_test.dart
rename to tests/standalone_2/typed_data_view_test.dart
index 1bcd7b31ff5..3930a6e023c 100644
--- a/tests/standalone/typed_data_view_test.dart
+++ b/tests/standalone_2/typed_data_view_test.dart
@@ -10,7 +10,7 @@ library TypedDataTest;
 import "package:expect/expect.dart";
 import 'dart:typed_data';
 
-validate(TypedData list, num expected) {
+validate(List list, num expected) {
   for (int i = 0; i < list.length; i++) {
     Expect.equals(expected, list[i]);
   }
diff --git a/tests/standalone/unboxed_int_converter_test.dart b/tests/standalone_2/unboxed_int_converter_test.dart
similarity index 100%
rename from tests/standalone/unboxed_int_converter_test.dart
rename to tests/standalone_2/unboxed_int_converter_test.dart
diff --git a/tools/migration/bin/migrate_batch.dart b/tools/migration/bin/migrate_batch.dart
index 8df2194171b..4a642898d15 100644
--- a/tools/migration/bin/migrate_batch.dart
+++ b/tools/migration/bin/migrate_batch.dart
@@ -15,7 +15,7 @@ import 'package:migration/src/io.dart';
 import 'package:migration/src/log.dart';
 import 'package:migration/src/migrate_statuses.dart';
 
-const simpleDirs = const ["corelib", "language", "lib"];
+const simpleDirs = const ["corelib", "language", "lib", "standalone"];
 
 void main(List<String> arguments) {
   if (arguments.contains("--dry-run")) {
diff --git a/tools/migration/lib/src/test_directories.dart b/tools/migration/lib/src/test_directories.dart
index 40f311d9380..0ffff8337b3 100644
--- a/tools/migration/lib/src/test_directories.dart
+++ b/tools/migration/lib/src/test_directories.dart
@@ -13,6 +13,7 @@ const oneRootDirs = const [
   "isolate",
   "language",
   "lib",
+  "standalone"
 ];
 
 const strongRootDirs = const [
@@ -21,11 +22,7 @@ const strongRootDirs = const [
   "lib_strong",
 ];
 
-const twoRootDirs = const [
-  "corelib_2",
-  "language_2",
-  "lib_2",
-];
+const twoRootDirs = const ["corelib_2", "language_2", "lib_2", "standalone_2"];
 
 final fromRootDirs = oneRootDirs.toList()..addAll(strongRootDirs);
 
@@ -38,6 +35,7 @@ final _directories = [
       "isolate", p.join("lib_strong", "isolate"), p.join("lib_2", "isolate")),
   new _Directory("language", "language_strong", "language_2"),
   new _Directory("lib", "lib_strong", "lib_2"),
+  new _Directory("standalone", "", "standalone_2"),
 ];
 
 /// Maps a Dart 1.0 or DDC root directory to its resulting migration Dart 2.0
diff --git a/tools/testing/dart/options.dart b/tools/testing/dart/options.dart
index 5c28b44f078..7fef9f2498b 100644
--- a/tools/testing/dart/options.dart
+++ b/tools/testing/dart/options.dart
@@ -12,6 +12,7 @@ import 'utils.dart';
 const _defaultTestSelectors = const [
   'samples',
   'standalone',
+  'standalone_2',
   'corelib',
   'corelib_2',
   'co19',