diff --git a/Gemfile.lock b/Gemfile.lock
index 302edfb2..b9766d1d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test_track_rails_client (8.1.1)
+    test_track_rails_client (8.2.0)
       activejob (>= 7.0, < 8.1)
       activemodel (>= 7.0, < 8.1)
       faraday (>= 0.8)
diff --git a/gemfiles/rails_7_0.gemfile.lock b/gemfiles/rails_7_0.gemfile.lock
index 600239ed..cf2ccf2c 100644
--- a/gemfiles/rails_7_0.gemfile.lock
+++ b/gemfiles/rails_7_0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    test_track_rails_client (8.1.1)
+    test_track_rails_client (8.2.0)
       activejob (>= 7.0, < 8.1)
       activemodel (>= 7.0, < 8.1)
       faraday (>= 0.8)
diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock
index 5860be9a..4240cf2b 100644
--- a/gemfiles/rails_7_1.gemfile.lock
+++ b/gemfiles/rails_7_1.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    test_track_rails_client (8.1.1)
+    test_track_rails_client (8.2.0)
       activejob (>= 7.0, < 8.1)
       activemodel (>= 7.0, < 8.1)
       faraday (>= 0.8)
diff --git a/gemfiles/rails_7_2.gemfile.lock b/gemfiles/rails_7_2.gemfile.lock
index bc6d365e..dcda19c2 100644
--- a/gemfiles/rails_7_2.gemfile.lock
+++ b/gemfiles/rails_7_2.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    test_track_rails_client (8.1.1)
+    test_track_rails_client (8.2.0)
       activejob (>= 7.0, < 8.1)
       activemodel (>= 7.0, < 8.1)
       faraday (>= 0.8)
diff --git a/gemfiles/rails_8_0.gemfile.lock b/gemfiles/rails_8_0.gemfile.lock
index cdf1ddb0..9740c887 100644
--- a/gemfiles/rails_8_0.gemfile.lock
+++ b/gemfiles/rails_8_0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    test_track_rails_client (8.1.1)
+    test_track_rails_client (8.2.0)
       activejob (>= 7.0, < 8.1)
       activemodel (>= 7.0, < 8.1)
       faraday (>= 0.8)
diff --git a/lib/tasks/test_track_rails_client_tasks.rake b/lib/tasks/test_track_rails_client_tasks.rake
index f77bd5d0..dec3588f 100644
--- a/lib/tasks/test_track_rails_client_tasks.rake
+++ b/lib/tasks/test_track_rails_client_tasks.rake
@@ -11,7 +11,7 @@ namespace :test_track do
   end
 
   desc 'Generates build timestamp for fetching point-in-time split registries'
-  task generate_build_timestamp: :environment do
+  task :generate_build_timestamp do # rubocop:disable Rails/RakeEnvironment
     cli = TesttrackCli.instance
 
     result = cli.call('generate_build_timestamp')
diff --git a/lib/test_track_rails_client.rb b/lib/test_track_rails_client.rb
index f7d11dda..c04f6b13 100644
--- a/lib/test_track_rails_client.rb
+++ b/lib/test_track_rails_client.rb
@@ -1,5 +1,6 @@
 require 'test_track'
 require "test_track_rails_client/engine"
+require 'testtrack_cli'
 
 module TestTrackRailsClient
 end
diff --git a/lib/test_track_rails_client/version.rb b/lib/test_track_rails_client/version.rb
index 3f246332..ce37fb46 100644
--- a/lib/test_track_rails_client/version.rb
+++ b/lib/test_track_rails_client/version.rb
@@ -1,3 +1,3 @@
 module TestTrackRailsClient
-  VERSION = "8.1.1".freeze
+  VERSION = "8.2.0".freeze
 end
diff --git a/app/models/testtrack_cli.rb b/lib/testtrack_cli.rb
similarity index 100%
rename from app/models/testtrack_cli.rb
rename to lib/testtrack_cli.rb
diff --git a/spec/models/testtrack_cli_spec.rb b/spec/testtrack_cli_spec.rb
similarity index 100%
rename from spec/models/testtrack_cli_spec.rb
rename to spec/testtrack_cli_spec.rb