diff --git a/lib/eventstorm.rb b/lib/eventstorm.rb
index 43b0cea..973dd7e 100644
--- a/lib/eventstorm.rb
+++ b/lib/eventstorm.rb
@@ -2,7 +2,6 @@
 require 'bson'
 require 'ffi-rzmq'
 
-require 'eventstorm/helpers'
 require 'eventstorm/client'
 
 module Eventstorm
diff --git a/spec/unit/eventstorm/setup_spec.rb b/spec/unit/eventstorm/setup_spec.rb
index cf44805..1e640f5 100644
--- a/spec/unit/eventstorm/setup_spec.rb
+++ b/spec/unit/eventstorm/setup_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Eventstorm,'.setup' do
-  before :each do
+  after :each do
     # Reset Eventstorm module in prishtine state
     if Eventstorm.instance_variable_defined?(:@client)
       Eventstorm.send(:remove_instance_variable,:@client)