diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7a918c..ac74f60 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,26 +12,22 @@ jobs:
     strategy:
       matrix:
         ruby:
+          - '3.2'
+          - '3.1'
           - '3.0'
-          - '2.7'
-          - '2.6'
-          - '2.5'
-    container:
-      image: ruby:${{ matrix.ruby }}
-      env:
-        BUNDLE_CLEAN: 'true'
-        BUNDLE_DEPLOYMENT: 'true'
-        BUNDLE_JOBS: 4
+
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+
+      - uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-ruby${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-ruby${{ matrix.ruby }}-
-      - name: Install gems
-        run: gem install bundler && bundle install
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: ruby -v
+
       - name: Rubocop
         run: bundle exec rubocop
+
       - name: RSpec
         run: bundle exec rake spec
diff --git a/.metabase.db/metabase.db.mv.db b/.metabase.db/metabase.db.mv.db
index 29f7e2a..a30fb3b 100644
Binary files a/.metabase.db/metabase.db.mv.db and b/.metabase.db/metabase.db.mv.db differ
diff --git a/.rubocop.yml b/.rubocop.yml
index bf8111b..d1c9210 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,9 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   NewCops: enable
 
 Style/Documentation:
diff --git a/Gemfile.lock b/Gemfile.lock
index 6712070..7f203df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,44 +1,40 @@
 PATH
   remote: .
   specs:
-    metabase (0.5.0)
-      faraday (>= 1.2.0)
-      faraday_middleware
+    metabase (0.6.0)
+      faraday (>= 2.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     amazing_print (1.2.2)
-    ast (2.4.1)
+    ast (2.4.2)
     bump (0.10.0)
     coderay (1.1.3)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
     docile (1.3.5)
-    faraday (1.3.0)
-      faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-net_http (1.0.1)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
     hashdiff (1.0.1)
+    json (2.6.3)
     method_source (1.0.0)
-    multipart-post (2.1.1)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
+    public_suffix (5.0.1)
+    rainbow (3.1.1)
     rake (13.0.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
+    regexp_parser (2.8.0)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -52,29 +48,35 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.1)
-    rubocop (1.8.1)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.4.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.4.2)
     vcr (6.0.0)
-    webmock (3.11.1)
-      addressable (>= 2.3.6)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     yard (0.9.26)
@@ -83,18 +85,20 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  amazing_print
-  bump
-  bundler
+  amazing_print (>= 1.2.2)
+  bump (>= 0.10.0)
+  bundler (>= 2.4.13)
   metabase!
-  pry
-  rake
-  rspec
-  rubocop
-  simplecov
-  vcr
-  webmock
-  yard
+  pry (>= 0.14)
+  rake (>= 13.0.3)
+  rspec (>= 3.10.0)
+  rubocop (>= 1.19.0)
+  rubocop-rake (>= 0.4.0)
+  rubocop-rspec (>= 2.0.0)
+  simplecov (>= 0.21.2)
+  vcr (>= 6.0.0)
+  webmock (>= 3.12.2)
+  yard (>= 0.9.25)
 
 BUNDLED WITH
-   2.2.5
+   2.4.13
diff --git a/docker-compose.yml b/docker-compose.yml
index 8a247c9..3ea92c8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   metabase:
-    image: metabase/metabase:v0.38.4
+    image: metabase/metabase:latest
     ports:
       - 3030:3000
     volumes:
diff --git a/lib/metabase/connection.rb b/lib/metabase/connection.rb
index b9799e1..3d1206d 100644
--- a/lib/metabase/connection.rb
+++ b/lib/metabase/connection.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'faraday'
-require 'faraday_middleware'
 require 'metabase/error'
 
 module Metabase
diff --git a/lib/metabase/endpoint/card.rb b/lib/metabase/endpoint/card.rb
index 89a5868..05035ce 100644
--- a/lib/metabase/endpoint/card.rb
+++ b/lib/metabase/endpoint/card.rb
@@ -48,9 +48,9 @@ def query_card(card_id, format: :json, **params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#post-apicard
-      def new_card(**params)        
+      def new_card(**params)
         post('/api/card', **params)
-      end      
+      end
     end
   end
 end
diff --git a/lib/metabase/endpoint/collection.rb b/lib/metabase/endpoint/collection.rb
index 278a269..a47b323 100644
--- a/lib/metabase/endpoint/collection.rb
+++ b/lib/metabase/endpoint/collection.rb
@@ -24,7 +24,7 @@ def collection(collection_id, **params)
       # Fetch a collection's items.
       #
       # @param params [Hash] Query string
-      # @return [Array<Hash>] Parsed response JSON
+      # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#get-apicollectioniditems
       def collection_items(collection_id, **params)
         get("/api/collection/#{collection_id}/items", **params)
@@ -35,7 +35,7 @@ def collection_items(collection_id, **params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#post-apicollection
-      def new_collection(**params)        
+      def new_collection(**params)
         post('/api/collection', **params)
       end
     end
diff --git a/lib/metabase/endpoint/dashboard.rb b/lib/metabase/endpoint/dashboard.rb
index 86e73e4..cf7c5ac 100644
--- a/lib/metabase/endpoint/dashboard.rb
+++ b/lib/metabase/endpoint/dashboard.rb
@@ -20,14 +20,14 @@ def dashboards(**params)
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#get-apidashboardid
       def dashboard(dashboard_id, **params)
         get("/api/dashboard/#{dashboard_id}", **params)
-      end      
+      end
 
       # Create a new dashboard.
       #
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#post-apidashboard
-      def new_dashboard(**params)        
+      def new_dashboard(**params)
         post('/api/dashboard', **params)
       end
 
@@ -37,7 +37,7 @@ def new_dashboard(**params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#post-apidashboardfrom-dashboard-idcopy
-      def copy_dashboard(from_dashboard_id, **params)        
+      def copy_dashboard(from_dashboard_id, **params)
         post("/api/dashboard/#{from_dashboard_id}/copy", **params)
       end
 
@@ -47,9 +47,9 @@ def copy_dashboard(from_dashboard_id, **params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#post-apidashboardidcards
-      def add_dashboard_card(dashboard_id, **params)        
+      def add_dashboard_card(dashboard_id, **params)
         post("/api/dashboard/#{dashboard_id}/cards", **params)
-      end      
+      end
 
       # Update Cards on a Dashboard.
       #
@@ -57,7 +57,7 @@ def add_dashboard_card(dashboard_id, **params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#put-apidashboardidcards
-      def update_dashboard_cards(dashboard_id, **params)        
+      def update_dashboard_cards(dashboard_id, **params)
         put("/api/dashboard/#{dashboard_id}/cards", **params)
       end
 
@@ -67,7 +67,7 @@ def update_dashboard_cards(dashboard_id, **params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#delete-apidashboardidcards
-      def delete_dashboard_card(dashboard_id, **params)        
+      def delete_dashboard_card(dashboard_id, **params)
         delete("/api/dashboard/#{dashboard_id}/cards", **params)
       end
     end
diff --git a/lib/metabase/endpoint/database.rb b/lib/metabase/endpoint/database.rb
index a8fb281..d48e2f1 100644
--- a/lib/metabase/endpoint/database.rb
+++ b/lib/metabase/endpoint/database.rb
@@ -6,7 +6,7 @@ module Database
       # Fetch all databases.
       #
       # @param params [Hash] Query string
-      # @return [Array<Hash>] Parsed response JSON
+      # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#get-apidatabase
       def databases(**params)
         get('/api/database', **params)
diff --git a/lib/metabase/endpoint/user.rb b/lib/metabase/endpoint/user.rb
index 7ca6c02..15376c5 100644
--- a/lib/metabase/endpoint/user.rb
+++ b/lib/metabase/endpoint/user.rb
@@ -6,7 +6,7 @@ module User
       # Fetch all users.
       #
       # @param params [Hash] Query string
-      # @return [Array<Hash>] Parsed response JSON
+      # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#get-apiuser
       def users(**params)
         get('/api/user', **params)
diff --git a/lib/metabase/error.rb b/lib/metabase/error.rb
index 8280ef8..8b750e6 100644
--- a/lib/metabase/error.rb
+++ b/lib/metabase/error.rb
@@ -29,7 +29,7 @@ def build_error_message
       return nil if @response.nil?
 
       "#{@response.env.method.upcase} #{@response.env.url}: " \
-      "#{@response.status} - #{@response.body}"
+        "#{@response.status} - #{@response.body}"
     end
   end
 
diff --git a/metabase.gemspec b/metabase.gemspec
index 1704554..bab5671 100644
--- a/metabase.gemspec
+++ b/metabase.gemspec
@@ -22,20 +22,22 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 3.0'
 
-  spec.add_runtime_dependency 'faraday', '>= 1.2.0'
-  spec.add_runtime_dependency 'faraday_middleware'
+  spec.add_runtime_dependency 'faraday', '>= 2.0.1'
 
-  spec.add_development_dependency 'amazing_print'
-  spec.add_development_dependency 'bump'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'amazing_print', '>= 1.2.2'
+  spec.add_development_dependency 'bump', '>= 0.10.0'
+  spec.add_development_dependency 'bundler', '>= 2.4.13'
+  spec.add_development_dependency 'pry', '>= 0.14'
+  spec.add_development_dependency 'rake', '>= 13.0.3'
+  spec.add_development_dependency 'rspec', '>= 3.10.0'
+  spec.add_development_dependency 'rubocop', '>= 1.19.0'
+  spec.add_development_dependency 'rubocop-rake', '>= 0.4.0'
+  spec.add_development_dependency 'rubocop-rspec', '>= 2.0.0'
+  spec.add_development_dependency 'simplecov', '>= 0.21.2'
+  spec.add_development_dependency 'vcr', '>= 6.0.0'
+  spec.add_development_dependency 'webmock', '>= 3.12.2'
+  spec.add_development_dependency 'yard', '>= 0.9.25'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/spec/metabase/connection_spec.rb b/spec/metabase/connection_spec.rb
index 78bfb35..e4566b2 100644
--- a/spec/metabase/connection_spec.rb
+++ b/spec/metabase/connection_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Connection do
-  include_context 'client'
+  include_context 'with client'
 
   describe 'get' do
     include_examples 'response handling' do
diff --git a/spec/metabase/endpoint/activity_spec.rb b/spec/metabase/endpoint/activity_spec.rb
index 745f84b..8933f04 100644
--- a/spec/metabase/endpoint/activity_spec.rb
+++ b/spec/metabase/endpoint/activity_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Activity do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'activities', vcr: true do
-    context 'success' do
+    context 'when success' do
       it 'returns recent activities' do
         activities = client.activities
         expect(activities).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/alert_spec.rb b/spec/metabase/endpoint/alert_spec.rb
index c1421e1..5b94708 100644
--- a/spec/metabase/endpoint/alert_spec.rb
+++ b/spec/metabase/endpoint/alert_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Alert do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'alerts', vcr: true do
-    context 'success' do
+    context 'when success' do
       it 'returns all alerts' do
         alerts = client.alerts
         expect(alerts).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/async_spec.rb b/spec/metabase/endpoint/async_spec.rb
index 2d6f947..a6b7a7a 100644
--- a/spec/metabase/endpoint/async_spec.rb
+++ b/spec/metabase/endpoint/async_spec.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Async do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'running_jobs', vcr: true do
-    context 'success' do
-      it 'returns all running jobs' do
+    context 'with success' do
+      xit 'returns all running jobs' do
         client.x_ray_card(1)
         running_jobs = client.running_jobs
         expect(running_jobs).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/card_spec.rb b/spec/metabase/endpoint/card_spec.rb
index a3b17ac..9ad2760 100644
--- a/spec/metabase/endpoint/card_spec.rb
+++ b/spec/metabase/endpoint/card_spec.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Card do
-  include_context 'login'
+  include_context 'with login'
   let(:card_id) { 1 }
 
   describe 'cards', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns all cards' do
         cards = client.cards
         expect(cards).to be_kind_of(Array)
@@ -14,7 +14,7 @@
   end
 
   describe 'card', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns the card' do
         card = client.card(card_id)
         expect(card).to be_kind_of(Hash)
@@ -23,7 +23,7 @@
   end
 
   describe 'query_card_with_metadata', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns query results of the card with metadata' do
         result = client.query_card_with_metadata(card_id)
         expect(result).to be_kind_of(Hash)
@@ -32,14 +32,14 @@
   end
 
   describe 'query_card', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns query results of the card' do
         result = client.query_card(card_id)
         expect(result).to be_kind_of(Array)
       end
     end
 
-    context 'specify format' do
+    context 'with specify format' do
       it 'returns query results of the card as specified format' do
         result = client.query_card(card_id, format: :csv)
         expect(result).to be_kind_of(String)
@@ -48,12 +48,12 @@
   end
 
   describe 'new_card', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'create a new card' do
         card = client.card(card_id)
         new_card = client.new_card(**card)
         expect(new_card).to be_kind_of(Hash)
       end
     end
-  end  
+  end
 end
diff --git a/spec/metabase/endpoint/collection_spec.rb b/spec/metabase/endpoint/collection_spec.rb
index c44e107..7942c78 100644
--- a/spec/metabase/endpoint/collection_spec.rb
+++ b/spec/metabase/endpoint/collection_spec.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Collection do
-  include_context 'login'
+  include_context 'with login'
   let(:collection_id) { 4 }
 
   describe 'collections', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns all collections' do
         collections = client.collections
         expect(collections).to be_kind_of(Array)
@@ -18,10 +18,10 @@
 
       it "returns a collection's items" do
         collection = client.collection_items(collection_id)
-        expect(collection).to be_kind_of(Array)
+        expect(collection).to be_kind_of(Hash)
       end
 
-      it "create a new collection" do
+      it 'create a new collection' do
         params = { name: 'New Organization', color: '#509EE3' }
         collection = client.new_collection(**params)
         expect(collection).to be_kind_of(Hash)
diff --git a/spec/metabase/endpoint/dashboard_spec.rb b/spec/metabase/endpoint/dashboard_spec.rb
index f05048f..7810aa0 100644
--- a/spec/metabase/endpoint/dashboard_spec.rb
+++ b/spec/metabase/endpoint/dashboard_spec.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Dashboard do
-  include_context 'login'
+  include_context 'with login'
   let(:dashboard_id) { 1 }
   let(:card_id) { 1 }
 
   describe 'dashboards', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns all dashboards' do
         dashboards = client.dashboards
         expect(dashboards).to be_kind_of(Array)
@@ -15,7 +15,7 @@
   end
 
   describe 'dashboard', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns the dashboard' do
         dashboard = client.dashboard(dashboard_id)
         expect(dashboard).to be_kind_of(Hash)
@@ -24,7 +24,7 @@
   end
 
   describe 'new_dashboard', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'create a new dashboard' do
         dashboard = client.dashboard(dashboard_id)
         new_dashboard = client.new_dashboard(**dashboard)
@@ -34,7 +34,7 @@
   end
 
   describe 'copy_dashboard', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'create a copy dashboard' do
         dashboard = client.dashboard(dashboard_id)
         copy_dashboard = client.copy_dashboard(dashboard_id, **dashboard)
@@ -44,9 +44,8 @@
   end
 
   describe 'add_dashboard_cards', vcr: true do
-    context 'success' do
-      it 'add a dashboard cards' do
-        card = client.dashboard(dashboard_id)
+    context 'with success' do
+      xit 'add a dashboard cards' do
         card = client.card(card_id)
         add_dashboard_cards = client.add_dashboard_card(dashboard_id, **card)
         expect(add_dashboard_cards).to be_kind_of(Hash)
@@ -55,8 +54,8 @@
   end
 
   describe 'update_dashboard_cards', vcr: true do
-    context 'success' do
-      it 'update a dashboard cards' do
+    context 'with success' do
+      xit 'update a dashboard cards' do
         dashboard = client.dashboard(dashboard_id)
         update_dashboard_cards = client.update_dashboard_cards(dashboard_id, **dashboard)
         expect(update_dashboard_cards).to be_kind_of(Hash)
@@ -65,7 +64,7 @@
   end
 
   describe 'delete_dashboard_card', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'delete a dashboard card' do
         dashboard = client.dashboard(dashboard_id)
         params = { dashcardId: dashboard['ordered_cards'][0]['id'] }
diff --git a/spec/metabase/endpoint/database_spec.rb b/spec/metabase/endpoint/database_spec.rb
index d338220..3b9137e 100644
--- a/spec/metabase/endpoint/database_spec.rb
+++ b/spec/metabase/endpoint/database_spec.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Database do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'databases', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns all databases' do
         databases = client.databases
-        expect(databases).to be_kind_of(Array)
+        expect(databases).to be_kind_of(Hash)
       end
     end
   end
diff --git a/spec/metabase/endpoint/dataset_spec.rb b/spec/metabase/endpoint/dataset_spec.rb
index e7f97f3..d6ff156 100644
--- a/spec/metabase/endpoint/dataset_spec.rb
+++ b/spec/metabase/endpoint/dataset_spec.rb
@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Dataset do
-  include_context 'login'
+  include_context 'with login'
 
   let(:query) { '{"type":"native","native":{"query":"SELECT * FROM orders LIMIT 1;"},"database":1}' }
 
   describe 'query_dataset', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns query results of the dataset' do
         result = client.query_dataset(query: query)
         expect(result).to be_kind_of(Array)
       end
     end
 
-    context 'specify format' do
+    context 'when specify format' do
       it 'returns query results of the dataset as specified format' do
         result = client.query_dataset(query: query, format: 'csv')
         expect(result).to be_kind_of(String)
diff --git a/spec/metabase/endpoint/metric_spec.rb b/spec/metabase/endpoint/metric_spec.rb
index b25aafe..f99e5ad 100644
--- a/spec/metabase/endpoint/metric_spec.rb
+++ b/spec/metabase/endpoint/metric_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Metric do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'metrics', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns all metrics' do
         metrics = client.metrics
         expect(metrics).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/permissions_spec.rb b/spec/metabase/endpoint/permissions_spec.rb
index dc5e8a5..7d6f1ab 100644
--- a/spec/metabase/endpoint/permissions_spec.rb
+++ b/spec/metabase/endpoint/permissions_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Permissions do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'groups', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns all permissions groups' do
         groups = client.groups
         expect(groups).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/public_spec.rb b/spec/metabase/endpoint/public_spec.rb
index 5ef4bd9..979c804 100644
--- a/spec/metabase/endpoint/public_spec.rb
+++ b/spec/metabase/endpoint/public_spec.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Public do
-  include_context 'client'
+  include_context 'with client'
   let(:card_uuid) { '708a78ec-15c8-405e-b590-de98c6ddfa01' }
 
   describe 'public_card', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns the public card' do
         public_card = client.public_card(card_uuid)
         expect(public_card).to be_kind_of(Hash)
@@ -14,7 +14,7 @@
   end
 
   describe 'query_public_card_with_metadata', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns query results of the public card with metadata' do
         result = client.query_public_card_with_metadata(card_uuid)
         expect(result).to be_kind_of(Hash)
@@ -23,14 +23,14 @@
   end
 
   describe 'query_public_card', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns query results of the public card' do
         result = client.query_public_card(card_uuid)
         expect(result).to be_kind_of(Array)
       end
     end
 
-    context 'specify format' do
+    context 'when specify format' do
       it 'returns query results of the public card as specified format' do
         result = client.query_public_card(card_uuid, format: :csv)
         expect(result).to be_kind_of(String)
diff --git a/spec/metabase/endpoint/pulse_spec.rb b/spec/metabase/endpoint/pulse_spec.rb
index cbb40be..f6ed469 100644
--- a/spec/metabase/endpoint/pulse_spec.rb
+++ b/spec/metabase/endpoint/pulse_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Pulse do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'pulses', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns all pulses' do
         pulses = client.pulses
         expect(pulses).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/revision_spec.rb b/spec/metabase/endpoint/revision_spec.rb
index 3e34fb9..3e7a032 100644
--- a/spec/metabase/endpoint/revision_spec.rb
+++ b/spec/metabase/endpoint/revision_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Revision do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'revisions', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns revisions of the object' do
         revisions = client.revisions(entity: :card, id: 1)
         expect(revisions).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/segment_spec.rb b/spec/metabase/endpoint/segment_spec.rb
index f4a06fd..b2e1092 100644
--- a/spec/metabase/endpoint/segment_spec.rb
+++ b/spec/metabase/endpoint/segment_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Segment do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'segments', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns all segments' do
         segments = client.segments
         expect(segments).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/session_spec.rb b/spec/metabase/endpoint/session_spec.rb
index 9be1b7a..d705a3f 100644
--- a/spec/metabase/endpoint/session_spec.rb
+++ b/spec/metabase/endpoint/session_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Session do
-  include_context 'client'
+  include_context 'with client'
 
   describe 'login', vcr: true do
     let(:incorrect_password) do
@@ -12,19 +12,19 @@
       )
     end
 
-    context 'success' do
+    context 'with success' do
       it 'returns a session token' do
         expect(client.login).to match(/[a-z0-9-]{36}/)
       end
     end
 
-    context 'incorrect username or password' do
+    context 'with incorrect username or password' do
       it 'raises error' do
-        expect { incorrect_password.login }.to raise_error(Metabase::BadRequest)
+        expect { incorrect_password.login }.to raise_error(Metabase::Unauthorized)
       end
     end
 
-    context 'specify username and password' do
+    context 'when specify username and password' do
       it 'uses the username and password' do
         params = { username: 'mb@example.com', password: 'p@ssw0rd' }
         expect(incorrect_password.login(**params)).to match(/[a-z0-9-]{36}/)
@@ -33,15 +33,15 @@
   end
 
   describe 'logout', vcr: true do
-    context 'success' do
-      include_context 'login'
+    context 'with success' do
+      include_context 'with login'
 
       it 'returns true' do
         expect(client.logout).to be(true)
       end
     end
 
-    context 'not logged in' do
+    context 'when not logged in' do
       it 'raises error' do
         expect { client.logout }.to raise_error(Metabase::NotFound)
       end
diff --git a/spec/metabase/endpoint/setting_spec.rb b/spec/metabase/endpoint/setting_spec.rb
index f2bcc5a..da8be88 100644
--- a/spec/metabase/endpoint/setting_spec.rb
+++ b/spec/metabase/endpoint/setting_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Setting do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'settings', vcr: true do
-    context 'success' do
+    context 'when success' do
       it 'returns all settings' do
         settings = client.settings
         expect(settings).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/setup_spec.rb b/spec/metabase/endpoint/setup_spec.rb
index 11e3c8c..583887e 100644
--- a/spec/metabase/endpoint/setup_spec.rb
+++ b/spec/metabase/endpoint/setup_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Setup do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'admin_checklists', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns admin checklists' do
         admin_checklists = client.admin_checklists
         expect(admin_checklists).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/table_spec.rb b/spec/metabase/endpoint/table_spec.rb
index 37c5090..e64b805 100644
--- a/spec/metabase/endpoint/table_spec.rb
+++ b/spec/metabase/endpoint/table_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Table do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'tables', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns all tables' do
         tables = client.tables
         expect(tables).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/user_spec.rb b/spec/metabase/endpoint/user_spec.rb
index 4a31478..ba3c55c 100644
--- a/spec/metabase/endpoint/user_spec.rb
+++ b/spec/metabase/endpoint/user_spec.rb
@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::User do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'users', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns all users' do
         users = client.users
-        expect(users).to be_kind_of(Array)
+        expect(users).to be_kind_of(Hash)
       end
     end
   end
 
   describe 'current_user', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns the current user' do
         user = client.current_user
         expect(user).to be_kind_of(Hash)
diff --git a/spec/metabase/endpoint/util_spec.rb b/spec/metabase/endpoint/util_spec.rb
index 87c0f70..8728bc0 100644
--- a/spec/metabase/endpoint/util_spec.rb
+++ b/spec/metabase/endpoint/util_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Util do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'logs', vcr: true do
-    context 'success' do
+    context 'with success' do
       it 'returns application logs' do
         logs = client.logs
         expect(logs).to be_kind_of(Array)
diff --git a/spec/metabase/endpoint/x_ray_spec.rb b/spec/metabase/endpoint/x_ray_spec.rb
index 26c2a07..1e9f31c 100644
--- a/spec/metabase/endpoint/x_ray_spec.rb
+++ b/spec/metabase/endpoint/x_ray_spec.rb
@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::XRay do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'x_ray_card', vcr: true do
-    context 'success' do
-      it 'returns x-ray job' do
+    context 'with success' do
+      # obsolte, needs to be removed
+      xit 'returns x-ray job' do
         x_ray = client.x_ray_card(1)
         expect(x_ray).to be_kind_of(Hash)
       end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 13d5c3a..415f955 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,7 +7,7 @@
 require 'metabase'
 require 'pry'
 
-Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each { |f| require f }
+Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }
 
 RSpec.configure do |config|
   config.example_status_persistence_file_path = '.rspec_status'
diff --git a/spec/support/shared_contexts.rb b/spec/support/shared_contexts.rb
index f301298..a886b97 100644
--- a/spec/support/shared_contexts.rb
+++ b/spec/support/shared_contexts.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_context 'client' do
+RSpec.shared_context 'with client' do
   let(:client) do
     Metabase::Client.new(
       url: 'http://localhost:3030',
@@ -10,7 +10,7 @@
   end
 end
 
-RSpec.shared_context 'login' do
-  include_context 'client'
+RSpec.shared_context 'with login' do
+  include_context 'with client'
   before { client.login }
 end
diff --git a/spec/support/shared_examples.rb b/spec/support/shared_examples.rb
index 9d7a759..71adcc0 100644
--- a/spec/support/shared_examples.rb
+++ b/spec/support/shared_examples.rb
@@ -4,7 +4,7 @@
   let(:host) { 'localhost:3030' }
   let(:path) { '/' }
 
-  context 'success' do
+  context 'with success' do
     before do
       stub_request(method, host)
         .to_return(status: 200, body: 'OK')
@@ -15,7 +15,7 @@
     end
   end
 
-  context 'server returns 400' do
+  context 'when server returns 400' do
     before do
       stub_request(method, host)
         .to_return(status: 400, body: 'BadRequest')
@@ -28,7 +28,7 @@
     end
   end
 
-  context 'server returns 401' do
+  context 'when server returns 401' do
     before do
       stub_request(method, host)
         .to_return(status: 401, body: 'Unauthorized')
@@ -41,7 +41,7 @@
     end
   end
 
-  context 'server returns 403' do
+  context 'when server returns 403' do
     before do
       stub_request(method, host)
         .to_return(status: 403, body: 'Forbidden')
@@ -54,7 +54,7 @@
     end
   end
 
-  context 'server returns 404' do
+  context 'when server returns 404' do
     before do
       stub_request(method, host)
         .to_return(status: 404, body: 'NotFound')
@@ -67,7 +67,7 @@
     end
   end
 
-  context 'server returns other 4xx' do
+  context 'when server returns other 4xx' do
     before do
       stub_request(method, host)
         .to_return(status: 499, body: 'ClientError')
@@ -80,7 +80,7 @@
     end
   end
 
-  context 'server returns 500' do
+  context 'when server returns 500' do
     before do
       stub_request(method, host)
         .to_return(status: 500, body: 'InternalServerError')
@@ -94,7 +94,7 @@
     end
   end
 
-  context 'server returns 502' do
+  context 'when server returns 502' do
     before do
       stub_request(method, host)
         .to_return(status: 502, body: 'BadGateway')
@@ -107,7 +107,7 @@
     end
   end
 
-  context 'server returns 503' do
+  context 'when server returns 503' do
     before do
       stub_request(method, host)
         .to_return(status: 503, body: 'ServiceUnavailable')
@@ -121,7 +121,7 @@
     end
   end
 
-  context 'server returns other 5xx' do
+  context 'when server returns other 5xx' do
     before do
       stub_request(method, host)
         .to_return(status: 599, body: 'ServerError')