Big merge from experimental to bleeding edge.

tests/corelib/core_runtime_types_test.dart

Index: tests/corelib/core_runtime_types_test.dart
diff --git a/tests/corelib/core_runtime_types_test.dart b/tests/corelib/core_runtime_types_test.dart
index c40b781b767910073846e086bcf14604fcea4f14..b68a1ff00e5bdb11cc48c36c940bd1718701f1f5 100644
--- a/tests/corelib/core_runtime_types_test.dart
+++ b/tests/corelib/core_runtime_types_test.dart
@@ -221,15 +221,15 @@ class CoreRuntimeTypesTest {
 
     assertEquals(d.remove('c'), null);
     assertEquals(d.remove('b'), 2);
-    assertListEquals(d.keys, ['a']);
-    assertListEquals(d.values, [1]);
+    assertEquals(d.keys.single, 'a');
+    assertEquals(d.values.single, 1);
 
     d['c'] = 3;
     d['f'] = 4;
     assertEquals(d.keys.length, 3);
     assertEquals(d.values.length, 3);
-    assertListContains(d.keys, ['a', 'c', 'f']);
-    assertListContains(d.values, [1, 3, 4]);
+    assertListContains(d.keys.toList(), ['a', 'c', 'f']);
+    assertListContains(d.values.toList(), [1, 3, 4]);
 
     var count = 0;
     d.forEach((key, value) {