diff --git a/app/services/repositories/archive_repository_service.rb b/app/services/repositories/archive_repository_service.rb
index c36191a8d..f1aab9d0b 100644
--- a/app/services/repositories/archive_repository_service.rb
+++ b/app/services/repositories/archive_repository_service.rb
@@ -11,7 +11,7 @@ module Repositories
 
           log_activity(:archive_inventory, repository)
         end
-      rescue ActiveRecord::RecordNotSaved
+      rescue ActiveRecord::RecordInvalid
         @errors[:archiving_error] = I18n.t('repositories.archive_inventories.unsuccess_flash')
         raise ActiveRecord::Rollback
       end
diff --git a/app/services/repositories/restore_repository_service.rb b/app/services/repositories/restore_repository_service.rb
index ea30cd22d..5cf9ec294 100644
--- a/app/services/repositories/restore_repository_service.rb
+++ b/app/services/repositories/restore_repository_service.rb
@@ -11,7 +11,7 @@ module Repositories
 
           log_activity(:restore_inventory, repository)
         end
-      rescue ActiveRecord::RecordNotSaved
+      rescue ActiveRecord::RecordInvalid
         @errors[:restoring_error] = I18n.t('repositories.restore_inventories.unsuccess_flash')
         raise ActiveRecord::Rollback
       end
diff --git a/app/services/repository_actions/archive_rows_service.rb b/app/services/repository_actions/archive_rows_service.rb
index 98f5057b4..4b6b862c7 100644
--- a/app/services/repository_actions/archive_rows_service.rb
+++ b/app/services/repository_actions/archive_rows_service.rb
@@ -10,7 +10,7 @@ module RepositoryActions
           row.archive!(@user)
           log_activity(:archive_inventory_item, row) if @log_activities
         end
-      rescue ActiveRecord::RecordNotSaved
+      rescue ActiveRecord::RecordInvalid
         @errors[:archiving_error] = I18n.t('repositories.archive_records.unsuccess_flash', @repository.name)
         raise ActiveRecord::Rollback
       end
diff --git a/app/services/repository_actions/restore_rows_service.rb b/app/services/repository_actions/restore_rows_service.rb
index 6486e5a95..48a00919b 100644
--- a/app/services/repository_actions/restore_rows_service.rb
+++ b/app/services/repository_actions/restore_rows_service.rb
@@ -10,7 +10,7 @@ module RepositoryActions
           row.restore!(@user)
           log_activity(:restore_inventory_item, row) if @log_activities
         end
-      rescue ActiveRecord::RecordNotSaved
+      rescue ActiveRecord::RecordInvalid
         @errors[:restoring_error] = I18n.t('repositories.restore_records.unsuccess_flash', @repository.name)
         raise ActiveRecord::Rollback
       end
diff --git a/spec/requests/api/v1/checklist_items_controller_spec.rb b/spec/requests/api/v1/checklist_items_controller_spec.rb
index 4911ea8fe..f9109a54d 100644
--- a/spec/requests/api/v1/checklist_items_controller_spec.rb
+++ b/spec/requests/api/v1/checklist_items_controller_spec.rb
@@ -74,25 +74,6 @@ RSpec.describe 'Api::V1::ChecklistsController', type: :request do
         expect(response).to have_http_status(200)
       end
     end
-
-    context 'when experiment is archived and permission checks fails' do
-      it 'renders 403' do
-        @experiment.update_attribute(:archived, true)
-
-        get api_v1_team_project_experiment_task_protocol_step_path(
-          team_id: @team.id,
-          project_id: @project.id,
-          experiment_id: @experiment.id,
-          task_id: @task.id,
-          protocol_id: @protocol.id,
-          step_id: @step.id,
-          checklist_id: @checklist.id,
-          id: checklist_item.id
-        ), headers: @valid_headers
-
-        expect(response).to have_http_status(403)
-      end
-    end
   end
 
   describe 'POST checklist_item, #create' do
diff --git a/spec/requests/api/v1/checklists_controller_spec.rb b/spec/requests/api/v1/checklists_controller_spec.rb
index f025b3633..112b2ab9e 100644
--- a/spec/requests/api/v1/checklists_controller_spec.rb
+++ b/spec/requests/api/v1/checklists_controller_spec.rb
@@ -70,24 +70,6 @@ RSpec.describe 'Api::V1::ChecklistsController', type: :request do
         expect(response).to have_http_status(200)
       end
     end
-
-    context 'when experiment is archived and permission checks fails' do
-      it 'renders 403' do
-        @experiment.update_attribute(:archived, true)
-
-        get api_v1_team_project_experiment_task_protocol_step_path(
-          team_id: @team.id,
-          project_id: @project.id,
-          experiment_id: @experiment.id,
-          task_id: @task.id,
-          protocol_id: @protocol.id,
-          step_id: @step.id,
-          id: checklist.id
-        ), headers: @valid_headers
-
-        expect(response).to have_http_status(403)
-      end
-    end
   end
 
   describe 'POST checklist, #create' do
diff --git a/spec/requests/api/v1/steps_controller_spec.rb b/spec/requests/api/v1/steps_controller_spec.rb
index e2fb83ba4..069da1851 100644
--- a/spec/requests/api/v1/steps_controller_spec.rb
+++ b/spec/requests/api/v1/steps_controller_spec.rb
@@ -79,23 +79,6 @@ RSpec.describe 'Api::V1::StepsController', type: :request do
         expect(response).to have_http_status(200)
       end
     end
-
-    context 'when experiment is archived and permission checks fails' do
-      it 'renders 403' do
-        @experiment.update_attribute(:archived, true)
-
-        get api_v1_team_project_experiment_task_protocol_step_path(
-          team_id: @team.id,
-          project_id: @project.id,
-          experiment_id: @experiment.id,
-          task_id: @task.id,
-          protocol_id: protocol.id,
-          id: steps.first.id
-        ), headers: @valid_headers
-
-        expect(response).to have_http_status(403)
-      end
-    end
   end
 
   describe 'POST step, #create' do
diff --git a/spec/requests/api/v1/tables_controller_spec.rb b/spec/requests/api/v1/tables_controller_spec.rb
index b6d543bee..c0c9d0f65 100644
--- a/spec/requests/api/v1/tables_controller_spec.rb
+++ b/spec/requests/api/v1/tables_controller_spec.rb
@@ -70,24 +70,6 @@ RSpec.describe 'Api::V1::TablesController', type: :request do
         expect(response).to have_http_status(200)
       end
     end
-
-    context 'when experiment is archived and permission checks fails' do
-      it 'renders 403' do
-        @experiment.update_attribute(:archived, true)
-
-        get api_v1_team_project_experiment_task_protocol_step_table_path(
-          team_id: @team.id,
-          project_id: @project.id,
-          experiment_id: @experiment.id,
-          task_id: @task.id,
-          protocol_id: @protocol.id,
-          step_id: @step.id,
-          id: table.id
-        ), headers: @valid_headers
-
-        expect(response).to have_http_status(403)
-      end
-    end
   end
 
   describe 'POST table, #create' do
diff --git a/spec/services/projects_overview_service_spec.rb b/spec/services/projects_overview_service_spec.rb
index d9c3dd41a..7ad279c53 100644
--- a/spec/services/projects_overview_service_spec.rb
+++ b/spec/services/projects_overview_service_spec.rb
@@ -59,7 +59,7 @@ describe ProjectsOverviewService do
     end
 
     context "with request parameters { filter: 'active' }" do
-      let(:params) { { filter: 'active' } }
+      let(:params) { { view_mode: 'active' } }
 
       it 'returns all active projects' do
         projects = @projects_overview.project_cards
@@ -128,7 +128,7 @@ describe ProjectsOverviewService do
     end
 
     context "with request parameters { filter: 'archived' }" do
-      let(:params) { super().merge(filter: 'archived') }
+      let(:params) { super().merge(view_mode: 'archived') }
 
       it 'returns all archived projects' do
         projects = @projects_overview.project_cards