diff --git a/engine/src/flutter/tests/TestExpectations b/engine/src/flutter/tests/TestExpectations
index e69e51977e..efa98a5c4d 100644
--- a/engine/src/flutter/tests/TestExpectations
+++ b/engine/src/flutter/tests/TestExpectations
@@ -1,2 +1,2 @@
# This test depends on events.md being implemented
-crbug.com/1 events/dispatcher.sky [ Skip ]
+crbug.com/1 events/dispatcher.dart [ Skip ]
diff --git a/engine/src/flutter/tests/dom/appendChild.sky b/engine/src/flutter/tests/dom/appendChild.dart
similarity index 84%
rename from engine/src/flutter/tests/dom/appendChild.sky
rename to engine/src/flutter/tests/dom/appendChild.dart
index 35494a0a59..5f9a2333f5 100644
--- a/engine/src/flutter/tests/dom/appendChild.sky
+++ b/engine/src/flutter/tests/dom/appendChild.dart
@@ -1,6 +1,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/engine/src/flutter/tests/lowlevel/attribute-collection-expected.txt b/engine/src/flutter/tests/dom/attribute_collection-expected.txt
similarity index 100%
rename from engine/src/flutter/tests/lowlevel/attribute-collection-expected.txt
rename to engine/src/flutter/tests/dom/attribute_collection-expected.txt
diff --git a/engine/src/flutter/tests/lowlevel/attribute-collection.sky b/engine/src/flutter/tests/dom/attribute_collection.dart
similarity index 98%
rename from engine/src/flutter/tests/lowlevel/attribute-collection.sky
rename to engine/src/flutter/tests/dom/attribute_collection.dart
index 5b6881ee79..87f2c3e0fc 100644
--- a/engine/src/flutter/tests/lowlevel/attribute-collection.sky
+++ b/engine/src/flutter/tests/dom/attribute_collection.dart
@@ -1,5 +1,3 @@
-
-
-
diff --git a/engine/src/flutter/tests/dom/document-child-mutations-expected.txt b/engine/src/flutter/tests/dom/document_child_mutations-expected.txt
similarity index 100%
rename from engine/src/flutter/tests/dom/document-child-mutations-expected.txt
rename to engine/src/flutter/tests/dom/document_child_mutations-expected.txt
diff --git a/engine/src/flutter/tests/dom/document-child-mutations.sky b/engine/src/flutter/tests/dom/document_child_mutations.dart
similarity index 83%
rename from engine/src/flutter/tests/dom/document-child-mutations.sky
rename to engine/src/flutter/tests/dom/document_child_mutations.dart
index 1ffe1eff5c..cc89c4d38f 100644
--- a/engine/src/flutter/tests/dom/document-child-mutations.sky
+++ b/engine/src/flutter/tests/dom/document_child_mutations.dart
@@ -1,6 +1,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/engine/src/flutter/tests/dom/getChildElements.dart b/engine/src/flutter/tests/dom/getChildElements.dart
new file mode 100644
index 0000000000..c5ce427799
--- /dev/null
+++ b/engine/src/flutter/tests/dom/getChildElements.dart
@@ -0,0 +1,26 @@
+import "../resources/third_party/unittest/unittest.dart";
+import "../resources/unit.dart";
+
+import "dart:sky";
+
+void main() {
+ initUnit();
+
+ test("getChildElements should only include immediate children", () {
+ var doc = new Document();
+ var parent = doc.createElement('parent');
+ var child1 = doc.createElement('child1');
+ var child2 = doc.createElement('child1');
+ var grandchild = doc.createElement('grandchild');
+
+ doc.appendChild(parent);
+ parent.appendChild(child1);
+ parent.appendChild(child2);
+ child1.appendChild(grandchild);
+
+ var children = parent.getChildElements();
+ expect(children.length, equals(2));
+ expect(children[0], equals(child1));
+ expect(children[1], equals(child2));
+ });
+}
diff --git a/engine/src/flutter/tests/dom/getChildElements.sky b/engine/src/flutter/tests/dom/getChildElements.sky
deleted file mode 100644
index 39c257f8cf..0000000000
--- a/engine/src/flutter/tests/dom/getChildElements.sky
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/engine/src/flutter/tests/dom/inherit-from-text-expected.txt b/engine/src/flutter/tests/dom/inherit-from-text-expected.txt
deleted file mode 100644
index 879dff8b29..0000000000
--- a/engine/src/flutter/tests/dom/inherit-from-text-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CONSOLE: unittest-suite-wait-for-done
-CONSOLE: PASS: should be able to insert in DOM
-CONSOLE:
-CONSOLE: All 1 tests passed.
-CONSOLE: unittest-suite-success
-DONE
diff --git a/engine/src/flutter/tests/dom/inherit-from-text.sky b/engine/src/flutter/tests/dom/inherit-from-text.sky
deleted file mode 100644
index ffede0634a..0000000000
--- a/engine/src/flutter/tests/dom/inherit-from-text.sky
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
diff --git a/engine/src/flutter/tests/dom/ownerScope.sky b/engine/src/flutter/tests/dom/ownerScope.dart
similarity index 98%
rename from engine/src/flutter/tests/dom/ownerScope.sky
rename to engine/src/flutter/tests/dom/ownerScope.dart
index fb163b55aa..7f7b2c273c 100644
--- a/engine/src/flutter/tests/dom/ownerScope.sky
+++ b/engine/src/flutter/tests/dom/ownerScope.dart
@@ -1,5 +1,3 @@
-
-
-
\ No newline at end of file
diff --git a/engine/src/flutter/tests/dom/replaceChild.sky b/engine/src/flutter/tests/dom/replaceChild.dart
similarity index 85%
rename from engine/src/flutter/tests/dom/replaceChild.sky
rename to engine/src/flutter/tests/dom/replaceChild.dart
index 8342eda84d..bef11f1f21 100644
--- a/engine/src/flutter/tests/dom/replaceChild.sky
+++ b/engine/src/flutter/tests/dom/replaceChild.dart
@@ -1,6 +1,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/engine/src/flutter/tests/events/dispatcher.sky b/engine/src/flutter/tests/events/dispatcher.dart
similarity index 99%
rename from engine/src/flutter/tests/events/dispatcher.sky
rename to engine/src/flutter/tests/events/dispatcher.dart
index ffd657b707..29bfeefcc8 100644
--- a/engine/src/flutter/tests/events/dispatcher.sky
+++ b/engine/src/flutter/tests/events/dispatcher.dart
@@ -1,4 +1,3 @@
-
diff --git a/engine/src/flutter/tests/lowlevel/create-document-expected.txt b/engine/src/flutter/tests/lowlevel/create-document-expected.txt
deleted file mode 100644
index be5329194b..0000000000
--- a/engine/src/flutter/tests/lowlevel/create-document-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CONSOLE: unittest-suite-wait-for-done
-CONSOLE: PASS: should have a constructor
-CONSOLE:
-CONSOLE: All 1 tests passed.
-CONSOLE: unittest-suite-success
-DONE
diff --git a/engine/src/flutter/tests/lowlevel/create-document.sky b/engine/src/flutter/tests/lowlevel/create-document.sky
deleted file mode 100644
index 30bdbaf2d7..0000000000
--- a/engine/src/flutter/tests/lowlevel/create-document.sky
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
diff --git a/engine/src/flutter/tests/lowlevel/trivial.sky b/engine/src/flutter/tests/lowlevel/trivial.dart
similarity index 83%
rename from engine/src/flutter/tests/lowlevel/trivial.sky
rename to engine/src/flutter/tests/lowlevel/trivial.dart
index 3ba945f3a9..ba5c63bf71 100644
--- a/engine/src/flutter/tests/lowlevel/trivial.sky
+++ b/engine/src/flutter/tests/lowlevel/trivial.dart
@@ -1,7 +1,5 @@
->
diff --git a/engine/src/flutter/tests/lowlevel/unittest.sky b/engine/src/flutter/tests/lowlevel/unittest.dart
similarity index 91%
rename from engine/src/flutter/tests/lowlevel/unittest.sky
rename to engine/src/flutter/tests/lowlevel/unittest.dart
index e32c2f0bc1..5440f7b60d 100644
--- a/engine/src/flutter/tests/lowlevel/unittest.sky
+++ b/engine/src/flutter/tests/lowlevel/unittest.dart
@@ -1,4 +1,3 @@
->
diff --git a/engine/src/flutter/tests/services/network.sky b/engine/src/flutter/tests/services/network.dart
similarity index 96%
rename from engine/src/flutter/tests/services/network.sky
rename to engine/src/flutter/tests/services/network.dart
index 3b125cb243..0db1aa5578 100644
--- a/engine/src/flutter/tests/services/network.sky
+++ b/engine/src/flutter/tests/services/network.dart
@@ -1,6 +1,3 @@
-#!mojo mojo:sky_viewer
-
-
-
diff --git a/engine/src/flutter/tests/styles/inline-style-expected.txt b/engine/src/flutter/tests/styles/inline_style-expected.txt
similarity index 100%
rename from engine/src/flutter/tests/styles/inline-style-expected.txt
rename to engine/src/flutter/tests/styles/inline_style-expected.txt
diff --git a/engine/src/flutter/tests/styles/inline-style.sky b/engine/src/flutter/tests/styles/inline_style.dart
similarity index 69%
rename from engine/src/flutter/tests/styles/inline-style.sky
rename to engine/src/flutter/tests/styles/inline_style.dart
index 65091ba5b3..cd8b6bac2d 100644
--- a/engine/src/flutter/tests/styles/inline-style.sky
+++ b/engine/src/flutter/tests/styles/inline_style.dart
@@ -1,6 +1,3 @@
-
-
-
-
diff --git a/engine/src/flutter/tests/styles/inline-style-crash-expected.txt b/engine/src/flutter/tests/styles/inline_style_crash-expected.txt
similarity index 100%
rename from engine/src/flutter/tests/styles/inline-style-crash-expected.txt
rename to engine/src/flutter/tests/styles/inline_style_crash-expected.txt
diff --git a/engine/src/flutter/tests/styles/inline-style-crash.sky b/engine/src/flutter/tests/styles/inline_style_crash.dart
similarity index 78%
rename from engine/src/flutter/tests/styles/inline-style-crash.sky
rename to engine/src/flutter/tests/styles/inline_style_crash.dart
index 9a017c79b9..9583f02042 100644
--- a/engine/src/flutter/tests/styles/inline-style-crash.sky
+++ b/engine/src/flutter/tests/styles/inline_style_crash.dart
@@ -1,6 +1,3 @@
-
-
-
-