diff --git a/modules/examples/src/todo/app.js b/modules/examples/src/todo/app.js
index 626ba7d06b..a8a8c0d7fc 100644
--- a/modules/examples/src/todo/app.js
+++ b/modules/examples/src/todo/app.js
@@ -1,6 +1,5 @@
-import {DOM} from './dom';
+import {DOM} from 'facade/dom';
 export class App {
-  @field('input:Element')
   constructor() {
     this.input = null;
     this.list = null;
diff --git a/modules/examples/src/todo/index.html b/modules/examples/src/todo/index.html
index 62023f7dd5..467b4caa94 100644
--- a/modules/examples/src/todo/index.html
+++ b/modules/examples/src/todo/index.html
@@ -9,12 +9,12 @@
     <script src="main.dart" type="application/dart"></script>
     <% } else { %>
     <script src="../../../traceur-runtime.js" type="text/javascript"></script>
-    <script src="../../../assert.js" type="text/javascript"></script>
+    <script src="../../../rtts_assert/lib/rtts_assert.js" type="text/javascript"></script>
 
     <script src="app.js" type="text/javascript"></script>
-    <script src="dom.js" type="text/javascript"></script>
+    <script src="../../../facade/lib/dom.js" type="text/javascript"></script>
 
-    <script src="main.js"></script>
+    <script src="main.es5" type="text/javascript"></script>
     <% } %>
 </body>
 </html>
\ No newline at end of file
diff --git a/modules/examples/src/todo/main.es5 b/modules/examples/src/todo/main.es5
new file mode 100644
index 0000000000..dc0a77604c
--- /dev/null
+++ b/modules/examples/src/todo/main.es5
@@ -0,0 +1 @@
+new (System.get("examples/todo/app").App)().run();
diff --git a/modules/examples/src/todo/main.js b/modules/examples/src/todo/main.js
deleted file mode 100644
index 4cfc7e3fa9..0000000000
--- a/modules/examples/src/todo/main.js
+++ /dev/null
@@ -1 +0,0 @@
-new (System.get("examples/src/todo/app").App)().run();
diff --git a/modules/test_lib/src/test_lib.es6 b/modules/test_lib/src/test_lib.es6
index cfe98c6c19..72d70ed3c2 100644
--- a/modules/test_lib/src/test_lib.es6
+++ b/modules/test_lib/src/test_lib.es6
@@ -5,4 +5,10 @@ export var afterEach = window.afterEach;
 export var expect = window.expect;
 
 // To make testing consistent between dart and js
-window.print = window.dump || window.console.log;
+window.print = function(msg) {
+  if (window.dump) {
+    window.dump(msg);
+  } else {
+    window.console.log(msg);
+  }
+};