diff --git a/modules/change_detection/src/change_detection.js b/modules/change_detection/src/change_detection.js
index f0415a07da..64f9b9f42a 100644
--- a/modules/change_detection/src/change_detection.js
+++ b/modules/change_detection/src/change_detection.js
@@ -1,6 +1,8 @@
-import {WatchGroup} from './watch_group';
-import {Record} from './record';
+import {ProtoWatchGrou, WatchGroup} from './watch_group';
+import {ProtoRecord, Record} from './record';
 import {FIELD} from 'facade/lang';
+export * from './record';
+export * from './watch_group'
 
 export class ChangeDetection {
 
diff --git a/modules/change_detection/test/change_detection_spec.js b/modules/change_detection/test/change_detection_spec.js
index cea4d8c373..9f43086f3b 100644
--- a/modules/change_detection/test/change_detection_spec.js
+++ b/modules/change_detection/test/change_detection_spec.js
@@ -1,5 +1,5 @@
 import {describe, it, expect} from 'test_lib/test_lib';
-import {ProtoWatchGroup, WatchGroup, WatchGroupDispatcher} from 'change_detection/watch_group';
+import {ProtoWatchGroup, WatchGroup, WatchGroupDispatcher} from 'change_detection/change_detection';
 import {DOM} from 'facade/dom';
 
 
@@ -7,7 +7,7 @@ export function main() {
   describe('change_detection', function() {
     describe('ChangeDetection', function() {
       it('should do simple watching', function() {
-        return; // remove me after getting the test to pass.
+        return; // remove me once xit or CD works.
         var person = new Person('misko', 38);
         var pwg = new ProtoWatchGroup();
         pwg.watch('name', 'nameToken');
diff --git a/modules/test_lib/src/test_lib.dart b/modules/test_lib/src/test_lib.dart
index 8eeb377a79..78c44a36f0 100644
--- a/modules/test_lib/src/test_lib.dart
+++ b/modules/test_lib/src/test_lib.dart
@@ -1 +1,4 @@
-export 'package:guinness/guinness.dart' show describe, ddescribe, it, iit, beforeEach, afterEach, expect;
+export 'package:guinness/guinness.dart' show
+    describe, ddescribe, xdescribe,
+    it, xit, iit,
+    beforeEach, afterEach, expect;
diff --git a/modules/test_lib/src/test_lib.es6 b/modules/test_lib/src/test_lib.es6
index c4ed0f7109..66a84826d4 100644
--- a/modules/test_lib/src/test_lib.es6
+++ b/modules/test_lib/src/test_lib.es6
@@ -1,6 +1,8 @@
 export var describe = window.describe;
+export var xdescribe = window.xdescribe;
 export var ddescribe = window.ddescribe;
 export var it = window.it;
+export var xit = window.xit;
 export var iit = window.iit;
 export var beforeEach = window.beforeEach;
 export var afterEach = window.afterEach;