diff --git a/spec/exports-spec.ts b/spec/exports-spec.ts
new file mode 100644
index 0000000000..878c42da5f
--- /dev/null
+++ b/spec/exports-spec.ts
@@ -0,0 +1,124 @@
+import { expect } from 'chai';
+import { bindCallback } from '../dist/cjs/observable/bindCallback';
+import { bindNodeCallback } from '../dist/cjs/observable/bindNodeCallback';
+import { combineLatest } from '../dist/cjs/observable/combineLatest';
+import { concat } from '../dist/cjs/observable/concat';
+import { defer } from '../dist/cjs/observable/defer';
+import { empty } from '../dist/cjs/observable/empty';
+import { forkJoin } from '../dist/cjs/observable/forkJoin';
+import { from } from '../dist/cjs/observable/from';
+import { fromEvent } from '../dist/cjs/observable/fromEvent';
+import { fromEventPattern } from '../dist/cjs/observable/fromEventPattern';
+import { fromPromise } from '../dist/cjs/observable/fromPromise';
+import { _if } from '../dist/cjs/observable/if';
+import { interval } from '../dist/cjs/observable/interval';
+import { merge } from '../dist/cjs/observable/merge';
+import { never } from '../dist/cjs/observable/never';
+import { of } from '../dist/cjs/observable/of';
+import { onErrorResumeNext } from '../dist/cjs/observable/onErrorResumeNext';
+import { pairs } from '../dist/cjs/observable/pairs';
+import { race } from '../dist/cjs/observable/race';
+import { range } from '../dist/cjs/observable/range';
+import { _throw } from '../dist/cjs/observable/throw';
+import { timer } from '../dist/cjs/observable/timer';
+import { using } from '../dist/cjs/observable/using';
+import { zip } from '../dist/cjs/observable/zip';
+import * as Rx from '../dist/cjs/Rx';
+
+describe('exports', () => {
+  it('should have rxjs/observable/bindCallback', () => {
+    expect(bindCallback).to.equal(Rx.Observable.bindCallback);
+  });
+
+  it('should have rxjs/observable/bindNodeCallback', () => {
+    expect(bindNodeCallback).to.equal(Rx.Observable.bindNodeCallback);
+  });
+
+  it('should have rxjs/observable/combineLatest', () => {
+    expect(combineLatest).to.equal(Rx.Observable.combineLatest);
+  });
+
+  it('should have rxjs/observable/concat', () => {
+    expect(concat).to.equal(Rx.Observable.concat);
+  });
+
+  it('should have rxjs/observable/defer', () => {
+    expect(defer).to.equal(Rx.Observable.defer);
+  });
+
+  it('should have rxjs/observable/empty', () => {
+    expect(empty).to.equal(Rx.Observable.empty);
+  });
+
+  it('should have rxjs/observable/forkJoin', () => {
+    expect(forkJoin).to.equal(Rx.Observable.forkJoin);
+  });
+
+  it('should have rxjs/observable/from', () => {
+    expect(from).to.equal(Rx.Observable.from);
+  });
+
+  it('should have rxjs/observable/fromEvent', () => {
+    expect(fromEvent).to.equal(Rx.Observable.fromEvent);
+  });
+
+  it('should have rxjs/observable/fromEventPattern', () => {
+    expect(fromEventPattern).to.equal(Rx.Observable.fromEventPattern);
+  });
+
+  it('should have rxjs/observable/fromPromise', () => {
+    expect(fromPromise).to.equal(Rx.Observable.fromPromise);
+  });
+
+  it('should have rxjs/observable/if', () => {
+    expect(_if).to.equal(Rx.Observable.if);
+  });
+
+  it('should have rxjs/observable/interval', () => {
+    expect(interval).to.equal(Rx.Observable.interval);
+  });
+
+  it('should have rxjs/observable/merge', () => {
+    expect(merge).to.equal(Rx.Observable.merge);
+  });
+
+  it('should have rxjs/observable/never', () => {
+    expect(never).to.equal(Rx.Observable.never);
+  });
+
+  it('should have rxjs/observable/of', () => {
+    expect(of).to.equal(Rx.Observable.of);
+  });
+
+  it('should have rxjs/observable/onErrorResumeNext', () => {
+    expect(onErrorResumeNext).to.equal(Rx.Observable.onErrorResumeNext);
+  });
+
+  it('should have rxjs/observable/pairs', () => {
+    expect(pairs).to.equal(Rx.Observable.pairs);
+  });
+
+  it('should have rxjs/observable/race', () => {
+    expect(race).to.equal(Rx.Observable.race);
+  });
+
+  it('should have rxjs/observable/range', () => {
+    expect(range).to.equal(Rx.Observable.range);
+  });
+
+  it('should have rxjs/observable/throw', () => {
+    expect(_throw).to.equal(Rx.Observable.throw);
+  });
+
+  it('should have rxjs/observable/timer', () => {
+    expect(timer).to.equal(Rx.Observable.timer);
+  });
+
+  it('should have rxjs/observable/using', () => {
+    expect(using).to.equal(Rx.Observable.using);
+  });
+
+  it('should have rxjs/observable/zip', () => {
+    expect(zip).to.equal(Rx.Observable.zip);
+  });
+});
diff --git a/src/add/observable/generate.ts b/src/add/observable/generate.ts
index 894dadf1a8..c37c85d769 100644
--- a/src/add/observable/generate.ts
+++ b/src/add/observable/generate.ts
@@ -1,10 +1,10 @@
 import { Observable } from '../../Observable';
-import { GenerateObservable } from '../../observable/GenerateObservable';
+import { generate as staticGenerate } from '../../observable/generate';
 
-Observable.generate = GenerateObservable.create;
+Observable.generate = staticGenerate;
 
 declare module '../../Observable' {
   namespace Observable {
-    export let generate: typeof GenerateObservable.create;
+    export let generate: typeof staticGenerate;
   }
 }
\ No newline at end of file
diff --git a/src/add/observable/onErrorResumeNext.ts b/src/add/observable/onErrorResumeNext.ts
index aaacfccd69..02919509b1 100644
--- a/src/add/observable/onErrorResumeNext.ts
+++ b/src/add/observable/onErrorResumeNext.ts
@@ -1,10 +1,10 @@
 import { Observable } from '../../Observable';
-import { onErrorResumeNextStatic } from '../../operator/onErrorResumeNext';
+import { onErrorResumeNext as staticOnErrorResumeNext } from '../../observable/onErrorResumeNext';
 
-Observable.onErrorResumeNext = onErrorResumeNextStatic;
+Observable.onErrorResumeNext = staticOnErrorResumeNext;
 
 declare module '../../Observable' {
   namespace Observable {
-    export let onErrorResumeNext: typeof onErrorResumeNextStatic;
+    export let onErrorResumeNext: typeof staticOnErrorResumeNext;
   }
 }
\ No newline at end of file
diff --git a/src/add/observable/race.ts b/src/add/observable/race.ts
index e871cf5113..e9188ab3f8 100644
--- a/src/add/observable/race.ts
+++ b/src/add/observable/race.ts
@@ -1,10 +1,10 @@
 import { Observable } from '../../Observable';
-import { raceStatic } from '../../operator/race';
+import { race as staticRace } from '../../observable/race';
 
-Observable.race = raceStatic;
+Observable.race = staticRace;
 
 declare module '../../Observable' {
   namespace Observable {
-    export let race: typeof raceStatic;
+    export let race: typeof staticRace;
   }
 }
\ No newline at end of file
diff --git a/src/observable/generate.ts b/src/observable/generate.ts
new file mode 100644
index 0000000000..7f1d7c23d0
--- /dev/null
+++ b/src/observable/generate.ts
@@ -0,0 +1,3 @@
+import { GenerateObservable } from './GenerateObservable';
+
+export const generate = GenerateObservable.create;
diff --git a/src/observable/onErrorResumeNext.ts b/src/observable/onErrorResumeNext.ts
new file mode 100644
index 0000000000..33c101e3a0
--- /dev/null
+++ b/src/observable/onErrorResumeNext.ts
@@ -0,0 +1,3 @@
+import { onErrorResumeNextStatic } from '../operator/onErrorResumeNext';
+
+export const onErrorResumeNext = onErrorResumeNextStatic;
diff --git a/src/observable/race.ts b/src/observable/race.ts
new file mode 100644
index 0000000000..15541d03db
--- /dev/null
+++ b/src/observable/race.ts
@@ -0,0 +1,3 @@
+import { raceStatic } from '../operator/race';
+
+export const race = raceStatic;