diff --git a/lib/src/store.dart b/lib/src/store.dart
index 9ef9c6f..9309947 100644
--- a/lib/src/store.dart
+++ b/lib/src/store.dart
@@ -15,9 +15,6 @@ class Store<
     State extends Built<State, StateBuilder>,
     StateBuilder extends Builder<State, StateBuilder>,
     Actions extends ReduxActions> {
-  // stream used for dispatching actions
-  final StreamController<Action<dynamic>> _dispatch = new StreamController();
-
   // stream used to dispatch changes to the state
   final StreamController<StoreChange<State, StateBuilder, dynamic>>
       _stateController = new StreamController.broadcast();
@@ -37,9 +34,6 @@ class Store<
 
     _actions = actions;
 
-    // register the actions to dispatch onto this store's dispatcher
-    _actions.setDispatcher(_dispatch.add);
-
     final MiddlewareApi api =
         new MiddlewareApi<State, StateBuilder, Actions>(this);
 
@@ -70,13 +64,12 @@ class Store<
     }
 
     // call the handler when an action is dispatched
-    _dispatch.stream.listen(handler);
+    actions.setDispatcher(handler);
   }
 
   /// [dispose] removes closes both the dispatch and subscription stream
   dispose() {
     _stateController.close();
-    _dispatch.close();
     _state = null;
     _actions = null;
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index f8af234..2806441 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: built_redux
-version: 6.1.1
+version: 7.0.0
 description:
   A state management library written in dart that enforces immutability
 authors:
diff --git a/test/unit/redux_test.dart b/test/unit/redux_test.dart
index 1143650..991a314 100644
--- a/test/unit/redux_test.dart
+++ b/test/unit/redux_test.dart
@@ -35,26 +35,23 @@ main() {
 
     test('base action updates state', () async {
       setup();
+      expect(store.state.count, 1);
       store.actions.increment(4);
-      var stateChange = await store.stream.first;
-      expect(stateChange.prev.count, 1);
-      expect(stateChange.next.count, 5);
+      expect(store.state.count, 5);
     });
 
     test('nested built value', () async {
       setup();
+      expect(store.state.nestedCounter.count, 1);
       store.actions.nestedCounterActions.increment(4);
-      var stateChange = await store.stream.first;
-      expect(stateChange.prev.nestedCounter.count, 1);
-      expect(stateChange.next.nestedCounter.count, 5);
+      expect(store.state.nestedCounter.count, 5);
     });
 
     test('middleware action doubles count and updates state', () async {
       setup();
+      expect(store.state.count, 1);
       store.actions.middlewareActions.increment(0);
-      var stateChange = await store.stream.first;
-      expect(stateChange.prev.count, 1);
-      expect(stateChange.next.count, 3);
+      expect(store.state.count, 3);
     });
 
     test('2 middlewares doubles count twice and updates state', () async {
@@ -70,14 +67,15 @@ main() {
         else
           onStateChangeCompleter2.complete(state);
       });
-      // should add 2 twice
+
+      // should add double the current state twice
       store.actions.middlewareActions.increment(0);
-      var stateChange = await store.stream.first;
+      var stateChange = await onStateChangeCompleter.future;
       expect(stateChange.prev.count, 1);
       expect(stateChange.next.count, 3);
-      stateChange = await store.stream.first;
+      stateChange = await onStateChangeCompleter2.future;
       expect(stateChange.prev.count, 3);
-      expect(stateChange.next.count, 5);
+      expect(stateChange.next.count, 9);
     });
 
     test('store change handler', () async {
@@ -125,14 +123,15 @@ main() {
 
     test('state transformer', () async {
       setup();
-
+      final completer = new Completer<SubstateChange<int>>();
       final sub = store.substateStream<int>((BaseCounter state) => state.count);
+      sub.first.then(completer.complete);
 
       store.actions.increment(4);
       // would cause completer to complete twice and fail the test
       store.actions.nestedCounterActions.increment(1);
 
-      var change = await sub.first;
+      var change = await completer.future;
       expect(change.prev, 1);
       expect(change.next, 5);
     });
@@ -172,8 +171,10 @@ main() {
 
     test('nextState stream', () async {
       setup();
+      final completer = new Completer<BaseCounter>();
+      store.nextState.first.then(completer.complete);
       store.actions.increment(4);
-      var stateChange = await store.nextState.first;
+      var stateChange = await completer.future;
       expect(stateChange.count, 5);
     });
 
@@ -181,56 +182,51 @@ main() {
       setup();
 
       final sub = store.nextSubstate<int>((BaseCounter state) => state.count);
+      final completer = new Completer<int>();
+      sub.first.then(completer.complete);
 
       store.actions.increment(4);
       // would cause completer to complete twice and fail the test
       store.actions.nestedCounterActions.increment(1);
 
-      var change = await sub.first;
+      var change = await completer.future;
       expect(change, 5);
     });
 
     test('ActionDispatcher<Null>', () async {
       setup();
+      expect(store.state.count, 1);
       store.actions.incrementOne();
-      var stateChange = await store.stream.first;
-      expect(stateChange.prev.count, 1);
-      expect(stateChange.next.count, 2);
+      expect(store.state.count, 2);
     });
 
     test('ActionDispatcher<Null> with null payload', () async {
       setup();
+      expect(store.state.count, 1);
       store.actions.incrementOne(null);
-      var stateChange = await store.stream.first;
-      expect(stateChange.prev.count, 1);
-      expect(stateChange.next.count, 2);
+      expect(store.state.count, 2);
     });
 
     test('ActionDispatcher<SomeTypeDef>', () async {
       setup();
+      expect(store.state.count, 1);
       store.actions.thunkDispatcher(
           (MiddlewareApi<BaseCounter, BaseCounterBuilder, BaseCounterActions>
               api) {
         api.actions.incrementOne();
       });
-      var stateChange = await store.stream.first;
-      expect(stateChange.prev.count, 1);
-      expect(stateChange.next.count, 2);
+      expect(store.state.count, 2);
     });
 
     test('payload with generic type', () async {
       setup();
+      expect(store.state.count, 1);
       store.actions.genericAction1(<int>[1, 2, 3]);
-      var stateChange = await store.stream.first;
-      expect(stateChange.prev.count, 1);
-      expect(stateChange.next.count, 7);
-
+      expect(store.state.count, 7);
       store.actions.genericAction2(<String, List<int>>{
         'add': [1, 2, 3]
       });
-      stateChange = await store.stream.first;
-      expect(stateChange.prev.count, 7);
-      expect(stateChange.next.count, 13);
+      expect(store.state.count, 13);
     });
   });
 }