diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index c171900d..cf4a334e 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -1,34 +1,27 @@
 require 'spec_helper'
 
 describe Admin::UsersController do
-  shared_examples 'access as administration' do
-  	describe "GET '#index'" do
-      it 'populates an array of users' do
-        user1,user2 = create(:user,email:"gopesh.7500@gmail.com"),create(:user,email:"gopesh@gmail.com")
-        get :index
-        expect(assigns(:users)).to match_array([user1,user2])
-      end
-      
-      it 'renders index template' do
-        get :index
-        expect(response).to render_template :index
-      end
+
+  before(:each) do
+    @user = create(:user)
+    @admin = create(:admin)
+    sign_in(@admin)
+  end
+
+  describe "GET '#index'" do
+    
+    it 'populates an array of users' do
+      user1 = create(:user, email:"gopesh.7500@gmail.com")
+      user2 = create(:user,email:"gopesh@gmail.com")
+      get :index
+      # pp response.body
+      expect(assigns(:users)).to match_array([@user,@admin,user1,user2])
     end
 
-    describe "PATCH '#update'" do
-      it 'locates the user' do
-        patch :update, id: @user.id, :user => {email:@user.email}
-        expect(assigns(:user)).to eq(@user)
-      end
-    end
-
-    describe 'admin access' do
-      before(:each) do
-        @user = create(:user)
-        @admin = create(:admin)
-        sign_in(@admin)
-      end
-      it_behaves_like 'access as administration'
+    it 'renders index template' do
+      get :index
+      # pp response.body
+      expect(response).to render_template :index
     end
   end
-end
+end
\ No newline at end of file
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index d7b844d8..2db303fc 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -7,4 +7,11 @@ FactoryGirl.define do
     password_confirmation 'changeme'
     confirmed_at Time.now
   end
+  factory :admin, class: User do
+   	sequence(:email) {|n|'gopesh#{n}@exampleco.in'}
+    password 'changeme'
+    password_confirmation 'changeme'
+    confirmed_at Time.now
+    after(:create) { |user| user.role_ids = [3] }
+  end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index cb9dff8b..78e8340c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,7 +10,7 @@ require File.expand_path("../../config/environment", __FILE__)
 # end
 
 require 'rspec/rails'
-
+ActiveRecord::Migration.maintain_test_schema!
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
 # run as spec files by default. This means that files in spec/support that end
@@ -47,7 +47,7 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, type: :controller
 
   # Includes support/login_macros for feature tests
-  config.include SigninMacros, type: :feature
+  config.include SignInMacros, type: :feature
   
   # Include factory_girls syntax
   config.include FactoryGirl::Syntax::Methods
diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
index b3e90837..4df8a28c 100644
--- a/spec/support/database_cleaner.rb
+++ b/spec/support/database_cleaner.rb
@@ -1,5 +1,4 @@
 RSpec.configure do |config|
-
   config.before(:suite) do
     DatabaseCleaner.clean_with(:truncation)
   end
@@ -19,5 +18,4 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseCleaner.clean
   end
-
 end
\ No newline at end of file
diff --git a/spec/support/factory_girl.rb b/spec/support/factory_girl.rb
index 031f2a19..68b44ed6 100644
--- a/spec/support/factory_girl.rb
+++ b/spec/support/factory_girl.rb
@@ -1,7 +1,5 @@
 RSpec.configure do |config|
-
   config.before(:suite) do
     FactoryGirl.lint
   end
-
 end
diff --git a/spec/support/seeds.rb b/spec/support/seeds.rb
index 41e58998..d8a687a0 100644
--- a/spec/support/seeds.rb
+++ b/spec/support/seeds.rb
@@ -1,7 +1,5 @@
 RSpec.configure do |config|
-
-  config.before(:suite) do
+config.before(:suite) do
     load "#{Rails.root}/db/seeds.rb" 
   end
-
 end
diff --git a/spec/support/sigin_macros.rb b/spec/support/sign_in_macros.rb
similarity index 91%
rename from spec/support/sigin_macros.rb
rename to spec/support/sign_in_macros.rb
index cc4201ed..4326c66e 100644
--- a/spec/support/sigin_macros.rb
+++ b/spec/support/sign_in_macros.rb
@@ -1,5 +1,4 @@
-
-module SigninMacros
+module SignInMacros
   def sign_in(user)
     visit new_user_session_path
     fill_in 'user_email', with:'user.email'
diff --git a/spec/support/signin_macros.rb b/spec/support/signin_macros.rb
deleted file mode 100644
index e69de29b..00000000