diff --git a/engine/src/flutter/tests/TestExpectations b/engine/src/flutter/tests/TestExpectations
index 7743092e3b4..942c92cc0d9 100644
--- a/engine/src/flutter/tests/TestExpectations
+++ b/engine/src/flutter/tests/TestExpectations
@@ -10,9 +10,6 @@ https://github.com/domokit/mojo/issues/14 parser/normaliser-null.sky [ Skip ]
 https://github.com/domokit/mojo/issues/14 parser/utf16.sky [ Skip ]
 https://github.com/domokit/mojo/issues/16 parser/normaliser-crlf.sky [ Skip ]
 
-# We don't implement embed ViewManagerClient yet.
-crbug.com/2 services/iframe-embed-vmc.sky [ Skip ]
-
 # These tests broke during the Dart migration
 crbug.com/2 animation/basic-imperative.sky [ Skip ]
 crbug.com/2 animation/basic-transition.sky [ Skip ]
@@ -45,9 +42,6 @@ crbug.com/2 modules/load-event.sky [ Skip ]
 crbug.com/2 modules/modules.sky [ Skip ]
 crbug.com/2 modules/script-import.sky [ Skip ]
 crbug.com/2 parser/script.sky [ Skip ]
-crbug.com/2 services/buffer.sky [ Skip ]
-crbug.com/2 services/codec.sky [ Skip ]
-crbug.com/2 services/core.sky [ Skip ]
-crbug.com/2 services/event-sender.sky [ Skip ]
+crbug.com/2 services/iframe-embed-vmc.sky [ Skip ]
 crbug.com/2 services/iframe-service-provider.sky [ Skip ]
 crbug.com/2 services/network.sky [ Skip ]
diff --git a/engine/src/flutter/tests/services/buffer-expected.txt b/engine/src/flutter/tests/services/buffer-expected.txt
deleted file mode 100644
index 7ef22e9a431..00000000000
--- a/engine/src/flutter/tests/services/buffer-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-PASS
diff --git a/engine/src/flutter/tests/services/buffer.sky b/engine/src/flutter/tests/services/buffer.sky
deleted file mode 100644
index 9e2f35afe2b..00000000000
--- a/engine/src/flutter/tests/services/buffer.sky
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<import src="../resources/dump-as-text.sky" />
-<import src="/gen/mojo/public/sky/buffer.sky" as="buffer" />
-<div id="result">FAIL</div>
-<script>
-document.getElementById("result").textContent =
-    buffer.Buffer ? "PASS" : "FAIL: buffer.Buffer is missing";
-</script>
-</html>
diff --git a/engine/src/flutter/tests/services/codec-expected.txt b/engine/src/flutter/tests/services/codec-expected.txt
deleted file mode 100644
index 7ef22e9a431..00000000000
--- a/engine/src/flutter/tests/services/codec-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-PASS
diff --git a/engine/src/flutter/tests/services/codec.sky b/engine/src/flutter/tests/services/codec.sky
deleted file mode 100644
index e02a0aa3fa5..00000000000
--- a/engine/src/flutter/tests/services/codec.sky
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<import src="../resources/dump-as-text.sky" />
-<import src="/gen/mojo/public/sky/codec.sky" as="codec" />
-<div id="result">FAIL</div>
-<script>
-document.getElementById("result").textContent =
-    codec.MessageBuilder ? "PASS" : "FAIL: codec.MessageBuilder is missing";
-</script>
-</html>
diff --git a/engine/src/flutter/tests/services/core-expected.txt b/engine/src/flutter/tests/services/core-expected.txt
deleted file mode 100644
index 7ef22e9a431..00000000000
--- a/engine/src/flutter/tests/services/core-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-PASS
diff --git a/engine/src/flutter/tests/services/core.sky b/engine/src/flutter/tests/services/core.sky
deleted file mode 100644
index d9bf99823a9..00000000000
--- a/engine/src/flutter/tests/services/core.sky
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<import src="../resources/dump-as-text.sky" />
-<import src="/gen/mojo/public/sky/core.sky" as="core" />
-<div id="result">FAIL</div>
-<script>
-document.getElementById("result").textContent =
-    core.readMessage ? "PASS" : "FAIL: core.readMessage is missing";
-</script>
-</html>
diff --git a/engine/src/flutter/tests/services/event-sender-expected.txt b/engine/src/flutter/tests/services/event-sender-expected.txt
index 855998c73c7..6c821de9a66 100644
--- a/engine/src/flutter/tests/services/event-sender-expected.txt
+++ b/engine/src/flutter/tests/services/event-sender-expected.txt
@@ -1,6 +1,7 @@
+CONSOLE: unittest-suite-wait-for-done
 #BEGIN
-Running 1 tests
-ok 1 Sky event sender should be able to send events
-1 tests
-1 pass
-0 fail
+CONSOLE: PASS: should be able to send events
+CONSOLE: 
+CONSOLE: All 1 tests passed.
+CONSOLE: unittest-suite-success
+DONE
diff --git a/engine/src/flutter/tests/services/event-sender.sky b/engine/src/flutter/tests/services/event-sender.sky
index d7852e1a61f..2c346b4f012 100644
--- a/engine/src/flutter/tests/services/event-sender.sky
+++ b/engine/src/flutter/tests/services/event-sender.sky
@@ -1,35 +1,38 @@
+#!mojo mojo:sky_viewer
 <sky>
-<import src="../resources/chai.sky" />
-<import src="../resources/mocha.sky" />
-<import src="/gen/mojo/services/input_events/public/interfaces/input_event_constants.mojom.sky" as="constants" />
-<import src="/gen/mojo/services/input_events/public/interfaces/input_events.mojom.sky" as="events" />
-<import src="/gen/sky/services/testing/test_harness.mojom.sky" as="harness" />
-<import src="/sky/framework/shell.sky" as="shell" />
-
 <script>
-describe('Sky event sender', function() {
-  it('should be able to send events', function(done) {
-    var sky = document.querySelector('sky')
-    sky.addEventListener('keypress', function(event) {
-      assert.equal(event.type, 'keypress');
-      assert.equal(event.key, 0);
-      assert.equal(event.charCode, 0x41);
-      done();
-    });
+import "../resources/third_party/unittest/unittest.dart";
+import "../resources/unit.dart";
+import "/sky/framework/shell.dart" as shell;
+import "dart:sky";
+import "package:mojo/services/input_events/public/interfaces/input_event_constants.mojom.dart" as constants;
+import "package:mojo/services/input_events/public/interfaces/input_events.mojom.dart" as events;
+import "package:sky/services/testing/test_harness.mojom.dart" as harness;
 
-    var testHarness = shell.connectToService(
-        "mojo:sky_tester", harness.TestHarness);
-    testHarness.dispatchInputEvent(new events.Event({
-      action: constants.EventType.KEY_PRESSED,
-      key_data: new events.KeyData({
-        windows_key_code: 0x41,
-        text: 0x41,
-        unmodified_text: 0x41,
-        is_char: true,
-        character: 0x41,
-      }),
+void main() {
+  initUnit();
+
+  test('should be able to send events', () {
+    var sky = document.querySelector('sky');
+    sky.addEventListener('keypress', expectAsync((event) {
+      expect(event.type, equals('keypress'));
+      expect(event.key, equals(0));
+      expect(event.charCode, equals(0x41));
     }));
+
+    var testHarness = new harness.TestHarnessProxy.unbound();
+    shell.connectToService("mojo:sky_tester", testHarness);
+    var keyData = new events.KeyData();
+    keyData.windowsKeyCode = 0x41;
+    keyData.text = 0x41;
+    keyData.unmodifiedText = 0x41;
+    keyData.isChar = true;
+    keyData.character = 0x41;
+    var event = new events.Event();
+    event.action = constants.EventType_KEY_PRESSED;
+    event.keyData = keyData;
+    testHarness.dispatchInputEvent(event);
   });
-});
+}
 </script>
 </sky>
